Rework mce_severity
v2 cover Rework mce_severity
Patch1: Introduce AMD severities function
Patch2: Initialise mce_severity function pointer to choose between
Intel or AMD grading mechanisms
Aravind Gopalakrishnan (2):
x86, mce, severities: Add AMD severities function x86, mce, severities: Define mce_severity function pointer
arch/x86/include/asm/mce.h | 8 ++++ arch/x86/kernel/cpu/mcheck/mce-internal.h | 3 +- arch/x86/kernel/cpu/mcheck/mce-severity.c | 80 ++++++++++++++++++++++++++++++- arch/x86/kernel/cpu/mcheck/mce.c | 10 ++++ 4 files changed, 99 insertions(+), 2 deletions(-)
Signature · 1 line
1.9.1
PATCH v2 1/2 x86, mce, severities: Add AMD severities function
Add a severities function that caters to AMD processors. This allows us to do some vendor specific work within the function if necessary.
Also, introduce a vendor flag bitfield which contains vendor specific flags. The severities code uses this to define error scope based on the prescence of the flags field.
This is based off of work by Boris Petkov.
Testing details:
Tested the patch for any regressions on F15hM0h-0fh (Orochi) and F15hM60h-6fh (Carrizo) and it works fine.
---
Changes from V1:
- Test mce_flags.overflow_recov once instead of multiple times
arch/x86/include/asm/mce.h | 6 ++++ arch/x86/kernel/cpu/mcheck/mce-severity.c | 53 +++++++++++++++++++++++++++++++ arch/x86/kernel/cpu/mcheck/mce.c | 9 ++++++ 3 files changed, 68 insertions(+)
arch/x86/include/asm/mce.h +6 -0
@@ -116,6 +116,12 @@ struct mca_config {u32 rip_msr; }; +struct mce_vendor_flags { +__u64 overflow_recov :1 ,/* cpuid_ebx(80000007) */ + __reserved_0 :63 ; +}; +extern struct mce_vendor_flags mce_flags; +extern struct mca_config mca_cfg;extern void mce_register_decode_chain (struct notifier_block *nb);extern void mce_unregister_decode_chain (struct notifier_block *nb);
arch/x86/kernel/cpu/mcheck/mce-severity.c +53 -0
65 lines not on this page · raw message
arch/x86/kernel/cpu/mcheck/mce.c +9 -0
@@ -65,6 +65,7 @@ static DEFINE_MUTEX(mce_chrdev_read_mutex);DEFINE_PER_CPU (unsigned, mce_exception_count);struct mce_bank *mce_banks__read_mostly ; +struct mce_vendor_flags mce_flags__read_mostly ;struct mca_config mca_cfg__read_mostly = { .bootlog =-1 ,
@@ -1532,6 +1533,13 @@ static int __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c)if (c->x86 ==6 && cfg->banks >0 ) mce_banks[0 ].ctl =0 ; +/* +* overflow_recov is supported for F15h Models 00h-0fh +* even though we don't have cpuid bit for this +*/ +if (c->x86 ==0x15 && c->x86_model <=0xf ) + mce_flags.overflow_recov =1 ; +/* * Turn off MC4_MISC thresholding banks on those models since * they're not supported there.
@@ -1637,6 +1645,7 @@ static void __mcheck_cpu_init_vendor(struct cpuinfo_x86 *c)break ;case X86_VENDOR_AMD :mce_amd_feature_init (c); + mce_flags.overflow_recov =cpuid_ebx (0x80000007 ) &0x1 ;break ;default :break ;
Signature · 1 line
1.9.1
PATCH v2 2/2 x86, mce, severities: Define mce_severity function pointer
In reply to Aravind GopalakrishnanRename mce_severity() as mce_severity_intel and assign mce_severity function pointer to either one of mce_severity_intel or mce_severity_amd during init depending on which processor we are on.
This way, we can avoid a test to call mce_severity_amd every time we get into mce_severity(). And it's cleaner to do it this way.
--- arch/x86/include/asm/mce.h | 2 ++ arch/x86/kernel/cpu/mcheck/mce-internal.h | 3 ++- arch/x86/kernel/cpu/mcheck/mce-severity.c | 35 ++++++++++++++++++++++++++----- arch/x86/kernel/cpu/mcheck/mce.c | 1 + 4 files changed, 35 insertions(+), 6 deletions(-)
arch/x86/include/asm/mce.h +2 -0
@@ -134,9 +134,11 @@ extern int mce_p5_enabled;#ifdef CONFIG_X86_MCE int mcheck_init (void );void mcheck_cpu_init (struct cpuinfo_x86 *c); +void mcheck_vendor_init_severity (void );#else static inline int mcheck_init (void ) {return 0 ; }static inline void mcheck_cpu_init (struct cpuinfo_x86 *c) {} +static inline void mcheck_vendor_init_severity (void ) {}#endif #ifdef CONFIG_X86_ANCIENT_MCE
arch/x86/kernel/cpu/mcheck/mce-internal.h +2 -1
@@ -24,7 +24,8 @@ struct mce_bank {char attrname[ATTR_LEN ];/* attribute name */ }; -int mce_severity (struct mce *a,int tolerant,char **msg,bool is_excp); +extern int (*mce_severity)(struct mce *a,int tolerant, +char **msg,bool is_excp);struct dentry *mce_get_debugfs_dir (void );extern struct mce_bank *mce_banks;
arch/x86/kernel/cpu/mcheck/mce-severity.c +30 -5
@@ -187,7 +187,8 @@ static int error_context(struct mce *m) }/* keeping mce_severity_amd in sync with AMD error scope heirarchy table */ -static int mce_severity_amd (struct mce *m,enum context ctx) +static int mce_severity_amd (struct mce *m,int tolerant, +char **msg,bool is_excp) {enum context ctx =error_context (m);/* Processor Context Corrupt, no need to fumble too much, die! */
@@ -236,15 +237,13 @@ static int mce_severity_amd(struct mce *m, enum context ctx)return MCE_KEEP_SEVERITY ; } -int mce_severity (struct mce *m,int tolerant,char **msg,bool is_excp) +static int mce_severity_intel (struct mce *m,int tolerant, +char **msg,bool is_excp) {enum exception excp = (is_excp ?EXCP_CONTEXT :NO_EXCP );enum context ctx =error_context (m);struct severity *s; -if (m->cpuvendor ==X86_VENDOR_AMD ) -return mce_severity_amd (m, ctx); -for (s = severities;; s++) {if ((m->status & s->mask) != s->result)continue ;
@@ -269,6 +268,32 @@ int mce_severity(struct mce *m, int tolerant, char **msg, bool is_excp) } } +static int mce_severity_default (struct mce *m,int tolerant, +char **msg,bool is_excp) +{ +return MCE_PANIC_SEVERITY ; +} + +int (*mce_severity)(struct mce *m,int tolerant,char **msg,bool is_excp) = + mce_severity_default; + +void __init mcheck_vendor_init_severity (void ) +{ +struct cpuinfo_x86 *c = &boot_cpu_data; + +switch (c->x86_vendor) { +case X86_VENDOR_INTEL : + mce_severity = mce_severity_intel; +break ; +case X86_VENDOR_AMD : + mce_severity = mce_severity_amd; +break ; +default : +WARN_ONCE (1 ,"WTF!?" ); +break ; + } +} +#ifdef CONFIG_DEBUG_FS static void *s_start (struct seq_file *f,loff_t *pos) {
arch/x86/kernel/cpu/mcheck/mce.c +1 -0
@@ -2030,6 +2030,7 @@ __setup("mce", mcheck_enable);int __init mcheck_init (void ) {mcheck_intel_therm_init (); +mcheck_vendor_init_severity ();return 0 ; }
Signature · 1 line
1.9.1
RE: [PATCH V2 2/2] x86, mce, severities: Define mce_severity function pointer
+ default:
+ WARN_ONCE(1, "WTF!?");
+ break;
You meant to type:
mce_severity = mce_severity_default;
just there, right?
-Tony
Re: [PATCH V2 2/2] x86, mce, severities: Define mce_severity function pointer
Quoted 10 lines · Tony
arch/x86/kernel/cpu/mcheck/mce-severity.c +3
-0+default : +WARN_ONCE (1 ,"WTF!?" ); +break ;You meant to type:
mce_severity = mce_severity_default;just there, right?
Other function pointers in the mce code like unexpected_machine_check and default_threshold_interrupt are assigned to the respective function pointers when they are defined.
So, I just followed a similar assignment for mce_severity_default.
I can do that in the default statement if you prefer.
Thanks,
-Aravind.
Borislav Petkov
maintainerRe: [PATCH V2 2/2] x86, mce, severities: Define mce_severity function pointer
Quoted 3 lines · Aravind Gopalakrishnan
Other function pointers in the mce code like
unexpected_machine_checkanddefault_threshold_interruptare assigned to the respective function pointers when they are defined.
The "WTF?!" would still fire and we don't want that.
Also, I'm not sure about returning MCE_PANIC_SEVERITY by default. I mean, the code for !(Intel || AMD) has worked just fine with the original severities, i.e., mce_severity_intel() now.
So maybe we should assign mce_severity_intel() on static init of the mce_severity pointer and override it only on AMD...
This keeps the old behaviour for other machines, in the manner of letting sleeping dogs lie...
Signature · 5 lines
Regards/Gruss,
Boris.
ECO tip #101: Trim your mails when you reply.
--Re: [PATCH V2 2/2] x86, mce, severities: Define mce_severity function pointer
Quoted 5 lines · Borislav Petkov
Quoted 3 lines · Aravind Gopalakrishnan
Other function pointers in the mce code like
unexpected_machine_checkanddefault_threshold_interruptare assigned to the respective function pointers when they are defined.The "WTF?!" would still fire and we don't want that.
Ah. Ok, I misunderstood. Will clear this.
Quoted 10 lines
Also, I'm not sure about returning
MCE_PANIC_SEVERITYby default. I mean, the code for !(Intel || AMD) has worked just fine with the original severities, i.e.,mce_severity_intel()now.So maybe we should assign
mce_severity_intel()on static init of themce_severitypointer and override it only on AMD...This keeps the old behaviour for other machines, in the manner of letting sleeping dogs lie...
Ok, I'll do that and resend.
Thanks,
-Aravind.