From: Borislav Petkov <bp@alien8.de>
To: Tony Luck <tony.luck@intel.com>
Cc: X86 ML <x86@kernel.org>, LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH v0 02/12] x86/mce: Remove function-local cpus variables
Date: Thu, 4 Nov 2021 15:40:25 +0100 [thread overview]
Message-ID: <20211104144035.20107-3-bp@alien8.de> (raw)
In-Reply-To: <20211104144035.20107-1-bp@alien8.de>
From: Borislav Petkov <bp@suse.de>
Use num_online_cpus() directly.
No functional changes.
Signed-off-by: Borislav Petkov <bp@suse.de>
---
arch/x86/kernel/cpu/mce/core.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
index 52d277c955f9..0dcd7ac7444c 100644
--- a/arch/x86/kernel/cpu/mce/core.c
+++ b/arch/x86/kernel/cpu/mce/core.c
@@ -989,7 +989,6 @@ static atomic_t global_nwo;
static int mce_start(int *no_way_out)
{
int order;
- int cpus = num_online_cpus();
u64 timeout = (u64)mca_cfg.monarch_timeout * NSEC_PER_USEC;
if (!timeout)
@@ -1006,7 +1005,7 @@ static int mce_start(int *no_way_out)
/*
* Wait for everyone.
*/
- while (atomic_read(&mce_callin) != cpus) {
+ while (atomic_read(&mce_callin) != num_online_cpus()) {
if (mce_timed_out(&timeout,
"Timeout: Not all CPUs entered broadcast exception handler")) {
atomic_set(&global_nwo, 0);
@@ -1070,14 +1069,11 @@ static int mce_end(int order)
atomic_inc(&mce_executing);
if (order == 1) {
- /* CHECKME: Can this race with a parallel hotplug? */
- int cpus = num_online_cpus();
-
/*
* Monarch: Wait for everyone to go through their scanning
* loops.
*/
- while (atomic_read(&mce_executing) <= cpus) {
+ while (atomic_read(&mce_executing) <= num_online_cpus()) {
if (mce_timed_out(&timeout,
"Timeout: Monarch CPU unable to finish machine check processing"))
goto reset;
--
2.29.2
next prev parent reply other threads:[~2021-11-04 14:40 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-04 14:40 [PATCH v0 00/12] x86/mce: Correct the noinstr annotation Borislav Petkov
2021-11-04 14:40 ` [PATCH v0 01/12] x86/mce: Do not use memset to clear the banks bitmaps Borislav Petkov
2021-11-04 14:40 ` Borislav Petkov [this message]
2021-11-04 14:40 ` [PATCH v0 03/12] x86/mce: Use mce_rdmsrl() in severity checking code Borislav Petkov
2021-11-04 14:40 ` [PATCH v0 04/12] x86/mce: Remove noinstr annotation from mce_setup() Borislav Petkov
2021-11-04 14:40 ` [PATCH v0 05/12] x86/mce: Allow instrumentation during task work queueing Borislav Petkov
2021-11-09 22:05 ` Borislav Petkov
2021-11-04 14:40 ` [PATCH v0 06/12] x86/mce: Prevent severity computation from being instrumented Borislav Petkov
2021-11-04 14:40 ` [PATCH v0 07/12] x86/mce: Mark mce_panic() noinstr Borislav Petkov
2021-11-04 14:40 ` [PATCH v0 08/12] x86/mce: Mark mce_end() noinstr Borislav Petkov
2021-11-04 14:40 ` [PATCH v0 09/12] x86/mce: Mark mce_read_aux() noinstr Borislav Petkov
2021-11-04 14:40 ` [PATCH v0 10/12] x86/mce: Move the tainting outside of the noinstr region Borislav Petkov
2021-11-04 14:40 ` [PATCH v0 11/12] x86/mce: Mark mce_timed_out() noinstr Borislav Petkov
2021-11-04 14:40 ` [PATCH v0 12/12] x86/mce: Mark mce_start() noinstr Borislav Petkov
2021-11-09 22:08 ` [PATCH v0 00/12] x86/mce: Correct the noinstr annotation Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211104144035.20107-3-bp@alien8.de \
--to=bp@alien8.de \
--cc=linux-kernel@vger.kernel.org \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox