From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 70C247F6 for ; Sun, 11 Aug 2024 15:56:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723391812; cv=none; b=b41B9ruKEAocgAYaUZyR9xfbsx6yd2yBrYkBAfb3GdoHChUnjnOc00fs1PbcvcRq1y6uq2Xz4TwtaTLqfiSP8F295Gkzqpyc/xQcE4J/pDOQiZzq02qv+GKrZT4pToiuov8anLb0kqEWfsVeiCAr8IHS8o0UM+nLU6dNCk/aWF8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723391812; c=relaxed/simple; bh=E3wfe8iKauOUIcMfOODXdZfatMrqklnDf6PgkcVOtZg=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=jBtZk25iyAQj25IJGLbKjsirweXm1doxvLYz12hUTVqjheTvBV7i14bRanCmz3Rx1tE44jWEG3bEeAbBvfmxsRw79gBvxSRqmSZqifMSDceOZLIp7VqTZW2npsjcJyQiMzmxYFXbat0Jj0yXsfpzQ6w0g4zVDgSRn+j4/hHUkmY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=2C0ncZRi; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="2C0ncZRi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87AAAC32786; Sun, 11 Aug 2024 15:56:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723391812; bh=E3wfe8iKauOUIcMfOODXdZfatMrqklnDf6PgkcVOtZg=; h=Subject:To:Cc:From:Date:From; b=2C0ncZRixXY+LSZiWRSL8EpJpDXeyN2SQ0lSDCHRhgq9TMBqdqrCNTp3OCJhpCgSh jAXeSVsdLMUvhkDpeILQxPIz1QMW77pTa+G8Q1lHXeCULHjfjDxMQsqxRwhlDXHDEj 18M5CiaIUUQYo0j+JdNLSKuU6eFYS++zY2u1LGaY= Subject: FAILED: patch "[PATCH] clocksource: Fix brown-bag boolean thinko in" failed to apply to 5.4-stable tree To: paulmck@kernel.org,bp@alien8.de,tglx@linutronix.de Cc: From: Date: Sun, 11 Aug 2024 17:56:38 +0200 Message-ID: <2024081138-boondocks-spending-1575@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x f2655ac2c06a15558e51ed6529de280e1553c86e # git commit -s git send-email --to '' --in-reply-to '2024081138-boondocks-spending-1575@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: f2655ac2c06a ("clocksource: Fix brown-bag boolean thinko in cs_watchdog_read()") 2ed08e4bc532 ("clocksource: Scale the watchdog read retries automatically") 877a0e83c57f ("torture: Enable clocksource watchdog with "tsc=watchdog"") 1a5620671a1b ("clocksource: Reduce the default clocksource_watchdog() retries to 2") c86ff8c55b8a ("clocksource: Avoid accidental unstable marking of clocksources") ef4dac7dbde7 ("torture: Add clocksource-watchdog testing to torture.sh") 1253b9b87e42 ("clocksource: Provide kernel module to test clocksource watchdog") 2e27e793e280 ("clocksource: Reduce clocksource-skew threshold") fa218f1cce6b ("clocksource: Limit number of CPUs checked for clock synchronization") 7560c02bdffb ("clocksource: Check per-CPU clock synchronization when marked unstable") db3a34e17433 ("clocksource: Retry clock read if long delays detected") a115a775a8d5 ("torture: Add "make allmodconfig" to torture.sh") 197220d4a334 ("torture: Remove use of "eval" in torture.sh") 1adb5d6b5225 ("torture: Make torture.sh use common time-duration bash functions") bfc19c13d24c ("torture: Add torture.sh torture-everything script") 0a4bb5e5507a ("x86/fpu: Allow multiple bits in clearcpuid= parameter") 4185b3b92792 ("selftests/fpu: Add an FPU selftest") b2ef9f5a5cb3 ("mm/hmm/test: add selftest driver for HMM") 30428ef5d1e8 ("lib/test_lockup: test module to generate lockups") b95a8a27c300 ("x86/vdso: Use generic VDSO clock mode storage") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From f2655ac2c06a15558e51ed6529de280e1553c86e Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Fri, 2 Aug 2024 08:46:15 -0700 Subject: [PATCH] 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 Signed-off-by: Paul E. McKenney Signed-off-by: Thomas Gleixner 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 d25ba49e313c..d0538a75f4c6 100644 --- 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); }