clocksource: Fix brown-bag boolean thinko in cs_watchdog_read()

The current "nretries > 1 || nretries >= max_retries" check in
cs_watchdog_read() will always evaluate to true, and thus pr_warn(), if
nretries is greater than 1.  The intent is instead to never warn on the
first try, but otherwise warn if the successful retry was the last retry.

Therefore, change that "||" to "&&".

Fixes: db3a34e17433 ("clocksource: Retry clock read if long delays detected")
Reported-by: Borislav Petkov <bp@alien8.de>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/all/20240802154618.4149953-2-paulmck@kernel.org

diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index d25ba49e313cca182029e272b7bac004773f92a8..d0538a75f4c63ac1e9c8eb36f86eeb8f3b8e87d2 100644 (file)
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -246,7 +246,7 @@ static enum wd_read_status cs_watchdog_read(struct clocksource *cs, u64 *csnow,
 
                wd_delay = cycles_to_nsec_safe(watchdog, *wdnow, wd_end);
                if (wd_delay <= WATCHDOG_MAX_SKEW) {
-                       if (nretries > 1 || nretries >= max_retries) {
+                       if (nretries > 1 && nretries >= max_retries) {
                                pr_warn("timekeeping watchdog on CPU%d: %s retried %d times before success\n",
                                        smp_processor_id(), watchdog->name, nretries);
                        }