From: "Jan H. Schönherr" <jschoenh@amazon.de>
To: Borislav Petkov <bp@alien8.de>
Cc: "Jan H. Schönherr" <jschoenh@amazon.de>,
"Yazen Ghannam" <yazen.ghannam@amd.com>,
linux-kernel@vger.kernel.org, linux-edac@vger.kernel.org,
"Tony Luck" <tony.luck@intel.com>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Ingo Molnar" <mingo@redhat.com>,
"H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org
Subject: [PATCH v2 4/6] x86/mce: Allow a variable number of internal MCE decode notifiers
Date: Fri, 3 Jan 2020 16:07:20 +0100 [thread overview]
Message-ID: <20200103150722.20313-5-jschoenh@amazon.de> (raw)
In-Reply-To: <20200103150722.20313-1-jschoenh@amazon.de>
Get rid of the compile time constant of internal (or mandatory)
MCE decode notifiers in preparation for future changes. Instead,
distinguish explicitly between internal and external MCE decode
notifiers.
Signed-off-by: Jan H. Schönherr <jschoenh@amazon.de>
---
New in v2, preparation for patches 5 and 6.
---
arch/x86/kernel/cpu/mce/core.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
index 1d91ce956772..d48deb127071 100644
--- a/arch/x86/kernel/cpu/mce/core.c
+++ b/arch/x86/kernel/cpu/mce/core.c
@@ -157,21 +157,24 @@ void mce_log(struct mce *m)
EXPORT_SYMBOL_GPL(mce_log);
/*
- * We run the default notifier if we have only the UC, the first and the
- * default notifier registered. I.e., the mandatory NUM_DEFAULT_NOTIFIERS
+ * We run the default notifier as long as we have no external
* notifiers registered on the chain.
*/
-#define NUM_DEFAULT_NOTIFIERS 3
static atomic_t num_notifiers;
-void mce_register_decode_chain(struct notifier_block *nb)
+static void mce_register_decode_chain_internal(struct notifier_block *nb)
{
if (WARN_ON(nb->priority > MCE_PRIO_MCELOG && nb->priority < MCE_PRIO_EDAC))
return;
+ blocking_notifier_chain_register(&x86_mce_decoder_chain, nb);
+}
+
+void mce_register_decode_chain(struct notifier_block *nb)
+{
atomic_inc(&num_notifiers);
- blocking_notifier_chain_register(&x86_mce_decoder_chain, nb);
+ mce_register_decode_chain_internal(nb);
}
EXPORT_SYMBOL_GPL(mce_register_decode_chain);
@@ -611,7 +614,7 @@ static int mce_default_notifier(struct notifier_block *nb, unsigned long val,
if (!m)
return NOTIFY_DONE;
- if (atomic_read(&num_notifiers) > NUM_DEFAULT_NOTIFIERS)
+ if (atomic_read(&num_notifiers))
return NOTIFY_DONE;
__print_mce(m);
@@ -1966,9 +1969,9 @@ __setup("mce", mcheck_enable);
int __init mcheck_init(void)
{
mcheck_intel_therm_init();
- mce_register_decode_chain(&first_nb);
- mce_register_decode_chain(&mce_uc_nb);
- mce_register_decode_chain(&mce_default_nb);
+ mce_register_decode_chain_internal(&first_nb);
+ mce_register_decode_chain_internal(&mce_uc_nb);
+ mce_register_decode_chain_internal(&mce_default_nb);
mcheck_vendor_init_severity();
INIT_WORK(&mce_work, mce_gen_pool_process);
--
2.22.0.3.gb49bb57c8208.dirty
next prev parent reply other threads:[~2020-01-03 15:07 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-03 15:07 [PATCH v2 0/6] x86/mce: Various fixes and cleanups for MCE handling Jan H. Schönherr
2020-01-03 15:07 ` [PATCH v2 1/6] x86/mce: Take action on UCNA/Deferred errors again Jan H. Schönherr
2020-01-10 9:50 ` Borislav Petkov
2020-01-10 18:45 ` Luck, Tony
2020-01-11 13:06 ` Borislav Petkov
2020-01-11 13:17 ` Borislav Petkov
2020-01-03 15:07 ` [PATCH v2 2/6] x86/mce: Make mce=nobootlog work again Jan H. Schönherr
2020-01-03 15:07 ` [PATCH v2 3/6] x86/mce: Fix use of uninitialized MCE message string Jan H. Schönherr
2020-01-03 15:07 ` Jan H. Schönherr [this message]
2020-01-03 15:07 ` [PATCH v2 5/6] x86/mce: Do not take action on SRAO/Deferred errors on AMD for now Jan H. Schönherr
2020-01-03 15:07 ` [PATCH v2 6/6] x86/mce: Dynamically register default MCE handler Jan H. Schönherr
2020-01-03 19:46 ` Luck, Tony
2020-01-03 21:42 ` Luck, Tony
2020-01-03 22:03 ` Borislav Petkov
2020-01-08 4:24 ` Ghannam, Yazen
2020-01-08 10:03 ` Borislav Petkov
2020-01-09 20:39 ` Ghannam, Yazen
2020-01-09 21:54 ` Luck, Tony
2020-01-09 22:30 ` Jan H. Schönherr
2020-01-04 11:49 ` kbuild test robot
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=20200103150722.20313-5-jschoenh@amazon.de \
--to=jschoenh@amazon.de \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
--cc=yazen.ghannam@amd.com \
/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;
as well as URLs for NNTP newsgroup(s).