MCE wrapper and support for new SMCA syndrome MSRs
Subsystems (5)
v7 cover MCE wrapper and support for new SMCA syndrome MSRs
This patchset adds a new wrapper for struct mce to prevent its bloating and export vendor specific error information. Additionally, support is also introduced for two new "syndrome" MSRs used in newer AMD Scalable MCA (SMCA) systems. Also, a new "FRU Text in MCA" feature that uses these new "syndrome" MSRs has been addded.
Patch 1 adds the new wrapper structure mce_hw_err for the struct mce while also modifying the mce_record tracepoint to use the new wrapper.
Patch 2 introduces a new helper function, __print_dynamic_array(), for logging dynamic arrays through tracepoints.
Patch 3 adds support for the new "syndrome" registers. They are read/printed wherever the existing MCA_SYND register is used.
Patch 4 updates the function that pulls MCA information from UEFI x86 Common Platform Error Records (CPERs) to handle systems that support the new registers.
Patch 5 adds support to the AMD MCE decoder module to detect and use the "FRU Text in MCA" feature which leverages the new registers.
NOTE:
This set was initially submitted as part of the larger MCA Updates set.
v1: https://lore.kernel.org/linux-edac/[email protected]/
v2: https://lore.kernel.org/linux-edac/[email protected]/
However, since the MCA Updates set has been split up into smaller sets, this set, going forward, will be submitted independently.
Having said that, this set set depends on and applies cleanly on top ofthe below two sets.
[1] https://lore.kernel.org/linux-edac/[email protected]/
[2] https://lore.kernel.org/linux-edac/[email protected]/
Changes in v2:
- Drop dependencies on sets [1] and [2] above and rebase on top of tip/master.
Changes in v3:
- Move wrapper changes required in mce_read_aux() and mce_no_way_out() from second patch to the first patch.
- Modify commit messages for second and fourth patch per feedback received.
- Add comments to explain purpose of the new wrapper structure.
- Incorporate suggested touchup in the third patch.
- Remove call to memset() for the frutext string in the fourth patch. Instead, just ensure that the string is NULL terminated.
- Fix SoB chains on all patches to properly reflect the patch path.
Changes in v4:
- Resolve kernel test robot's warning on the use of memset() in do_machine_check().
- Rebase on top of tip/master to avoid merge conflicts.
Changes in v5:
- Introduce a new helper function __print_dynamic_array() for logging dynamic arrays through tracepoints.
- Remove "len" field from the modified mce_record tracepoint since the length of a dynamic array can be fetched from its metadata.
- Substitute __print_array() with __print_dynamic_array().
Changes in v6:
- Introduce to_mce_hw_err macro to eliminate changes required in notifier chain callback functions.
- Use the above macro in amd_decode_mce() notifier chain callback.
- Change third parameter of __mc_scan_banks() to a pointer to the new wrapper, struct mce_hw_err.
- Rebase on top of tip/master.
Changes in v7:
- Fix initialization of struct mce_hw_err *final in do_machine_check().
- Add parenthesis around el_size parameter in __print_dynamic_array macro.
- Add Reviewed-by: Qiuxu Zhuo <[email protected]> tag.
- Change second parameter of __print_dynamic_array from 8 to sizeof(u8) to ensure that the dynamic array is parsed using a u8 pointer instead of u64 pointer.
- Rebase on top of tip/master.
Links:
v1: https://lore.kernel.org/linux-edac/[email protected]/
v2: https://lore.kernel.org/linux-edac/[email protected]/
v3: https://lore.kernel.org/linux-edac/[email protected]/T/#t
v4: https://lore.kernel.org/linux-edac/[email protected]/
v5: https://lore.kernel.org/linux-edac/[email protected]/
v6: https://lore.kernel.org/linux-edac/[email protected]/
Avadhut Naik (2):
x86/mce: Add wrapper for struct mce to export vendor specific info x86/mce, EDAC/mce_amd: Add support for new MCA_SYND{1,2} registers
Steven Rostedt (1):
tracing: Add __print_dynamic_array() helper
Yazen Ghannam (2):
x86/mce/apei: Handle variable register array size EDAC/mce_amd: Add support for FRU Text in MCA
arch/x86/include/asm/mce.h | 38 +++- arch/x86/include/uapi/asm/mce.h | 3 +- arch/x86/kernel/cpu/mce/amd.c | 31 +-- arch/x86/kernel/cpu/mce/apei.c | 109 ++++++++--- arch/x86/kernel/cpu/mce/core.c | 217 ++++++++++++--------- arch/x86/kernel/cpu/mce/genpool.c | 18 +- arch/x86/kernel/cpu/mce/inject.c | 4 +- arch/x86/kernel/cpu/mce/internal.h | 4 +- drivers/edac/mce_amd.c | 25 ++- include/trace/events/mce.h | 49 ++--- include/trace/stages/stage3_trace_output.h | 8 + include/trace/stages/stage7_class_define.h | 1 + samples/trace_events/trace-events-sample.h | 7 +- 13 files changed, 334 insertions(+), 180 deletions(-)
base-commit: d7ec15ce8bdc955ce383123c4f01ad0a8155fb90
Signature · 1 line
2.43.0
PATCH v7 1/5 x86/mce: Add wrapper for struct mce to export vendor specific info
Currently, exporting new additional machine check error information involves adding new fields for the same at the end of the struct mce. This additional information can then be consumed through mcelog or tracepoint.
However, as new MSRs are being added (and will be added in the future) by CPU vendors on their newer CPUs with additional machine check error information to be exported, the size of struct mce will balloon on some CPUs, unnecessarily, since those fields are vendor-specific. Moreover, different CPU vendors may export the additional information in varying sizes.
The problem particularly intensifies since struct mce is exposed to userspace as part of UAPI. It's bloating through vendor-specific data should be avoided to limit the information being sent out to userspace.
Add a new structure mce_hw_err to wrap the existing struct mce. The same will prevent its ballooning since vendor-specifc data, if any, can now be exported through a union within the wrapper structure and through __dynamic_array in mce_record tracepoint.
Furthermore, new internal kernel fields can be added to the wrapper struct without impacting the user space API.
[Yazen: Add last commit message paragraph.]
---
Changes in v2:
[1] https://lore.kernel.org/linux-edac/[email protected]/
[2] https://lore.kernel.org/linux-edac/[email protected]/
1. Drop dependencies on sets [1] and [2] above and rebase on top of tip/master.
Changes in v3:
1. Move wrapper changes required in mce_read_aux() and mce_no_way_out() to this patch from the second patch.
2. Fix SoB chain to properly reflect the patch path.
Changes in v4:
1. Rebase on of tip/master to avoid merge conflicts.
2. Resolve kernel test robot's warning on the use of memset() in do_machine_check().
Changes in v5:
1. No changes except rebasing on top of tip/master.
Changes in v6:
1. Rebase on top of tip/master.
2. Introduce to_mce_hw_err macro to eliminate changes required in notifier chain callback functions, especially callback functions of EDAC drivers.
3. Change third parameter of __mc_scan_banks() to a pointer to the new wrapper structure and make the required changes accordingly.
Changes in v7:
1. Rebase on top of tip/master.
2. Fix initialization of struct mce_hw_err *final in do_machine_check().
--- arch/x86/include/asm/mce.h | 14 +- arch/x86/kernel/cpu/mce/amd.c | 27 ++-- arch/x86/kernel/cpu/mce/apei.c | 45 ++++--- arch/x86/kernel/cpu/mce/core.c | 205 ++++++++++++++++------------- arch/x86/kernel/cpu/mce/genpool.c | 18 +-- arch/x86/kernel/cpu/mce/inject.c | 4 +- arch/x86/kernel/cpu/mce/internal.h | 4 +- include/trace/events/mce.h | 42 +++--- 8 files changed, 200 insertions(+), 159 deletions(-)
arch/x86/include/asm/mce.h +12 -2
@@ -187,6 +187,16 @@ enum mce_notifier_prios { MCE_PRIO_HIGHEST = MCE_PRIO_CEC }; +/** +* struct mce_hw_err - Hardware Error Record. +* @m: Machine Check record. +*/ +struct mce_hw_err { +struct mce m; +}; + +#define to_mce_hw_err (mce) container_of(mce, struct mce_hw_err, m) +struct notifier_block ;extern void mce_register_decode_chain (struct notifier_block *nb);extern void mce_unregister_decode_chain (struct notifier_block *nb);
@@ -221,8 +231,8 @@ static inline int apei_smca_report_x86_error(struct cper_ia_proc_ctx *ctx_info, u64 lapic_id) { return -EINVAL; }#endif -void mce_prep_record (struct mce *m); -void mce_log (struct mce *m); +void mce_prep_record (struct mce_hw_err *err); +void mce_log (struct mce_hw_err *err); DECLARE_PER_CPU(struct device *, mce_device);/* Maximum number of MCA banks per CPU. */
arch/x86/kernel/cpu/mce/amd.c +14 -13
@@ -778,29 +778,30 @@ bool amd_mce_usable_address(struct mce *m)static void __log_error (unsigned int bank,u64 status,u64 addr,u64 misc) { -struct mce m; +struct mce_hw_err err; +struct mce *m = &err.m; -mce_prep_record (&m); +mce_prep_record (&err); - m.status = status; - m.misc = misc; - m.bank = bank; - m.tsc =rdtsc (); + m->status = status; + m->misc = misc; + m->bank = bank; + m->tsc =rdtsc (); -if (m.status &MCI_STATUS_ADDRV ) { - m.addr = addr; +if (m->status &MCI_STATUS_ADDRV ) { + m->addr = addr; -smca_extract_err_addr (&m); +smca_extract_err_addr (m); }if (mce_flags.smca) { -rdmsrl (MSR_AMD64_SMCA_MCx_IPID (bank), m.ipid); +rdmsrl (MSR_AMD64_SMCA_MCx_IPID (bank), m->ipid); -if (m.status &MCI_STATUS_SYNDV ) -rdmsrl (MSR_AMD64_SMCA_MCx_SYND (bank), m.synd); +if (m->status &MCI_STATUS_SYNDV ) +rdmsrl (MSR_AMD64_SMCA_MCx_SYND (bank), m->synd); } -mce_log (&m); +mce_log (&err); }DEFINE_IDTENTRY_SYSVEC (sysvec_deferred_error)
arch/x86/kernel/cpu/mce/apei.c +25 -20
80 lines not on this page · raw message
arch/x86/kernel/cpu/mce/core.c +114 -91
551 lines not on this page · raw message
arch/x86/kernel/cpu/mce/genpool.c +9 -9
@@ -31,15 +31,15 @@ static LLIST_HEAD(mce_event_llist);*/ static bool is_duplicate_mce_record (struct mce_evt_llist *t,struct mce_evt_llist *l) { +struct mce_hw_err *err1, *err2;struct mce_evt_llist *node; -struct mce *m1, *m2; - m1 = &t->mce; + err1 = &t->err;llist_for_each_entry (node, &l->llnode, llnode) { - m2 = &node->mce; + err2 = &node->err; -if (!mce_cmp (m1, m2)) +if (!mce_cmp (&err1->m, &err2->m))return true; }return false;
@@ -73,9 +73,9 @@ struct llist_node *mce_gen_pool_prepare_records(void)void mce_gen_pool_process (struct work_struct *__unused) { +struct mce *mce;struct llist_node *head;struct mce_evt_llist *node, *tmp; -struct mce *mce; head =llist_del_all (&mce_event_llist);if (!head)
@@ -83,7 +83,7 @@ void mce_gen_pool_process(struct work_struct *__unused) head =llist_reverse_order (head);llist_for_each_entry_safe (node, tmp, head, llnode) { - mce = &node->mce; + mce = &node->err.m;blocking_notifier_call_chain (&x86_mce_decoder_chain,0 , mce);gen_pool_free (mce_evt_pool, (unsigned long )node,sizeof (*node)); }
@@ -94,11 +94,11 @@ bool mce_gen_pool_empty(void)return llist_empty (&mce_event_llist); } -int mce_gen_pool_add (struct mce *mce) +int mce_gen_pool_add (struct mce_hw_err *err) {struct mce_evt_llist *node; -if (filter_mce (mce)) +if (filter_mce (&err->m))return -EINVAL ;if (!mce_evt_pool)
@@ -110,7 +110,7 @@ int mce_gen_pool_add(struct mce *mce)return -ENOMEM ; } -memcpy (&node->mce, mce,sizeof (*mce)); +memcpy (&node->err, err,sizeof (*err));llist_add (&node->llnode, &mce_event_llist);return 0 ;
arch/x86/kernel/cpu/mce/inject.c +3 -1
@@ -502,6 +502,7 @@ static void prepare_msrs(void *info)static void do_inject (void ) { +struct mce_hw_err err;u64 mcg_status =0 ;unsigned int cpu = i_mce.extcpu;u8 b = i_mce.bank;
@@ -517,7 +518,8 @@ static void do_inject(void) i_mce.status |=MCI_STATUS_SYNDV ;if (inj_type ==SW_INJ ) { -mce_log (&i_mce); + err.m = i_mce; +mce_log (&err);return ; }
arch/x86/kernel/cpu/mce/internal.h +2 -2
@@ -26,12 +26,12 @@ extern struct blocking_notifier_head x86_mce_decoder_chain;struct mce_evt_llist {struct llist_node llnode; -struct mce mce; +struct mce_hw_err err; };void mce_gen_pool_process (struct work_struct *__unused);bool mce_gen_pool_empty (void ); -int mce_gen_pool_add (struct mce *mce); +int mce_gen_pool_add (struct mce_hw_err *err);int mce_gen_pool_init (void );struct llist_node *mce_gen_pool_prepare_records (void );
include/trace/events/mce.h +21 -21
55 lines not on this page · raw message
Signature · 1 line
2.43.0
RE: [PATCH v7 1/5] x86/mce: Add wrapper for struct mce to export vendor specific info
Quoted 64 lines
From: Avadhut Naik <[email protected]>
[...]
Subject: [PATCH v7 1/5] x86/mce: Add wrapper for struct mce to export vendor specific infoCurrently, exporting new additional machine check error information involves adding new fields for the same at the end of the struct mce. This additional information can then be consumed through mcelog or tracepoint.
However, as new MSRs are being added (and will be added in the future) by CPU vendors on their newer CPUs with additional machine check error information to be exported, the size of struct mce will balloon on some CPUs, unnecessarily, since those fields are vendor-specific. Moreover, different CPU vendors may export the additional information in varying sizes.
The problem particularly intensifies since struct mce is exposed to userspace as part of UAPI. It's bloating through vendor-specific data should be avoided to limit the information being sent out to userspace.
Add a new structure
mce_hw_errto wrap the existing struct mce. The same will prevent its ballooning since vendor-specifc data, if any, can now be exported through a union within the wrapper structure and through__dynamic_arrayinmce_recordtracepoint.Furthermore, new internal kernel fields can be added to the wrapper struct without impacting the user space API.
[Yazen: Add last commit message paragraph.]
Suggested-by Borislav Petkov (AMD) <[email protected]>Signed-off-by Avadhut Naik <[email protected]>Signed-off-by Yazen Ghannam <[email protected]>Signed-off-by Avadhut Naik <[email protected]>---
Changes in v2:
[1] https://lore.kernel.org/linux-edac/20240521125434.1555845-1-
[email protected]/
[2] https://lore.kernel.org/linux-edac/20240523155641.2805411-1-
[email protected]/1. Drop dependencies on sets [1] and [2] above and rebase on top of tip/master.
Changes in v3:
1. Move wrapper changes required inmce_read_aux()andmce_no_way_out()to this patch from the second patch.
2. Fix SoB chain to properly reflect the patch path.Changes in v4:
1. Rebase on of tip/master to avoid merge conflicts.
2. Resolve kernel test robot's warning on the use ofmemset()indo_machine_check().Changes in v5:
1. No changes except rebasing on top of tip/master.Changes in v6:
1. Rebase on top of tip/master.
2. Introduceto_mce_hw_errmacro to eliminate changes required in notifier chain callback functions, especially callback functions of EDAC drivers.
3. Change third parameter of__mc_scan_banks()to a pointer to the new wrapper structure and make the required changes accordingly.
Quoted 3 lines
Changes in v7:
1. Rebase on top of tip/master.
2. Fix initialization of structmce_hw_err*final indo_machine_check().
As my comments resolved in v6 and v7,
-Qiuxu
Borislav Petkov
maintainerRe: [PATCH v7 1/5] x86/mce: Add wrapper for struct mce to export vendor specific info
In reply to Avadhut NaikQuoted 12 lines · Avadhut Naik
Currently, exporting new additional machine check error information involves adding new fields for the same at the end of the struct mce. This additional information can then be consumed through mcelog or tracepoint.
However, as new MSRs are being added (and will be added in the future) by CPU vendors on their newer CPUs with additional machine check error information to be exported, the size of struct mce will balloon on some CPUs, unnecessarily, since those fields are vendor-specific. Moreover, different CPU vendors may export the additional information in varying sizes.
Quoted 6 lines
The problem particularly intensifies since struct mce is exposed to userspace as part of UAPI. It's bloating through vendor-specific data should be avoided to limit the information being sent out to userspace.
Add a new structure
mce_hw_errto wrap the existing struct mce. The same will prevent its ballooning since vendor-specifc data, if any, can now be
Unknown word [vendor-specifc] in commit message.
Please introduce a spellchecker into your patch creation workflow.
Also:
The tip-tree preferred ordering of variable declarations at the beginning of a function is reverse fir tree order::
struct long_struct_name *descriptive_name; unsigned long foo, bar; unsigned int tmp; int ret;
The above is faster to parse than the reverse ordering::
int ret; unsigned int tmp; unsigned long foo, bar; struct long_struct_name *descriptive_name;
And even more so than random ordering::
unsigned long foo, bar; int ret; struct long_struct_name *descriptive_name; unsigned int tmp;
diff ontop of yours:
---
arch/x86/kernel/cpu/mce/core.c +3 -3
@@ -1030,11 +1030,11 @@ static noinstr int mce_timed_out(u64 *t, const char *msg)*/ static void mce_reign (void ) { -int cpu;struct mce_hw_err *err =NULL ;struct mce *m =NULL ;int global_worst =0 ;char *msg =NULL ; +int cpu;/* * This CPU is the Monarch and the other CPUs have run
@@ -1291,8 +1291,8 @@ __mc_scan_banks(struct mce_hw_err *err, struct pt_regs *regs, {struct mce_bank *mce_banks =this_cpu_ptr (mce_banks_array);struct mca_config *cfg = &mca_cfg; -struct mce *m = &err->m;int severity, i, taint =0 ; +struct mce *m = &err->m;for (i =0 ; i <this_cpu_read (mce_num_banks); i++) {arch___clear_bit (i, toclear);
@@ -1419,8 +1419,8 @@ static void kill_me_never(struct callback_head *cb)static void queue_task_work (struct mce_hw_err *err,char *msg,void (*func)(struct callback_head *)) { -struct mce *m = &err->m;int count = ++current->mce_count; +struct mce *m = &err->m;/* First call, save all the details */ if (count ==1 ) {
arch/x86/kernel/cpu/mce/genpool.c +2 -2
@@ -73,9 +73,9 @@ struct llist_node *mce_gen_pool_prepare_records(void)void mce_gen_pool_process (struct work_struct *__unused) { -struct mce *mce; -struct llist_node *head;struct mce_evt_llist *node, *tmp; +struct llist_node *head; +struct mce *mce; head =llist_del_all (&mce_event_llist);if (!head)
arch/x86/kernel/cpu/mce/inject.c +1 -1
@@ -502,9 +502,9 @@ static void prepare_msrs(void *info)static void do_inject (void ) { +unsigned int cpu = i_mce.extcpu;struct mce_hw_err err;u64 mcg_status =0 ; -unsigned int cpu = i_mce.extcpu;u8 b = i_mce.bank; i_mce.tsc =rdtsc_ordered ();
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteRe: [PATCH v7 1/5] x86/mce: Add wrapper for struct mce to export vendor specific info
Quoted 17 lines · Borislav Petkov
Quoted 16 lines · Avadhut Naik
Currently, exporting new additional machine check error information involves adding new fields for the same at the end of the struct mce. This additional information can then be consumed through mcelog or tracepoint.
However, as new MSRs are being added (and will be added in the future) by CPU vendors on their newer CPUs with additional machine check error information to be exported, the size of struct mce will balloon on some CPUs, unnecessarily, since those fields are vendor-specific. Moreover, different CPU vendors may export the additional information in varying sizes.
The problem particularly intensifies since struct mce is exposed to userspace as part of UAPI. It's bloating through vendor-specific data should be avoided to limit the information being sent out to userspace.
Quoted 7 lines
Quoted 2 lines
Add a new structure
mce_hw_errto wrap the existing struct mce. The same will prevent its ballooning since vendor-specifc data, if any, can now beUnknown word [vendor-specifc] in commit message.
Please introduce a spellchecker into your patch creation workflow.
Will fix this.
Quoted 86 lines
Also:
The tip-tree preferred ordering of variable declarations at the beginning of a function is reverse fir tree order::
struct long_struct_name *descriptive_name; unsigned long foo, bar; unsigned int tmp; int ret;The above is faster to parse than the reverse ordering::
int ret; unsigned int tmp; unsigned long foo, bar; struct long_struct_name *descriptive_name;And even more so than random ordering::
unsigned long foo, bar; int ret; struct long_struct_name *descriptive_name; unsigned int tmp;diff ontop of yours:
---
arch/x86/kernel/cpu/mce/core.c +3
-3@@ -1030,11 +1030,11 @@ static noinstr int mce_timed_out(u64 *t, const char *msg)*/ static void mce_reign (void ) { -int cpu;struct mce_hw_err *err =NULL ;struct mce *m =NULL ;int global_worst =0 ;char *msg =NULL ; +int cpu;/* * This CPU is the Monarch and the other CPUs have run @@ -1291,8 +1291,8 @@ __mc_scan_banks(struct mce_hw_err *err, struct pt_regs *regs, {struct mce_bank *mce_banks =this_cpu_ptr (mce_banks_array);struct mca_config *cfg = &mca_cfg; -struct mce *m = &err->m;int severity, i, taint =0 ; +struct mce *m = &err->m;for (i =0 ; i <this_cpu_read (mce_num_banks); i++) {arch___clear_bit (i, toclear);@@ -1419,8 +1419,8 @@ static void kill_me_never(struct callback_head *cb)static void queue_task_work (struct mce_hw_err *err,char *msg,void (*func)(struct callback_head *)) { -struct mce *m = &err->m;int count = ++current->mce_count; +struct mce *m = &err->m;/* First call, save all the details */ if (count ==1 ) {arch/x86/kernel/cpu/mce/genpool.c +2
-2@@ -73,9 +73,9 @@ struct llist_node *mce_gen_pool_prepare_records(void)void mce_gen_pool_process (struct work_struct *__unused) { -struct mce *mce; -struct llist_node *head;struct mce_evt_llist *node, *tmp; +struct llist_node *head; +struct mce *mce; head =llist_del_all (&mce_event_llist);if (!head)arch/x86/kernel/cpu/mce/inject.c +0
-0
arch/x86/kernel/cpu/mce/inject.c static void prepare_msrs(void *info) · line 510
Quoted 10 lines
arch/x86/kernel/cpu/mce/inject.c +1
-1@@ -502,9 +502,9 @@ static void prepare_msrs(void *info)static void do_inject (void ) { +unsigned int cpu = i_mce.extcpu;struct mce_hw_err err;u64 mcg_status =0 ; -unsigned int cpu = i_mce.extcpu;u8 b = i_mce.bank; i_mce.tsc =rdtsc_ordered ();
Ack for the suggestions.
Signature · 2 lines
Thanks, Avadhut Naik
Borislav Petkov
maintainerRe: [PATCH v7 1/5] x86/mce: Add wrapper for struct mce to export vendor specific info
Quoted 1 line · Avadhut
Will fix this.
You don't have to - I'll fix up while applying.
This was just for your future info.
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteRe: [PATCH v7 1/5] x86/mce: Add wrapper for struct mce to export vendor specific info
Quoted 7 lines · Borislav Petkov
Quoted 1 line · Avadhut
Will fix this.
You don't have to - I'll fix up while applying.
This was just for your future info.
Okay! Thank you!
Quoted 2 lines
Thx.
Signature · 2 lines
Thanks, Avadhut Naik
[tip: ras/core] x86/mce: Add wrapper for struct mce to export vendor specific info
In reply to Avadhut NaikThe following commit has been merged into the ras/core branch of tip:
The following commit has been merged into the ras/core branch of tip:
Commit-ID: 750fd23926f1507cc826b5a4fdd4bfc7283e7723 Gitweb: https://git.kernel.org/tip/750fd23926f1507cc826b5a4fdd4bfc7283e7723 Author: Avadhut Naik <[email protected]> AuthorDate: Tue, 22 Oct 2024 19:36:27 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Wed, 30 Oct 2024 17:18:59 +01:00
x86/mce: Add wrapper for struct mce to export vendor specific info
Currently, exporting new additional machine check error information involves adding new fields for the same at the end of the struct mce. This additional information can then be consumed through mcelog or tracepoint.
However, as new MSRs are being added (and will be added in the future) by CPU vendors on their newer CPUs with additional machine check error information to be exported, the size of struct mce will balloon on some CPUs, unnecessarily, since those fields are vendor-specific. Moreover, different CPU vendors may export the additional information in varying sizes.
The problem particularly intensifies since struct mce is exposed to userspace as part of UAPI. It's bloating through vendor-specific data should be avoided to limit the information being sent out to userspace.
Add a new structure mce_hw_err to wrap the existing struct mce. The same will prevent its ballooning since vendor-specifc data, if any, can now be exported through a union within the wrapper structure and through __dynamic_array in mce_record tracepoint.
Furthermore, new internal kernel fields can be added to the wrapper struct without impacting the user space API.
[ bp: Restore reverse x-mas tree order of function vars declarations. ]
--- arch/x86/include/asm/mce.h | 14 +- arch/x86/kernel/cpu/mce/amd.c | 27 ++-- arch/x86/kernel/cpu/mce/apei.c | 45 +++--- arch/x86/kernel/cpu/mce/core.c | 207 +++++++++++++++------------- arch/x86/kernel/cpu/mce/genpool.c | 18 +- arch/x86/kernel/cpu/mce/inject.c | 6 +- arch/x86/kernel/cpu/mce/internal.h | 4 +- include/trace/events/mce.h | 42 +++--- 8 files changed, 202 insertions(+), 161 deletions(-)
arch/x86/include/asm/mce.h +12 -2
@@ -187,6 +187,16 @@ enum mce_notifier_prios { MCE_PRIO_HIGHEST = MCE_PRIO_CEC }; +/** +* struct mce_hw_err - Hardware Error Record. +* @m: Machine Check record. +*/ +struct mce_hw_err { +struct mce m; +}; + +#define to_mce_hw_err (mce) container_of(mce, struct mce_hw_err, m) +struct notifier_block ;extern void mce_register_decode_chain (struct notifier_block *nb);extern void mce_unregister_decode_chain (struct notifier_block *nb);
@@ -221,8 +231,8 @@ static inline int apei_smca_report_x86_error(struct cper_ia_proc_ctx *ctx_info, u64 lapic_id) { return -EINVAL; }#endif -void mce_prep_record (struct mce *m); -void mce_log (struct mce *m); +void mce_prep_record (struct mce_hw_err *err); +void mce_log (struct mce_hw_err *err); DECLARE_PER_CPU(struct device *, mce_device);/* Maximum number of MCA banks per CPU. */
arch/x86/kernel/cpu/mce/amd.c +14 -13
@@ -778,29 +778,30 @@ bool amd_mce_usable_address(struct mce *m)static void __log_error (unsigned int bank,u64 status,u64 addr,u64 misc) { -struct mce m; +struct mce_hw_err err; +struct mce *m = &err.m; -mce_prep_record (&m); +mce_prep_record (&err); - m.status = status; - m.misc = misc; - m.bank = bank; - m.tsc =rdtsc (); + m->status = status; + m->misc = misc; + m->bank = bank; + m->tsc =rdtsc (); -if (m.status &MCI_STATUS_ADDRV ) { - m.addr = addr; +if (m->status &MCI_STATUS_ADDRV ) { + m->addr = addr; -smca_extract_err_addr (&m); +smca_extract_err_addr (m); }if (mce_flags.smca) { -rdmsrl (MSR_AMD64_SMCA_MCx_IPID (bank), m.ipid); +rdmsrl (MSR_AMD64_SMCA_MCx_IPID (bank), m->ipid); -if (m.status &MCI_STATUS_SYNDV ) -rdmsrl (MSR_AMD64_SMCA_MCx_SYND (bank), m.synd); +if (m->status &MCI_STATUS_SYNDV ) +rdmsrl (MSR_AMD64_SMCA_MCx_SYND (bank), m->synd); } -mce_log (&m); +mce_log (&err); }DEFINE_IDTENTRY_SYSVEC (sysvec_deferred_error)
arch/x86/kernel/cpu/mce/apei.c +25 -20
80 lines not on this page · raw message
arch/x86/kernel/cpu/mce/core.c +115 -92
558 lines not on this page · raw message
arch/x86/kernel/cpu/mce/genpool.c +9 -9
@@ -31,15 +31,15 @@ static LLIST_HEAD(mce_event_llist);*/ static bool is_duplicate_mce_record (struct mce_evt_llist *t,struct mce_evt_llist *l) { +struct mce_hw_err *err1, *err2;struct mce_evt_llist *node; -struct mce *m1, *m2; - m1 = &t->mce; + err1 = &t->err;llist_for_each_entry (node, &l->llnode, llnode) { - m2 = &node->mce; + err2 = &node->err; -if (!mce_cmp (m1, m2)) +if (!mce_cmp (&err1->m, &err2->m))return true; }return false;
@@ -73,8 +73,8 @@ struct llist_node *mce_gen_pool_prepare_records(void)void mce_gen_pool_process (struct work_struct *__unused) { -struct llist_node *head;struct mce_evt_llist *node, *tmp; +struct llist_node *head;struct mce *mce; head =llist_del_all (&mce_event_llist);
@@ -83,7 +83,7 @@ void mce_gen_pool_process(struct work_struct *__unused) head =llist_reverse_order (head);llist_for_each_entry_safe (node, tmp, head, llnode) { - mce = &node->mce; + mce = &node->err.m;blocking_notifier_call_chain (&x86_mce_decoder_chain,0 , mce);gen_pool_free (mce_evt_pool, (unsigned long )node,sizeof (*node)); }
@@ -94,11 +94,11 @@ bool mce_gen_pool_empty(void)return llist_empty (&mce_event_llist); } -int mce_gen_pool_add (struct mce *mce) +int mce_gen_pool_add (struct mce_hw_err *err) {struct mce_evt_llist *node; -if (filter_mce (mce)) +if (filter_mce (&err->m))return -EINVAL ;if (!mce_evt_pool)
@@ -110,7 +110,7 @@ int mce_gen_pool_add(struct mce *mce)return -ENOMEM ; } -memcpy (&node->mce, mce,sizeof (*mce)); +memcpy (&node->err, err,sizeof (*err));llist_add (&node->llnode, &mce_event_llist);return 0 ;
arch/x86/kernel/cpu/mce/inject.c +4 -2
@@ -502,8 +502,9 @@ static void prepare_msrs(void *info)static void do_inject (void ) { -u64 mcg_status =0 ;unsigned int cpu = i_mce.extcpu; +struct mce_hw_err err; +u64 mcg_status =0 ;u8 b = i_mce.bank; i_mce.tsc =rdtsc_ordered ();
@@ -517,7 +518,8 @@ static void do_inject(void) i_mce.status |=MCI_STATUS_SYNDV ;if (inj_type ==SW_INJ ) { -mce_log (&i_mce); + err.m = i_mce; +mce_log (&err);return ; }
arch/x86/kernel/cpu/mce/internal.h +2 -2
@@ -26,12 +26,12 @@ extern struct blocking_notifier_head x86_mce_decoder_chain;struct mce_evt_llist {struct llist_node llnode; -struct mce mce; +struct mce_hw_err err; };void mce_gen_pool_process (struct work_struct *__unused);bool mce_gen_pool_empty (void ); -int mce_gen_pool_add (struct mce *mce); +int mce_gen_pool_add (struct mce_hw_err *err);int mce_gen_pool_init (void );struct llist_node *mce_gen_pool_prepare_records (void );
include/trace/events/mce.h +21 -21
55 lines not on this page · raw message
PATCH v7 2/5 tracing: Add __print_dynamic_array() helper
In reply to Avadhut NaikFrom: Steven Rostedt <[email protected]>
When printing a dynamic array in a trace event, the method is rather ugly. It has the format of:
__print_array(__get_dynamic_array(array),
__get_dynmaic_array_len(array) / el_size, el_size)
Since dynamic arrays are known to the tracing infrastructure, create a helper macro that does the above for you.
__print_dynamic_array(array, el_size)
Which would expand to the same output.
---
Changes in v5:
Patch introduced in the series.
Changes in v6:
No changes other than rebasing on top of tip/master.
Changes in v7:
1. Rebase on top of tip/master.
2. Added parenthesis around el_size parameter in macro.
3. Remove Cc (to Avadhut Naik) tag.
4. Add Reviewed-by: Qiuxu Zhuo <[email protected]> tag.
--- include/trace/stages/stage3_trace_output.h | 8 ++++++++ include/trace/stages/stage7_class_define.h | 1 + samples/trace_events/trace-events-sample.h | 7 ++++++- 3 files changed, 15 insertions(+), 1 deletion(-)
include/trace/stages/stage3_trace_output.h +8 -0
@@ -119,6 +119,14 @@trace_print_array_seq (p, array, count, el_size); \ }) +#undef __print_dynamic_array +#define __print_dynamic_array (array, el_size) \ + ({ \ + __print_array(__get_dynamic_array(array), \ + __get_dynamic_array_len(array) / (el_size), \ + (el_size)); \ + }) +#undef __print_hex_dump#define __print_hex_dump (prefix_str, prefix_type, \ rowsize, groupsize, buf, len, ascii) \
include/trace/stages/stage7_class_define.h +1 -0
@@ -22,6 +22,7 @@#undef __get_rel_cpumask#undef __get_rel_sockaddr#undef __print_array +#undef __print_dynamic_array#undef __print_hex_dump#undef __get_buf
samples/trace_events/trace-events-sample.h +6 -1
@@ -319,7 +319,7 @@ TRACE_EVENT(foo_bar,__assign_cpumask (cpum,cpumask_bits (mask)); ), - TP_printk("foo %s %d %s %s %s %s %s (%s) (%s) %s", __entry->foo, __entry->bar, + TP_printk("foo %s %d %s %s %s %s %s %s (%s) (%s) %s", __entry->foo, __entry->bar,/* * Notice here the use of some helper functions. This includes:
@@ -363,6 +363,11 @@ TRACE_EVENT(foo_bar,__print_array (__get_dynamic_array (list),__get_dynamic_array_len (list) /sizeof (int ),sizeof (int )), + +/* A shortcut is to use __print_dynamic_array for dynamic arrays */ + +__print_dynamic_array (list,sizeof (int )), +__get_str (str),__get_str (lstr),__get_bitmask (cpus),__get_cpumask (cpum), __get_str(vstr))
Signature · 1 line
2.43.0
[tip: ras/core] tracing: Add __print_dynamic_array() helper
The following commit has been merged into the ras/core branch of tip:
The following commit has been merged into the ras/core branch of tip:
Commit-ID: e52750fb1458ae9ea5860a08ed7a149185bc5b97 Gitweb: https://git.kernel.org/tip/e52750fb1458ae9ea5860a08ed7a149185bc5b97 Author: Steven Rostedt <[email protected]> AuthorDate: Tue, 22 Oct 2024 19:36:28 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Wed, 30 Oct 2024 17:24:32 +01:00
tracing: Add __print_dynamic_array() helper
When printing a dynamic array in a trace event, the method is rather ugly. It has the format of:
__print_array(__get_dynamic_array(array),
__get_dynmaic_array_len(array) / el_size, el_size)
Since dynamic arrays are known to the tracing infrastructure, create a helper macro that does the above for you.
__print_dynamic_array(array, el_size)
Which would expand to the same output.
--- include/trace/stages/stage3_trace_output.h | 8 ++++++++ include/trace/stages/stage7_class_define.h | 1 + samples/trace_events/trace-events-sample.h | 7 ++++++- 3 files changed, 15 insertions(+), 1 deletion(-)
include/trace/stages/stage3_trace_output.h +8 -0
@@ -119,6 +119,14 @@trace_print_array_seq (p, array, count, el_size); \ }) +#undef __print_dynamic_array +#define __print_dynamic_array (array, el_size) \ + ({ \ + __print_array(__get_dynamic_array(array), \ + __get_dynamic_array_len(array) / (el_size), \ + (el_size)); \ + }) +#undef __print_hex_dump#define __print_hex_dump (prefix_str, prefix_type, \ rowsize, groupsize, buf, len, ascii) \
include/trace/stages/stage7_class_define.h +1 -0
@@ -22,6 +22,7 @@#undef __get_rel_cpumask#undef __get_rel_sockaddr#undef __print_array +#undef __print_dynamic_array#undef __print_hex_dump#undef __get_buf
samples/trace_events/trace-events-sample.h +6 -1
@@ -319,7 +319,7 @@ TRACE_EVENT(foo_bar,__assign_cpumask (cpum,cpumask_bits (mask)); ), - TP_printk("foo %s %d %s %s %s %s %s (%s) (%s) %s", __entry->foo, __entry->bar, + TP_printk("foo %s %d %s %s %s %s %s %s (%s) (%s) %s", __entry->foo, __entry->bar,/* * Notice here the use of some helper functions. This includes:
@@ -363,6 +363,11 @@ TRACE_EVENT(foo_bar,__print_array (__get_dynamic_array (list),__get_dynamic_array_len (list) /sizeof (int ),sizeof (int )), + +/* A shortcut is to use __print_dynamic_array for dynamic arrays */ + +__print_dynamic_array (list,sizeof (int )), +__get_str (str),__get_str (lstr),__get_bitmask (cpus),__get_cpumask (cpum), __get_str(vstr))
PATCH v7 3/5 x86/mce, EDAC/mce_amd: Add support for new MCA_SYND{1,2} registers
In reply to Avadhut NaikStarting with Zen4, AMD's Scalable MCA systems incorporate two new
registers: MCA_SYND1 and MCA_SYND2.
These registers will include supplemental error information in addition to the existing MCA_SYND register. The data within these registers is considered valid if MCA_STATUS[SyndV] is set.
Userspace error decoding tools like the rasdaemon gather related hardware error information through the tracepoints. As such, these two registers should be exported through the mce_record tracepoint so that tools like rasdaemon can parse them and output the supplemental error information like FRU Text contained in them.
[Yazen: Drop Yazen's Co-developed-by tag and moved SoB tag.]
---
Changes in v2:
[1] https://lore.kernel.org/linux-edac/[email protected]/
[2] https://lore.kernel.org/linux-edac/[email protected]/
1. Drop dependencies on sets [1] and [2] above and rebase on top of tip/master.
Changes in v3:
1. Move wrapper changes required in mce_read_aux() and mce_no_way_out() from this patch to the first patch.
2. Add comments to explain the new wrapper's purpose.
3. Modify commit message per feedback received.
4. Fix SoB chain to properly reflect the patch path.
Changes in v4:
1. Rebase on top of tip/master to avoid merge conflicts.
Changes in v5:
1. Remove "len" field since the length of a dynamic array can be fetched from its metadata.
2. Substitute __print_array() with __print_dynamic_array().
Changes in v6:
1. Rebase on top of tip/master.
2. Use the newly introduced to_mce_hw_err macro in amd_decode_mce().
Changes in v7:
1. Rebase on top of tip/master.
2. Change second parameter of __print_dynamic_array from 8 to sizeof(u8) to ensure that the dynamic array is parsed using a u8 pointer instead of u64 pointer.
--- arch/x86/include/asm/mce.h | 22 ++++++++++++++++++++++ arch/x86/include/uapi/asm/mce.h | 3 ++- arch/x86/kernel/cpu/mce/amd.c | 5 ++++- arch/x86/kernel/cpu/mce/core.c | 9 ++++++++- drivers/edac/mce_amd.c | 8 ++++++-- include/trace/events/mce.h | 7 +++++-- 6 files changed, 47 insertions(+), 7 deletions(-)
arch/x86/include/asm/mce.h +22 -0
@@ -122,6 +122,9 @@#define MSR_AMD64_SMCA_MC0_DESTAT 0xc0002008#define MSR_AMD64_SMCA_MC0_DEADDR 0xc0002009#define MSR_AMD64_SMCA_MC0_MISC1 0xc000200a +/* Registers MISC2 to MISC4 are at offsets B to D. */ +#define MSR_AMD64_SMCA_MC0_SYND1 0xc000200e +#define MSR_AMD64_SMCA_MC0_SYND2 0xc000200f#define MSR_AMD64_SMCA_MCx_CTL (x) (MSR_AMD64_SMCA_MC0_CTL + 0x10*(x))#define MSR_AMD64_SMCA_MCx_STATUS (x) (MSR_AMD64_SMCA_MC0_STATUS + 0x10*(x))#define MSR_AMD64_SMCA_MCx_ADDR (x) (MSR_AMD64_SMCA_MC0_ADDR + 0x10*(x))
@@ -132,6 +135,8 @@#define MSR_AMD64_SMCA_MCx_DESTAT (x) (MSR_AMD64_SMCA_MC0_DESTAT + 0x10*(x))#define MSR_AMD64_SMCA_MCx_DEADDR (x) (MSR_AMD64_SMCA_MC0_DEADDR + 0x10*(x))#define MSR_AMD64_SMCA_MCx_MISCy (x, y) ((MSR_AMD64_SMCA_MC0_MISC1 + y) + (0x10*(x))) +#define MSR_AMD64_SMCA_MCx_SYND1 (x) (MSR_AMD64_SMCA_MC0_SYND1 + 0x10*(x)) +#define MSR_AMD64_SMCA_MCx_SYND2 (x) (MSR_AMD64_SMCA_MC0_SYND2 + 0x10*(x))#define XEC (x, mask) (((x) >> 16) & mask)
@@ -190,9 +195,26 @@ enum mce_notifier_prios {/** * struct mce_hw_err - Hardware Error Record. * @m: Machine Check record. +* @vendor: Vendor-specific error information. +* +* Vendor-specific fields should not be added to struct mce. +* Instead, vendors should export their vendor-specific data +* through their structure in the vendor union below. +* +* AMD's vendor data is parsed by error decoding tools for +* supplemental error information. Thus, current offsets of +* existing fields must be maintained. +* Only add new fields at the end of AMD's vendor structure. */ struct mce_hw_err {struct mce m; + +union vendor_info { +struct { +u64 synd1;/* MCA_SYND1 MSR */ +u64 synd2;/* MCA_SYND2 MSR */ + } amd; + } vendor; };#define to_mce_hw_err (mce) container_of(mce, struct mce_hw_err, m)
arch/x86/include/uapi/asm/mce.h +2 -1
@@ -8,7 +8,8 @@/* * Fields are zero when not available. Also, this struct is shared with * userspace mcelog and thus must keep existing fields at current offsets. -* Only add new fields to the end of the structure +* Only add new, shared fields to the end of the structure. +* Do not add vendor-specific fields. */ struct mce {__u64 status;/* Bank's MCi_STATUS MSR */
arch/x86/kernel/cpu/mce/amd.c +4 -1
@@ -797,8 +797,11 @@ static void __log_error(unsigned int bank, u64 status, u64 addr, u64 misc)if (mce_flags.smca) {rdmsrl (MSR_AMD64_SMCA_MCx_IPID (bank), m->ipid); -if (m->status &MCI_STATUS_SYNDV ) +if (m->status &MCI_STATUS_SYNDV ) {rdmsrl (MSR_AMD64_SMCA_MCx_SYND (bank), m->synd); +rdmsrl (MSR_AMD64_SMCA_MCx_SYND1 (bank), err.vendor.amd.synd1); +rdmsrl (MSR_AMD64_SMCA_MCx_SYND2 (bank), err.vendor.amd.synd2); + } }mce_log (&err);
arch/x86/kernel/cpu/mce/core.c +8 -1
@@ -202,6 +202,10 @@ static void __print_mce(struct mce_hw_err *err)if (mce_flags.smca) {if (m->synd)pr_cont ("SYND %llx " , m->synd); +if (err->vendor.amd.synd1) +pr_cont ("SYND1 %llx " , err->vendor.amd.synd1); +if (err->vendor.amd.synd2) +pr_cont ("SYND2 %llx " , err->vendor.amd.synd2);if (m->ipid)pr_cont ("IPID %llx " , m->ipid); }
@@ -678,8 +682,11 @@ static noinstr void mce_read_aux(struct mce_hw_err *err, int i)if (mce_flags.smca) { m->ipid =mce_rdmsrl (MSR_AMD64_SMCA_MCx_IPID (i)); -if (m->status &MCI_STATUS_SYNDV ) +if (m->status &MCI_STATUS_SYNDV ) { m->synd =mce_rdmsrl (MSR_AMD64_SMCA_MCx_SYND (i)); + err->vendor.amd.synd1 =mce_rdmsrl (MSR_AMD64_SMCA_MCx_SYND1 (i)); + err->vendor.amd.synd2 =mce_rdmsrl (MSR_AMD64_SMCA_MCx_SYND2 (i)); + } } }
drivers/edac/mce_amd.c +6 -2
@@ -793,6 +793,7 @@ static int amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data) { struct mce *m = (struct mce *)data; +struct mce_hw_err *err =to_mce_hw_err (m);unsigned int fam =x86_family (m->cpuid);int ecc;
@@ -850,8 +851,11 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)if (boot_cpu_has (X86_FEATURE_SMCA )) {pr_emerg (HW_ERR "IPID: 0x%016llx" , m->ipid); -if (m->status &MCI_STATUS_SYNDV ) -pr_cont (", Syndrome: 0x%016llx" , m->synd); +if (m->status &MCI_STATUS_SYNDV ) { +pr_cont (", Syndrome: 0x%016llx\n" , m->synd); +pr_emerg (HW_ERR "Syndrome1: 0x%016llx, Syndrome2: 0x%016llx" , + err->vendor.amd.synd1, err->vendor.amd.synd2); + }pr_cont ("\n" );
include/trace/events/mce.h +5 -2
@@ -43,6 +43,7 @@ TRACE_EVENT(mce_record, __field( u8, bank ) __field( u8, cpuvendor ) __field( u32, microcode ) +__dynamic_array (u8, v_data,sizeof (err->vendor)) ), TP_fast_assign(
@@ -65,9 +66,10 @@ TRACE_EVENT(mce_record, __entry->bank = err->m.bank; __entry->cpuvendor = err->m.cpuvendor; __entry->microcode = err->m.microcode; +memcpy (__get_dynamic_array (v_data), &err->vendor,sizeof (err->vendor)); ), - TP_printk("CPU: %d, MCGc/s: %llx/%llx, MC%d: %016Lx, IPID: %016Lx, ADDR: %016Lx, MISC: %016Lx, SYND: %016Lx, RIP: %02x:<%016Lx>, TSC: %llx, PPIN: %llx, vendor: %u, CPUID: %x, time: %llu, socket: %u, APIC: %x, microcode: %x", + TP_printk("CPU: %d, MCGc/s: %llx/%llx, MC%d: %016llx, IPID: %016llx, ADDR: %016llx, MISC: %016llx, SYND: %016llx, RIP: %02x:<%016llx>, TSC: %llx, PPIN: %llx, vendor: %u, CPUID: %x, time: %llu, socket: %u, APIC: %x, microcode: %x, vendor data: %s", __entry->cpu, __entry->mcgcap, __entry->mcgstatus, __entry->bank, __entry->status,
@@ -83,7 +85,8 @@ TRACE_EVENT(mce_record, __entry->walltime, __entry->socketid, __entry->apicid, - __entry->microcode) + __entry->microcode, + __print_dynamic_array(v_data, sizeof(u8))) );#endif /* _TRACE_MCE_H */
Signature · 1 line
2.43.0
RE: [PATCH v7 3/5] x86/mce, EDAC/mce_amd: Add support for new MCA_SYND{1,2} registers
Quoted 52 lines
From: Avadhut Naik <[email protected]>
[...]
Subject: [PATCH v7 3/5] x86/mce, EDAC/mce_amd: Add support for new MCA_SYND{1,2} registersStarting with Zen4, AMD's Scalable MCA systems incorporate two new
registers:MCA_SYND1andMCA_SYND2.These registers will include supplemental error information in addition to the existing
MCA_SYNDregister. The data within these registers is considered valid if MCA_STATUS[SyndV] is set.Userspace error decoding tools like the rasdaemon gather related hardware error information through the tracepoints. As such, these two registers should be exported through the
mce_recordtracepoint so that tools like rasdaemon can parse them and output the supplemental error information like FRU Text contained in them.[Yazen: Drop Yazen's Co-developed-by tag and moved SoB tag.]
Signed-off-by Avadhut Naik <[email protected]>Signed-off-by Yazen Ghannam <[email protected]>Signed-off-by Avadhut Naik <[email protected]>---
Changes in v2:
[1] https://lore.kernel.org/linux-edac/20240521125434.1555845-1-
[email protected]/
[2] https://lore.kernel.org/linux-edac/20240523155641.2805411-1-
[email protected]/1. Drop dependencies on sets [1] and [2] above and rebase on top of tip/master.
Changes in v3:
1. Move wrapper changes required inmce_read_aux()andmce_no_way_out()from this patch to the first patch.
2. Add comments to explain the new wrapper's purpose.
3. Modify commit message per feedback received.
4. Fix SoB chain to properly reflect the patch path.Changes in v4:
1. Rebase on top of tip/master to avoid merge conflicts.Changes in v5:
1. Remove "len" field since the length of a dynamic array can be fetched from its metadata.
2. Substitute__print_array()with__print_dynamic_array().Changes in v6:
1. Rebase on top of tip/master.
2. Use the newly introducedto_mce_hw_errmacro inamd_decode_mce().
Quoted 5 lines
Changes in v7:
1. Rebase on top of tip/master.
2. Change second parameter of__print_dynamic_arrayfrom 8 to sizeof(u8) to ensure that the dynamic array is parsed using a u8 pointer instead of u64 pointer.
As my comments resolved in v6 and v7,
- Qiuxu
[tip: ras/core] x86/MCE/AMD: Add support for new MCA_SYND{1,2} registers
In reply to Avadhut NaikThe following commit has been merged into the ras/core branch of tip:
The following commit has been merged into the ras/core branch of tip:
Commit-ID: d4fca1358ea9096f2f6ed942e2cb3a820073dfc1 Gitweb: https://git.kernel.org/tip/d4fca1358ea9096f2f6ed942e2cb3a820073dfc1 Author: Avadhut Naik <[email protected]> AuthorDate: Tue, 22 Oct 2024 19:36:29 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Thu, 31 Oct 2024 10:36:07 +01:00
x86/MCE/AMD: Add support for new MCA_SYND{1,2} registers
Starting with Zen4, AMD's Scalable MCA systems incorporate two new registers:MCA_SYND1 and MCA_SYND2.
These registers will include supplemental error information in addition to the existing MCA_SYND register. The data within these registers is considered valid if MCA_STATUS[SyndV] is set.
Userspace error decoding tools like rasdaemon gather related hardware error information through the tracepoints.
Therefore, export these two registers through the mce_record tracepoint so that tools like rasdaemon can parse them and output the supplemental error information like FRU text contained in them.
[ bp: Massage. ]
--- arch/x86/include/asm/mce.h | 21 +++++++++++++++++++++ arch/x86/include/uapi/asm/mce.h | 3 ++- arch/x86/kernel/cpu/mce/amd.c | 5 ++++- arch/x86/kernel/cpu/mce/core.c | 9 ++++++++- drivers/edac/mce_amd.c | 8 ++++++-- include/trace/events/mce.h | 7 +++++-- 6 files changed, 46 insertions(+), 7 deletions(-)
arch/x86/include/asm/mce.h +21 -0
@@ -122,6 +122,9 @@#define MSR_AMD64_SMCA_MC0_DESTAT 0xc0002008#define MSR_AMD64_SMCA_MC0_DEADDR 0xc0002009#define MSR_AMD64_SMCA_MC0_MISC1 0xc000200a +/* Registers MISC2 to MISC4 are at offsets B to D. */ +#define MSR_AMD64_SMCA_MC0_SYND1 0xc000200e +#define MSR_AMD64_SMCA_MC0_SYND2 0xc000200f#define MSR_AMD64_SMCA_MCx_CTL (x) (MSR_AMD64_SMCA_MC0_CTL + 0x10*(x))#define MSR_AMD64_SMCA_MCx_STATUS (x) (MSR_AMD64_SMCA_MC0_STATUS + 0x10*(x))#define MSR_AMD64_SMCA_MCx_ADDR (x) (MSR_AMD64_SMCA_MC0_ADDR + 0x10*(x))
@@ -132,6 +135,8 @@#define MSR_AMD64_SMCA_MCx_DESTAT (x) (MSR_AMD64_SMCA_MC0_DESTAT + 0x10*(x))#define MSR_AMD64_SMCA_MCx_DEADDR (x) (MSR_AMD64_SMCA_MC0_DEADDR + 0x10*(x))#define MSR_AMD64_SMCA_MCx_MISCy (x, y) ((MSR_AMD64_SMCA_MC0_MISC1 + y) + (0x10*(x))) +#define MSR_AMD64_SMCA_MCx_SYND1 (x) (MSR_AMD64_SMCA_MC0_SYND1 + 0x10*(x)) +#define MSR_AMD64_SMCA_MCx_SYND2 (x) (MSR_AMD64_SMCA_MC0_SYND2 + 0x10*(x))#define XEC (x, mask) (((x) >> 16) & mask)
@@ -190,9 +195,25 @@ enum mce_notifier_prios {/** * struct mce_hw_err - Hardware Error Record. * @m: Machine Check record. +* @vendor: Vendor-specific error information. +* +* Vendor-specific fields should not be added to struct mce. Instead, vendors +* should export their vendor-specific data through their structure in the +* vendor union below. +* +* AMD's vendor data is parsed by error decoding tools for supplemental error +* information. Thus, current offsets of existing fields must be maintained. +* Only add new fields at the end of AMD's vendor structure. */ struct mce_hw_err {struct mce m; + +union vendor_info { +struct { +u64 synd1;/* MCA_SYND1 MSR */ +u64 synd2;/* MCA_SYND2 MSR */ + } amd; + } vendor; };#define to_mce_hw_err (mce) container_of(mce, struct mce_hw_err, m)
arch/x86/include/uapi/asm/mce.h +2 -1
@@ -8,7 +8,8 @@/* * Fields are zero when not available. Also, this struct is shared with * userspace mcelog and thus must keep existing fields at current offsets. -* Only add new fields to the end of the structure +* Only add new, shared fields to the end of the structure. +* Do not add vendor-specific fields. */ struct mce {__u64 status;/* Bank's MCi_STATUS MSR */
arch/x86/kernel/cpu/mce/amd.c +4 -1
@@ -797,8 +797,11 @@ static void __log_error(unsigned int bank, u64 status, u64 addr, u64 misc)if (mce_flags.smca) {rdmsrl (MSR_AMD64_SMCA_MCx_IPID (bank), m->ipid); -if (m->status &MCI_STATUS_SYNDV ) +if (m->status &MCI_STATUS_SYNDV ) {rdmsrl (MSR_AMD64_SMCA_MCx_SYND (bank), m->synd); +rdmsrl (MSR_AMD64_SMCA_MCx_SYND1 (bank), err.vendor.amd.synd1); +rdmsrl (MSR_AMD64_SMCA_MCx_SYND2 (bank), err.vendor.amd.synd2); + } }mce_log (&err);
arch/x86/kernel/cpu/mce/core.c +8 -1
@@ -202,6 +202,10 @@ static void __print_mce(struct mce_hw_err *err)if (mce_flags.smca) {if (m->synd)pr_cont ("SYND %llx " , m->synd); +if (err->vendor.amd.synd1) +pr_cont ("SYND1 %llx " , err->vendor.amd.synd1); +if (err->vendor.amd.synd2) +pr_cont ("SYND2 %llx " , err->vendor.amd.synd2);if (m->ipid)pr_cont ("IPID %llx " , m->ipid); }
@@ -678,8 +682,11 @@ static noinstr void mce_read_aux(struct mce_hw_err *err, int i)if (mce_flags.smca) { m->ipid =mce_rdmsrl (MSR_AMD64_SMCA_MCx_IPID (i)); -if (m->status &MCI_STATUS_SYNDV ) +if (m->status &MCI_STATUS_SYNDV ) { m->synd =mce_rdmsrl (MSR_AMD64_SMCA_MCx_SYND (i)); + err->vendor.amd.synd1 =mce_rdmsrl (MSR_AMD64_SMCA_MCx_SYND1 (i)); + err->vendor.amd.synd2 =mce_rdmsrl (MSR_AMD64_SMCA_MCx_SYND2 (i)); + } } }
drivers/edac/mce_amd.c +6 -2
@@ -793,6 +793,7 @@ static int amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data) { struct mce *m = (struct mce *)data; +struct mce_hw_err *err =to_mce_hw_err (m);unsigned int fam =x86_family (m->cpuid);int ecc;
@@ -850,8 +851,11 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)if (boot_cpu_has (X86_FEATURE_SMCA )) {pr_emerg (HW_ERR "IPID: 0x%016llx" , m->ipid); -if (m->status &MCI_STATUS_SYNDV ) -pr_cont (", Syndrome: 0x%016llx" , m->synd); +if (m->status &MCI_STATUS_SYNDV ) { +pr_cont (", Syndrome: 0x%016llx\n" , m->synd); +pr_emerg (HW_ERR "Syndrome1: 0x%016llx, Syndrome2: 0x%016llx" , + err->vendor.amd.synd1, err->vendor.amd.synd2); + }pr_cont ("\n" );
include/trace/events/mce.h +5 -2
@@ -43,6 +43,7 @@ TRACE_EVENT(mce_record, __field( u8, bank ) __field( u8, cpuvendor ) __field( u32, microcode ) +__dynamic_array (u8, v_data,sizeof (err->vendor)) ), TP_fast_assign(
@@ -65,9 +66,10 @@ TRACE_EVENT(mce_record, __entry->bank = err->m.bank; __entry->cpuvendor = err->m.cpuvendor; __entry->microcode = err->m.microcode; +memcpy (__get_dynamic_array (v_data), &err->vendor,sizeof (err->vendor)); ), - TP_printk("CPU: %d, MCGc/s: %llx/%llx, MC%d: %016Lx, IPID: %016Lx, ADDR: %016Lx, MISC: %016Lx, SYND: %016Lx, RIP: %02x:<%016Lx>, TSC: %llx, PPIN: %llx, vendor: %u, CPUID: %x, time: %llu, socket: %u, APIC: %x, microcode: %x", + TP_printk("CPU: %d, MCGc/s: %llx/%llx, MC%d: %016llx, IPID: %016llx, ADDR: %016llx, MISC: %016llx, SYND: %016llx, RIP: %02x:<%016llx>, TSC: %llx, PPIN: %llx, vendor: %u, CPUID: %x, time: %llu, socket: %u, APIC: %x, microcode: %x, vendor data: %s", __entry->cpu, __entry->mcgcap, __entry->mcgstatus, __entry->bank, __entry->status,
@@ -83,7 +85,8 @@ TRACE_EVENT(mce_record, __entry->walltime, __entry->socketid, __entry->apicid, - __entry->microcode) + __entry->microcode, + __print_dynamic_array(v_data, sizeof(u8))) );#endif /* _TRACE_MCE_H */
PATCH v7 4/5 x86/mce/apei: Handle variable register array size
In reply to Avadhut NaikFrom: Yazen Ghannam <[email protected]>
ACPI Boot Error Record Table (BERT) is being used by the kernel to report errors that occurred in a previous boot. On some modern AMD systems, these very errors within the BERT are reported through the x86 Common Platform Error Record (CPER) format which consists of one or more Processor Context Information Structures. These context structures provide a starting address and represent an x86 MSR range in which the data constitutes a contiguous set of MSRs starting from, and including the starting address.
It's common, for AMD systems that implement this behavior, that the MSR range represents the MCAX register space used for the Scalable MCA feature. The apei_smca_report_x86_error() function decodes and passes this information through the MCE notifier chain. However, this function assumes a fixed register size based on the original HW/FW implementation.
This assumption breaks with the addition of two new MCAX registers viz. MCA_SYND1 and MCA_SYND2. These registers are added at the end of the MCAX register space, so they won't be included when decoding the CPER data.
Rework apei_smca_report_x86_error() to support a variable register array size. This covers any case where the MSR context information starts at the MCAX address for MCA_STATUS and ends at any other register within the MCAX register space.
Add code comments indicating the MCAX register at each offset.
[Yazen: Add Avadhut as co-developer for wrapper changes.]
---
Changes in v2:
[1] https://lore.kernel.org/linux-edac/[email protected]/
[2] https://lore.kernel.org/linux-edac/[email protected]/
1. Drop dependencies on sets [1] and [2] above and rebase on top of tip/master.
Changes in v3:
1. Incorporate suggested touchup.
2. Fix SoB chain to properly reflect the patch path.
Changes in v4:
1. Rebase on top of tip/master to avoid merge conflicts.
Changes in v5:
1. No changes except rebasing on top of tip/master.
Changes in v6:
1. No changes except rebasing on top of tip/master.
Changes in v7:
1. No changes except rebasing on top of tip/master.
--- arch/x86/kernel/cpu/mce/apei.c | 72 +++++++++++++++++++++++++++------- 1 file changed, 58 insertions(+), 14 deletions(-)
arch/x86/kernel/cpu/mce/apei.c +58 -14
@@ -68,9 +68,9 @@ EXPORT_SYMBOL_GPL(apei_mce_report_mem_error);int apei_smca_report_x86_error (struct cper_ia_proc_ctx *ctx_info,u64 lapic_id) {const u64 *i_mce = ((const u64 *) (ctx_info +1 )); +unsigned int cpu, num_regs;bool apicid_found = false;struct mce_hw_err err; -unsigned int cpu;struct mce *m;if (!boot_cpu_has (X86_FEATURE_SMCA ))
@@ -89,16 +89,12 @@ int apei_smca_report_x86_error(struct cper_ia_proc_ctx *ctx_info, u64 lapic_id)return -EINVAL ;/* -* The register array size must be large enough to include all the -* SMCA registers which need to be extracted. -* * The number of registers in the register array is determined by * Register Array Size/8 as defined in UEFI spec v2.8, sec N.2.4.2.2. -* The register layout is fixed and currently the raw data in the -* register array includes 6 SMCA registers which the kernel can -* extract. +* Sanity-check registers array size. */ -if (ctx_info->reg_arr_size <48 ) + num_regs = ctx_info->reg_arr_size >>3 ; +if (!num_regs)return -EINVAL ;for_each_possible_cpu (cpu) {
@@ -117,12 +113,60 @@ int apei_smca_report_x86_error(struct cper_ia_proc_ctx *ctx_info, u64 lapic_id)mce_prep_record_per_cpu (cpu, m); m->bank = (ctx_info->msr_addr >>4 ) &0xFF ; - m->status = *i_mce; - m->addr = *(i_mce +1 ); - m->misc = *(i_mce +2 ); -/* Skipping MCA_CONFIG */ - m->ipid = *(i_mce +4 ); - m->synd = *(i_mce +5 ); + +/* +* The SMCA register layout is fixed and includes 16 registers. +* The end of the array may be variable, but the beginning is known. +* Cap the number of registers to expected max (15). +*/ +if (num_regs >15 ) + num_regs =15 ; + +switch (num_regs) { +/* MCA_SYND2 */ +case 15 : + err.vendor.amd.synd2 = *(i_mce +14 ); + fallthrough; +/* MCA_SYND1 */ +case 14 : + err.vendor.amd.synd1 = *(i_mce +13 ); + fallthrough; +/* MCA_MISC4 */ +case 13 : +/* MCA_MISC3 */ +case 12 : +/* MCA_MISC2 */ +case 11 : +/* MCA_MISC1 */ +case 10 : +/* MCA_DEADDR */ +case 9 : +/* MCA_DESTAT */ +case 8 : +/* reserved */ +case 7 : +/* MCA_SYND */ +case 6 : + m->synd = *(i_mce +5 ); + fallthrough; +/* MCA_IPID */ +case 5 : + m->ipid = *(i_mce +4 ); + fallthrough; +/* MCA_CONFIG */ +case 4 : +/* MCA_MISC0 */ +case 3 : + m->misc = *(i_mce +2 ); + fallthrough; +/* MCA_ADDR */ +case 2 : + m->addr = *(i_mce +1 ); + fallthrough; +/* MCA_STATUS */ +case 1 : + m->status = *i_mce; + }mce_log (&err);
Signature · 1 line
2.43.0
RE: [PATCH v7 4/5] x86/mce/apei: Handle variable register array size
Quoted 38 lines
From: Avadhut Naik <[email protected]>
Sent: Wednesday, October 23, 2024 3:37 AM
To: [email protected]; [email protected]; linux-trace- [email protected]
Cc: [email protected]; [email protected]; Luck, Tony <[email protected]>; Zhuo, Qiuxu <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: [PATCH v7 4/5] x86/mce/apei: Handle variable register array sizeFrom: Yazen Ghannam <[email protected]>
ACPI Boot Error Record Table (BERT) is being used by the kernel to report errors that occurred in a previous boot. On some modern AMD systems, these very errors within the BERT are reported through the
x86 Common Platform Error Record (CPER) format which consists of one or more Processor Context Information Structures. These context structures provide a starting address and represent an x86 MSR range in which the data constitutes a contiguous set of MSRs starting from, and including the starting address.It's common, for AMD systems that implement this behavior, that the MSR range represents the MCAX register space used for the Scalable MCA feature. The
apei_smca_report_x86_error()function decodes and passes this information through the MCE notifier chain. However, this function assumes a fixed register size based on the original HW/FW implementation.This assumption breaks with the addition of two new MCAX registers viz.
MCA_SYND1andMCA_SYND2. These registers are added at the end of the MCAX register space, so they won't be included when decoding the CPER data.Rework
apei_smca_report_x86_error()to support a variable register array size. This covers any case where the MSR context information starts at the MCAX address forMCA_STATUSand ends at any other register within the MCAX register space.
Quoted 8 lines
Add code comments indicating the MCAX register at each offset.
[Yazen: Add Avadhut as co-developer for wrapper changes.]
Co-developed-by Avadhut Naik <[email protected]>Signed-off-by Avadhut Naik <[email protected]>Signed-off-by Yazen Ghannam <[email protected]>Signed-off-by Avadhut Naik <[email protected]>
LGTM.
[tip: ras/core] x86/mce/apei: Handle variable SMCA BERT record size
In reply to Avadhut NaikThe following commit has been merged into the ras/core branch of tip:
The following commit has been merged into the ras/core branch of tip:
Commit-ID: e9876dafa28ebbeead11b6376b1402832d895c85 Gitweb: https://git.kernel.org/tip/e9876dafa28ebbeead11b6376b1402832d895c85 Author: Yazen Ghannam <[email protected]> AuthorDate: Tue, 22 Oct 2024 19:36:30 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Thu, 31 Oct 2024 10:45:59 +01:00
x86/mce/apei: Handle variable SMCA BERT record size
The ACPI Boot Error Record Table (BERT) is being used by the kernel to report errors that occurred in a previous boot. On some modern AMD systems, these very errors within the BERT are reported through the x86 Common Platform Error Record (CPER) format which consists of one or more Processor Context Information Structures.
These context structures provide a starting address and represent an x86 MSR range in which the data constitutes a contiguous set of MSRs starting from, and including the starting address.
It's common, for AMD systems that implement this behavior, that the MSR range represents the MCAX register space used for the Scalable MCA feature. The apei_smca_report_x86_error() function decodes and passes this information through the MCE notifier chain. However, this function assumes a fixed register size based on the original HW/FW implementation.
This assumption breaks with the addition of two new MCAX registers viz. MCA_SYND1 and MCA_SYND2. These registers are added at the end of the MCAX register space, so they won't be included when decoding the CPER data.
Rework apei_smca_report_x86_error() to support a variable register array size. This covers any case where the MSR context information starts at the MCAX address for MCA_STATUS and ends at any other register within the MCAX register space.
[ Yazen: Add Avadhut as co-developer for wrapper changes.] [ bp: Massage. ]
--- arch/x86/kernel/cpu/mce/apei.c | 72 ++++++++++++++++++++++++++------- 1 file changed, 58 insertions(+), 14 deletions(-)
arch/x86/kernel/cpu/mce/apei.c +58 -14
@@ -68,9 +68,9 @@ EXPORT_SYMBOL_GPL(apei_mce_report_mem_error);int apei_smca_report_x86_error (struct cper_ia_proc_ctx *ctx_info,u64 lapic_id) {const u64 *i_mce = ((const u64 *) (ctx_info +1 )); +unsigned int cpu, num_regs;bool apicid_found = false;struct mce_hw_err err; -unsigned int cpu;struct mce *m;if (!boot_cpu_has (X86_FEATURE_SMCA ))
@@ -89,16 +89,12 @@ int apei_smca_report_x86_error(struct cper_ia_proc_ctx *ctx_info, u64 lapic_id)return -EINVAL ;/* -* The register array size must be large enough to include all the -* SMCA registers which need to be extracted. -* * The number of registers in the register array is determined by * Register Array Size/8 as defined in UEFI spec v2.8, sec N.2.4.2.2. -* The register layout is fixed and currently the raw data in the -* register array includes 6 SMCA registers which the kernel can -* extract. +* Sanity-check registers array size. */ -if (ctx_info->reg_arr_size <48 ) + num_regs = ctx_info->reg_arr_size >>3 ; +if (!num_regs)return -EINVAL ;for_each_possible_cpu (cpu) {
@@ -117,12 +113,60 @@ int apei_smca_report_x86_error(struct cper_ia_proc_ctx *ctx_info, u64 lapic_id)mce_prep_record_per_cpu (cpu, m); m->bank = (ctx_info->msr_addr >>4 ) &0xFF ; - m->status = *i_mce; - m->addr = *(i_mce +1 ); - m->misc = *(i_mce +2 ); -/* Skipping MCA_CONFIG */ - m->ipid = *(i_mce +4 ); - m->synd = *(i_mce +5 ); + +/* +* The SMCA register layout is fixed and includes 16 registers. +* The end of the array may be variable, but the beginning is known. +* Cap the number of registers to expected max (15). +*/ +if (num_regs >15 ) + num_regs =15 ; + +switch (num_regs) { +/* MCA_SYND2 */ +case 15 : + err.vendor.amd.synd2 = *(i_mce +14 ); + fallthrough; +/* MCA_SYND1 */ +case 14 : + err.vendor.amd.synd1 = *(i_mce +13 ); + fallthrough; +/* MCA_MISC4 */ +case 13 : +/* MCA_MISC3 */ +case 12 : +/* MCA_MISC2 */ +case 11 : +/* MCA_MISC1 */ +case 10 : +/* MCA_DEADDR */ +case 9 : +/* MCA_DESTAT */ +case 8 : +/* reserved */ +case 7 : +/* MCA_SYND */ +case 6 : + m->synd = *(i_mce +5 ); + fallthrough; +/* MCA_IPID */ +case 5 : + m->ipid = *(i_mce +4 ); + fallthrough; +/* MCA_CONFIG */ +case 4 : +/* MCA_MISC0 */ +case 3 : + m->misc = *(i_mce +2 ); + fallthrough; +/* MCA_ADDR */ +case 2 : + m->addr = *(i_mce +1 ); + fallthrough; +/* MCA_STATUS */ +case 1 : + m->status = *i_mce; + }mce_log (&err);
PATCH v7 5/5 EDAC/mce_amd: Add support for FRU Text in MCA
In reply to Avadhut NaikFrom: Yazen Ghannam <[email protected]>
A new "FRU Text in MCA" feature is defined where the Field Replaceable Unit (FRU) Text for a device is represented by a string in the new MCA_SYND1 and MCA_SYND2 registers. This feature is supported per MCA bank, and it is advertised by the McaFruTextInMca bit (MCA_CONFIG[9]).
The FRU Text is populated dynamically for each individual error state (MCA_STATUS, MCA_ADDR, et al.). This handles the case where an MCA bank covers multiple devices, for example, a Unified Memory Controller (UMC) bank that manages two DIMMs.
Since MCA_CONFIG[9] is instrumental in decoding FRU Text, it has to be exported through the mce_record tracepoint so that userspace tools like the rasdaemon can determine if FRU Text has been reported through the MCA_SYND1 and MCA_SYND2 registers and output it.
[Yazen: Add Avadhut as co-developer for wrapper changes.]
---
Changes in v2:
[1] https://lore.kernel.org/linux-edac/[email protected]/
[2] https://lore.kernel.org/linux-edac/[email protected]/
1. Drop dependencies on sets [1] and [2] above and rebase on top of tip/master.
Changes in v3:
1. Modify commit message per feedback provided.
2. Remove call to memset() for the string frutext. Instead, just ensure that it is NULL terminated.
2. Fix SoB chain to properly reflect the patch path.
Changes in v4:
1. Rebase on top of tip/master to avoid merge conflicts.
Changes in v5:
1. No changes except rebasing on top of tip/master.
Changes in v6:
1. No changes except rebasing on top of tip/master.
Changes in v7:
1. No changes except rebasing on top of tip/master.
--- arch/x86/include/asm/mce.h | 2 ++ arch/x86/kernel/cpu/mce/amd.c | 1 + arch/x86/kernel/cpu/mce/apei.c | 2 ++ arch/x86/kernel/cpu/mce/core.c | 3 +++ drivers/edac/mce_amd.c | 21 ++++++++++++++------- 5 files changed, 22 insertions(+), 7 deletions(-)
arch/x86/include/asm/mce.h +2 -0
@@ -61,6 +61,7 @@* - TCC bit is present in MCx_STATUS. */ #define MCI_CONFIG_MCAX 0x1 +#define MCI_CONFIG_FRUTEXT BIT_ULL(9)#define MCI_IPID_MCATYPE 0xFFFF0000#define MCI_IPID_HWID 0xFFF
@@ -213,6 +214,7 @@ struct mce_hw_err {struct {u64 synd1;/* MCA_SYND1 MSR */ u64 synd2;/* MCA_SYND2 MSR */ +u64 config;/* MCA_CONFIG MSR */ } amd; } vendor; };
arch/x86/kernel/cpu/mce/amd.c +1 -0
@@ -796,6 +796,7 @@ static void __log_error(unsigned int bank, u64 status, u64 addr, u64 misc)if (mce_flags.smca) {rdmsrl (MSR_AMD64_SMCA_MCx_IPID (bank), m->ipid); +rdmsrl (MSR_AMD64_SMCA_MCx_CONFIG (bank), err.vendor.amd.config);if (m->status &MCI_STATUS_SYNDV ) {rdmsrl (MSR_AMD64_SMCA_MCx_SYND (bank), m->synd);
arch/x86/kernel/cpu/mce/apei.c +2 -0
@@ -155,6 +155,8 @@ int apei_smca_report_x86_error(struct cper_ia_proc_ctx *ctx_info, u64 lapic_id) fallthrough;/* MCA_CONFIG */ case 4 : + err.vendor.amd.config = *(i_mce +3 ); + fallthrough;/* MCA_MISC0 */ case 3 : m->misc = *(i_mce +2 );
arch/x86/kernel/cpu/mce/core.c +3 -0
@@ -208,6 +208,8 @@ static void __print_mce(struct mce_hw_err *err)pr_cont ("SYND2 %llx " , err->vendor.amd.synd2);if (m->ipid)pr_cont ("IPID %llx " , m->ipid); +if (err->vendor.amd.config) +pr_cont ("CONFIG %llx " , err->vendor.amd.config); }pr_cont ("\n" );
@@ -681,6 +683,7 @@ static noinstr void mce_read_aux(struct mce_hw_err *err, int i)if (mce_flags.smca) { m->ipid =mce_rdmsrl (MSR_AMD64_SMCA_MCx_IPID (i)); + err->vendor.amd.config =mce_rdmsrl (MSR_AMD64_SMCA_MCx_CONFIG (i));if (m->status &MCI_STATUS_SYNDV ) { m->synd =mce_rdmsrl (MSR_AMD64_SMCA_MCx_SYND (i));
drivers/edac/mce_amd.c +14 -7
@@ -795,6 +795,7 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)struct mce *m = (struct mce *)data;struct mce_hw_err *err =to_mce_hw_err (m);unsigned int fam =x86_family (m->cpuid); +u64 mca_config = err->vendor.amd.config;int ecc;if (m->kflags &MCE_HANDLED_CEC )
@@ -814,11 +815,7 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data) ((m->status & MCI_STATUS_PCC) ? "PCC" : "-"));if (boot_cpu_has (X86_FEATURE_SMCA )) { -u32 low, high; -u32 addr =MSR_AMD64_SMCA_MCx_CONFIG (m->bank); - -if (!rdmsr_safe (addr, &low, &high) && - (low &MCI_CONFIG_MCAX )) +if (mca_config &MCI_CONFIG_MCAX )pr_cont ("|%s" , ((m->status &MCI_STATUS_TCC ) ?"TCC" :"-" ));pr_cont ("|%s" , ((m->status &MCI_STATUS_SYNDV ) ?"SyndV" :"-" ));
@@ -853,8 +850,18 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)if (m->status &MCI_STATUS_SYNDV ) {pr_cont (", Syndrome: 0x%016llx\n" , m->synd); -pr_emerg (HW_ERR "Syndrome1: 0x%016llx, Syndrome2: 0x%016llx" , - err->vendor.amd.synd1, err->vendor.amd.synd2); +if (mca_config &MCI_CONFIG_FRUTEXT ) { +char frutext[17 ]; + + frutext[16 ] ='\0' ; +memcpy (&frutext[0 ], &err->vendor.amd.synd1,8 ); +memcpy (&frutext[8 ], &err->vendor.amd.synd2,8 ); + +pr_emerg (HW_ERR "FRU Text: %s" , frutext); + }else { +pr_emerg (HW_ERR "Syndrome1: 0x%016llx, Syndrome2: 0x%016llx" , + err->vendor.amd.synd1, err->vendor.amd.synd2); + } }pr_cont ("\n" );
Signature · 1 line
2.43.0
RE: [PATCH v7 5/5] EDAC/mce_amd: Add support for FRU Text in MCA
Quoted 21 lines
From: Avadhut Naik <[email protected]>
[...]
Subject: [PATCH v7 5/5] EDAC/mce_amd: Add support for FRU Text in MCAFrom: Yazen Ghannam <[email protected]>
A new "FRU Text in MCA" feature is defined where the Field Replaceable Unit (FRU) Text for a device is represented by a string in the new
MCA_SYND1andMCA_SYND2registers. This feature is supported per MCA bank, and it is advertised by the McaFruTextInMca bit (MCA_CONFIG[9]).The FRU Text is populated dynamically for each individual error state (
MCA_STATUS,MCA_ADDR, et al.). This handles the case where an MCA bank covers multiple devices, for example, a Unified Memory Controller (UMC) bank that manages two DIMMs.Since MCA_CONFIG[9] is instrumental in decoding FRU Text, it has to be exported through the
mce_recordtracepoint so that userspace tools like the rasdaemon can determine if FRU Text has been reported through theMCA_SYND1andMCA_SYND2registers and output it.
Quoted 6 lines
[Yazen: Add Avadhut as co-developer for wrapper changes.]
Co-developed-by Avadhut Naik <[email protected]>Signed-off-by Avadhut Naik <[email protected]>Signed-off-by Yazen Ghannam <[email protected]>Signed-off-by Avadhut Naik <[email protected]>
LGTM.
Borislav Petkov
maintainerRe: [PATCH v7 5/5] EDAC/mce_amd: Add support for FRU Text in MCA
In reply to Avadhut NaikQuoted 9 lines · Avadhut Naik
(quoted diff) +3
-2@@ -853,8 +850,18 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data) if (m->status & MCI_STATUS_SYNDV) { pr_cont(", Syndrome: 0x%016llx\n", m->synd); - pr_emerg(HW_ERR "Syndrome1: 0x%016llx, Syndrome2: 0x%016llx", - err->vendor.amd.synd1, err->vendor.amd.synd2); + if (mca_config & MCI_CONFIG_FRUTEXT) { + char frutext[17]; +
Review amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data) · line 865
Quoted 10 lines
(quoted diff) +9
-0+ frutext[16] = '\0'; + memcpy(&frutext[0], &err->vendor.amd.synd1, 8); + memcpy(&frutext[8], &err->vendor.amd.synd2, 8); + + pr_emerg(HW_ERR "FRU Text: %s", frutext); + } else { + pr_emerg(HW_ERR "Syndrome1: 0x%016llx, Syndrome2: 0x%016llx", + err->vendor.amd.synd1, err->vendor.amd.synd2); + } }
Right, so let's turn this into:
arch/x86/kernel/cpu/mce/core.c +0 -2
@@ -208,8 +208,6 @@ static void __print_mce(struct mce_hw_err *err)pr_cont ("SYND2 %llx " , err->vendor.amd.synd2);if (m->ipid)pr_cont ("IPID %llx " , m->ipid); -if (err->vendor.amd.config) -pr_cont ("CONFIG %llx " , err->vendor.amd.config); }pr_cont ("\n" );
drivers/edac/mce_amd.c +0 -3
@@ -858,9 +858,6 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)memcpy (&frutext[8 ], &err->vendor.amd.synd2,8 );pr_emerg (HW_ERR "FRU Text: %s" , frutext); - }else { -pr_emerg (HW_ERR "Syndrome1: 0x%016llx, Syndrome2: 0x%016llx" , - err->vendor.amd.synd1, err->vendor.amd.synd2); } }
and simply treat synd1 and synd2 as FRU text. I don't want to expose mca_config to userspace yet but use it in the RAS code only. If a case appears that we want to really expose it to userspace, we can talk about a proper design then.
This patch doesn't make it part of the tracepoint either so...
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteBorislav Petkov
maintainerRe: [PATCH v7 5/5] EDAC/mce_amd: Add support for FRU Text in MCA
In reply to Avadhut NaikQuoted 12 lines · Avadhut Naik
From: Yazen Ghannam <[email protected]>
A new "FRU Text in MCA" feature is defined where the Field Replaceable Unit (FRU) Text for a device is represented by a string in the new
MCA_SYND1andMCA_SYND2registers. This feature is supported per MCA bank, and it is advertised by the McaFruTextInMca bit (MCA_CONFIG[9]).The FRU Text is populated dynamically for each individual error state (
MCA_STATUS,MCA_ADDR, et al.). This handles the case where an MCA bank covers multiple devices, for example, a Unified Memory Controller (UMC) bank that manages two DIMMs.
Quoted 4 lines
Since MCA_CONFIG[9] is instrumental in decoding FRU Text, it has to be exported through the
mce_recordtracepoint so that userspace tools like the rasdaemon can determine if FRU Text has been reported through theMCA_SYND1andMCA_SYND2registers and output it.
IOW:
Author: Yazen Ghannam <[email protected]> Date: Tue Oct 22 19:36:31 2024 +0000
EDAC/mce_amd: Add support for FRU text in MCA
A new "FRU Text in MCA" feature is defined where the Field Replaceable Unit (FRU) Text for a device is represented by a string in the new MCA_SYND1 and MCA_SYND2 registers. This feature is supported per MCA bank, and it is advertised by the McaFruTextInMca bit (MCA_CONFIG[9]).
The FRU Text is populated dynamically for each individual error state (MCA_STATUS, MCA_ADDR, et al.). This handles the case where an MCA bank covers multiple devices, for example, a Unified Memory Controller (UMC) bank that manages two DIMMs.
If SYND1 and SYND2 are !NULL, then userspace can assume that they contain FRU text information. If they will report other information in the future, then a way of communicating the info type contained must be devised.
[ Yazen: Add Avadhut as co-developer for wrapper changes. ] [ bp: Do not expose MCA_CONFIG to userspace yet. ]
arch/x86/include/asm/mce.h +2 -0
@@ -61,6 +61,7 @@* - TCC bit is present in MCx_STATUS. */ #define MCI_CONFIG_MCAX 0x1 +#define MCI_CONFIG_FRUTEXT BIT_ULL(9)#define MCI_IPID_MCATYPE 0xFFFF0000#define MCI_IPID_HWID 0xFFF
@@ -212,6 +213,7 @@ struct mce_hw_err {struct {u64 synd1;/* MCA_SYND1 MSR */ u64 synd2;/* MCA_SYND2 MSR */ +u64 config;/* MCA_CONFIG MSR */ } amd; } vendor; };
arch/x86/kernel/cpu/mce/amd.c +1 -0
@@ -796,6 +796,7 @@ static void __log_error(unsigned int bank, u64 status, u64 addr, u64 misc)if (mce_flags.smca) {rdmsrl (MSR_AMD64_SMCA_MCx_IPID (bank), m->ipid); +rdmsrl (MSR_AMD64_SMCA_MCx_CONFIG (bank), err.vendor.amd.config);if (m->status &MCI_STATUS_SYNDV ) {rdmsrl (MSR_AMD64_SMCA_MCx_SYND (bank), m->synd);
arch/x86/kernel/cpu/mce/apei.c +2 -0
@@ -155,6 +155,8 @@ int apei_smca_report_x86_error(struct cper_ia_proc_ctx *ctx_info, u64 lapic_id) fallthrough;/* MCA_CONFIG */ case 4 : + err.vendor.amd.config = *(i_mce +3 ); + fallthrough;/* MCA_MISC0 */ case 3 : m->misc = *(i_mce +2 );
arch/x86/kernel/cpu/mce/core.c +1 -0
@@ -681,6 +681,7 @@ static noinstr void mce_read_aux(struct mce_hw_err *err, int i)if (mce_flags.smca) { m->ipid =mce_rdmsrl (MSR_AMD64_SMCA_MCx_IPID (i)); + err->vendor.amd.config =mce_rdmsrl (MSR_AMD64_SMCA_MCx_CONFIG (i));if (m->status &MCI_STATUS_SYNDV ) { m->synd =mce_rdmsrl (MSR_AMD64_SMCA_MCx_SYND (i));
drivers/edac/mce_amd.c +11 -7
@@ -795,6 +795,7 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)struct mce *m = (struct mce *)data;struct mce_hw_err *err =to_mce_hw_err (m);unsigned int fam =x86_family (m->cpuid); +u64 mca_config = err->vendor.amd.config;int ecc;if (m->kflags &MCE_HANDLED_CEC )
@@ -814,11 +815,7 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data) ((m->status & MCI_STATUS_PCC) ? "PCC" : "-"));if (boot_cpu_has (X86_FEATURE_SMCA )) { -u32 low, high; -u32 addr =MSR_AMD64_SMCA_MCx_CONFIG (m->bank); - -if (!rdmsr_safe (addr, &low, &high) && - (low &MCI_CONFIG_MCAX )) +if (mca_config &MCI_CONFIG_MCAX )pr_cont ("|%s" , ((m->status &MCI_STATUS_TCC ) ?"TCC" :"-" ));pr_cont ("|%s" , ((m->status &MCI_STATUS_SYNDV ) ?"SyndV" :"-" ));
@@ -853,8 +850,15 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)if (m->status &MCI_STATUS_SYNDV ) {pr_cont (", Syndrome: 0x%016llx\n" , m->synd); -pr_emerg (HW_ERR "Syndrome1: 0x%016llx, Syndrome2: 0x%016llx" , - err->vendor.amd.synd1, err->vendor.amd.synd2); +if (mca_config &MCI_CONFIG_FRUTEXT ) { +char frutext[17 ]; + + frutext[16 ] ='\0' ; +memcpy (&frutext[0 ], &err->vendor.amd.synd1,8 ); +memcpy (&frutext[8 ], &err->vendor.amd.synd2,8 ); + +pr_emerg (HW_ERR "FRU Text: %s" , frutext); + } }pr_cont ("\n" );
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteYazen Ghannam
maintainerRe: [PATCH v7 5/5] EDAC/mce_amd: Add support for FRU Text in MCA
Quoted 35 lines · Borislav Petkov
Quoted 12 lines · Avadhut Naik
From: Yazen Ghannam <[email protected]>
A new "FRU Text in MCA" feature is defined where the Field Replaceable Unit (FRU) Text for a device is represented by a string in the new
MCA_SYND1andMCA_SYND2registers. This feature is supported per MCA bank, and it is advertised by the McaFruTextInMca bit (MCA_CONFIG[9]).The FRU Text is populated dynamically for each individual error state (
MCA_STATUS,MCA_ADDR, et al.). This handles the case where an MCA bank covers multiple devices, for example, a Unified Memory Controller (UMC) bank that manages two DIMMs.Quoted 4 lines
Since MCA_CONFIG[9] is instrumental in decoding FRU Text, it has to be exported through the
mce_recordtracepoint so that userspace tools like the rasdaemon can determine if FRU Text has been reported through theMCA_SYND1andMCA_SYND2registers and output it.IOW:
Author: Yazen Ghannam <[email protected]> Date: Tue Oct 22 19:36:31 2024 +0000EDAC/mce_amd: Add support for FRU text in MCA
A new "FRU Text in MCA" feature is defined where the Field Replaceable Unit (FRU) Text for a device is represented by a string in the new
MCA_SYND1andMCA_SYND2registers. This feature is supported per MCA bank, and it is advertised by the McaFruTextInMca bit (MCA_CONFIG[9]).The FRU Text is populated dynamically for each individual error state (
MCA_STATUS,MCA_ADDR, et al.). This handles the case where an MCA bank covers multiple devices, for example, a Unified Memory Controller (UMC) bank that manages two DIMMs.
Quoted 7 lines
If SYND1 and SYND2 are !NULL, then userspace can assume that they contain FRU text information. If they will report other information in the future, then a way of communicating the info type contained must be devised.
[ Yazen: Add Avadhut as co-developer for wrapper changes. ] [ bp: Do not expose
MCA_CONFIGto userspace yet. ]
The entire struct mce_hw_err gets exposed through the mce tracepoint in patch 3 of this set.
Quoted 20 lines
Signed-off-by Yazen Ghannam <[email protected]>Co-developed-by Avadhut Naik <[email protected]>Signed-off-by Avadhut Naik <[email protected]>Signed-off-by Borislav Petkov (AMD) <[email protected]>arch/x86/include/asm/mce.h +1
-0@@ -61,6 +61,7 @@* - TCC bit is present in MCx_STATUS. */ #define MCI_CONFIG_MCAX 0x1 +#define MCI_CONFIG_FRUTEXT BIT_ULL(9)#define MCI_IPID_MCATYPE 0xFFFF0000#define MCI_IPID_HWID 0xFFF
arch/x86/include/asm/mce.h struct mce_hw_err { · line 216
Quoted 4 lines
arch/x86/include/asm/mce.h +1
-0@@ -212,6 +213,7 @@ struct mce_hw_err {struct {u64 synd1;/* MCA_SYND1 MSR */ u64 synd2;/* MCA_SYND2 MSR */ +u64 config;/* MCA_CONFIG MSR */
Anything that is added here will automatically show up in the tracepoint, since it's a dynamic array. That was one of the reasons to do the wrapper struct idea, right?
Quoted 75 lines
arch/x86/include/asm/mce.h +0
-0} amd; } vendor; };arch/x86/kernel/cpu/mce/amd.c +1
-0@@ -796,6 +796,7 @@ static void __log_error(unsigned int bank, u64 status, u64 addr, u64 misc)if (mce_flags.smca) {rdmsrl (MSR_AMD64_SMCA_MCx_IPID (bank), m->ipid); +rdmsrl (MSR_AMD64_SMCA_MCx_CONFIG (bank), err.vendor.amd.config);if (m->status &MCI_STATUS_SYNDV ) {rdmsrl (MSR_AMD64_SMCA_MCx_SYND (bank), m->synd);arch/x86/kernel/cpu/mce/apei.c +2
-0@@ -155,6 +155,8 @@ int apei_smca_report_x86_error(struct cper_ia_proc_ctx *ctx_info, u64 lapic_id) fallthrough;/* MCA_CONFIG */ case 4 : + err.vendor.amd.config = *(i_mce +3 ); + fallthrough;/* MCA_MISC0 */ case 3 : m->misc = *(i_mce +2 );arch/x86/kernel/cpu/mce/core.c +1
-0@@ -681,6 +681,7 @@ static noinstr void mce_read_aux(struct mce_hw_err *err, int i)if (mce_flags.smca) { m->ipid =mce_rdmsrl (MSR_AMD64_SMCA_MCx_IPID (i)); + err->vendor.amd.config =mce_rdmsrl (MSR_AMD64_SMCA_MCx_CONFIG (i));if (m->status &MCI_STATUS_SYNDV ) { m->synd =mce_rdmsrl (MSR_AMD64_SMCA_MCx_SYND (i));drivers/edac/mce_amd.c +4
-7@@ -795,6 +795,7 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)struct mce *m = (struct mce *)data;struct mce_hw_err *err =to_mce_hw_err (m);unsigned int fam =x86_family (m->cpuid); +u64 mca_config = err->vendor.amd.config;int ecc;if (m->kflags &MCE_HANDLED_CEC )@@ -814,11 +815,7 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data) ((m->status & MCI_STATUS_PCC) ? "PCC" : "-"));if (boot_cpu_has (X86_FEATURE_SMCA )) { -u32 low, high; -u32 addr =MSR_AMD64_SMCA_MCx_CONFIG (m->bank); - -if (!rdmsr_safe (addr, &low, &high) && - (low &MCI_CONFIG_MCAX )) +if (mca_config &MCI_CONFIG_MCAX )pr_cont ("|%s" , ((m->status &MCI_STATUS_TCC ) ?"TCC" :"-" ));pr_cont ("|%s" , ((m->status &MCI_STATUS_SYNDV ) ?"SyndV" :"-" ));@@ -853,8 +850,15 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)if (m->status &MCI_STATUS_SYNDV ) {pr_cont (", Syndrome: 0x%016llx\n" , m->synd); -pr_emerg (HW_ERR "Syndrome1: 0x%016llx, Syndrome2: 0x%016llx" , - err->vendor.amd.synd1, err->vendor.amd.synd2); +if (mca_config &MCI_CONFIG_FRUTEXT ) { +char frutext[17 ];
drivers/edac/mce_amd.c amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data) · line 864
Quoted 10 lines
drivers/edac/mce_amd.c +7
-0+ + frutext[16 ] ='\0' ; +memcpy (&frutext[0 ], &err->vendor.amd.synd1,8 ); +memcpy (&frutext[8 ], &err->vendor.amd.synd2,8 ); + +pr_emerg (HW_ERR "FRU Text: %s" , frutext); + } }pr_cont ("\n" );
The only changes I see are dropping a couple of kernel prints. I think that's probably okay. But I don't think that's what you intend by not exposing MCA_CONFIG to user space.
Thanks,
Yazen
Re: [PATCH v7 5/5] EDAC/mce_amd: Add support for FRU Text in MCA
Quoted 158 lines · Yazen Ghannam
Quoted 35 lines · Borislav Petkov
Quoted 12 lines · Avadhut Naik
From: Yazen Ghannam <[email protected]>
A new "FRU Text in MCA" feature is defined where the Field Replaceable Unit (FRU) Text for a device is represented by a string in the new
MCA_SYND1andMCA_SYND2registers. This feature is supported per MCA bank, and it is advertised by the McaFruTextInMca bit (MCA_CONFIG[9]).The FRU Text is populated dynamically for each individual error state (
MCA_STATUS,MCA_ADDR, et al.). This handles the case where an MCA bank covers multiple devices, for example, a Unified Memory Controller (UMC) bank that manages two DIMMs.Quoted 4 lines
Since MCA_CONFIG[9] is instrumental in decoding FRU Text, it has to be exported through the
mce_recordtracepoint so that userspace tools like the rasdaemon can determine if FRU Text has been reported through theMCA_SYND1andMCA_SYND2registers and output it.IOW:
Author: Yazen Ghannam <[email protected]> Date: Tue Oct 22 19:36:31 2024 +0000EDAC/mce_amd: Add support for FRU text in MCA
A new "FRU Text in MCA" feature is defined where the Field Replaceable Unit (FRU) Text for a device is represented by a string in the new
MCA_SYND1andMCA_SYND2registers. This feature is supported per MCA bank, and it is advertised by the McaFruTextInMca bit (MCA_CONFIG[9]).The FRU Text is populated dynamically for each individual error state (
MCA_STATUS,MCA_ADDR, et al.). This handles the case where an MCA bank covers multiple devices, for example, a Unified Memory Controller (UMC) bank that manages two DIMMs.Quoted 7 lines
If SYND1 and SYND2 are !NULL, then userspace can assume that they contain FRU text information. If they will report other information in the future, then a way of communicating the info type contained must be devised.
[ Yazen: Add Avadhut as co-developer for wrapper changes. ] [ bp: Do not expose
MCA_CONFIGto userspace yet. ]The entire struct
mce_hw_errgets exposed through the mce tracepoint in patch 3 of this set.Quoted 20 lines
Signed-off-by Yazen Ghannam <[email protected]>Co-developed-by Avadhut Naik <[email protected]>Signed-off-by Avadhut Naik <[email protected]>Signed-off-by Borislav Petkov (AMD) <[email protected]>arch/x86/include/asm/mce.h +1
-0@@ -61,6 +61,7 @@* - TCC bit is present in MCx_STATUS. */ #define MCI_CONFIG_MCAX 0x1 +#define MCI_CONFIG_FRUTEXT BIT_ULL(9)#define MCI_IPID_MCATYPE 0xFFFF0000#define MCI_IPID_HWID 0xFFFarch/x86/include/asm/mce.h struct mce_hw_err { · line 216
Quoted 4 lines
arch/x86/include/asm/mce.h +1
-0@@ -212,6 +213,7 @@ struct mce_hw_err {struct {u64 synd1;/* MCA_SYND1 MSR */ u64 synd2;/* MCA_SYND2 MSR */ +u64 config;/* MCA_CONFIG MSR */ Anything that is added here will automatically show up in the tracepoint, since it's a dynamic array. That was one of the reasons to do the wrapper struct idea, right?
Quoted 82 lines
arch/x86/include/asm/mce.h +0
-0} amd; } vendor; };arch/x86/kernel/cpu/mce/amd.c +1
-0@@ -796,6 +796,7 @@ static void __log_error(unsigned int bank, u64 status, u64 addr, u64 misc)if (mce_flags.smca) {rdmsrl (MSR_AMD64_SMCA_MCx_IPID (bank), m->ipid); +rdmsrl (MSR_AMD64_SMCA_MCx_CONFIG (bank), err.vendor.amd.config);if (m->status &MCI_STATUS_SYNDV ) {rdmsrl (MSR_AMD64_SMCA_MCx_SYND (bank), m->synd);arch/x86/kernel/cpu/mce/apei.c +2
-0@@ -155,6 +155,8 @@ int apei_smca_report_x86_error(struct cper_ia_proc_ctx *ctx_info, u64 lapic_id) fallthrough;/* MCA_CONFIG */ case 4 : + err.vendor.amd.config = *(i_mce +3 ); + fallthrough;/* MCA_MISC0 */ case 3 : m->misc = *(i_mce +2 );arch/x86/kernel/cpu/mce/core.c +1
-0@@ -681,6 +681,7 @@ static noinstr void mce_read_aux(struct mce_hw_err *err, int i)if (mce_flags.smca) { m->ipid =mce_rdmsrl (MSR_AMD64_SMCA_MCx_IPID (i)); + err->vendor.amd.config =mce_rdmsrl (MSR_AMD64_SMCA_MCx_CONFIG (i));if (m->status &MCI_STATUS_SYNDV ) { m->synd =mce_rdmsrl (MSR_AMD64_SMCA_MCx_SYND (i));drivers/edac/mce_amd.c +11
-7@@ -795,6 +795,7 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)struct mce *m = (struct mce *)data;struct mce_hw_err *err =to_mce_hw_err (m);unsigned int fam =x86_family (m->cpuid); +u64 mca_config = err->vendor.amd.config;int ecc;if (m->kflags &MCE_HANDLED_CEC )@@ -814,11 +815,7 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data) ((m->status & MCI_STATUS_PCC) ? "PCC" : "-"));if (boot_cpu_has (X86_FEATURE_SMCA )) { -u32 low, high; -u32 addr =MSR_AMD64_SMCA_MCx_CONFIG (m->bank); - -if (!rdmsr_safe (addr, &low, &high) && - (low &MCI_CONFIG_MCAX )) +if (mca_config &MCI_CONFIG_MCAX )pr_cont ("|%s" , ((m->status &MCI_STATUS_TCC ) ?"TCC" :"-" ));pr_cont ("|%s" , ((m->status &MCI_STATUS_SYNDV ) ?"SyndV" :"-" ));@@ -853,8 +850,15 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)if (m->status &MCI_STATUS_SYNDV ) {pr_cont (", Syndrome: 0x%016llx\n" , m->synd); -pr_emerg (HW_ERR "Syndrome1: 0x%016llx, Syndrome2: 0x%016llx" , - err->vendor.amd.synd1, err->vendor.amd.synd2); +if (mca_config &MCI_CONFIG_FRUTEXT ) { +char frutext[17 ]; + + frutext[16 ] ='\0' ; +memcpy (&frutext[0 ], &err->vendor.amd.synd1,8 ); +memcpy (&frutext[8 ], &err->vendor.amd.synd2,8 ); + +pr_emerg (HW_ERR "FRU Text: %s" , frutext); + } }
Quoted 8 lines
drivers/edac/mce_amd.c amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data) · line 864
Quoted 3 lines
drivers/edac/mce_amd.c +0
-0pr_cont ("\n" );The only changes I see are dropping a couple of kernel prints. I think that's probably okay. But I don't think that's what you intend by not exposing
MCA_CONFIGto user space.
Like Yazen mentioned, we dont explicitly need to add MCA_CONFIG to the tracepoint Just adding it to struct mce_hw_err should be enough as it would then be exported as vendor-specific data.
Additionally, userspace tools like rasdaemon would need MCA_CONFIG to undertake FRU Text decoding from SYND1/2 registers.
Quoted 2 lines
Thanks,
Yazen
Signature · 2 lines
Thanks, Avadhut Naik
Borislav Petkov
maintainerRe: [PATCH v7 5/5] EDAC/mce_amd: Add support for FRU Text in MCA
In reply to Yazen GhannamQuoted 2 lines · Yazen Ghannam
The entire struct
mce_hw_errgets exposed through the mce tracepoint in patch 3 of this set.
Bah, crap. Lemme go back and take a second stab at this.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteBorislav Petkov
maintainerRe: [PATCH v7 5/5] EDAC/mce_amd: Add support for FRU Text in MCA
Quoted 1 line · Borislav Petkov
Bah, crap. Lemme go back and take a second stab at this.
Second try.
The reason why I don't want to expose MCA_CONFIG to userspace is, well, userspace doesn't need to know any "management" information the hw gives. It either gets FRU text in that tracepoint or it doesn't. But it doesn't need to know what MCA_CONFIG said or didn't say.
Ok?
Author: Yazen Ghannam <[email protected]> Date: Tue Oct 22 19:36:31 2024 +0000
EDAC/mce_amd: Add support for FRU text in MCA
A new "FRU Text in MCA" feature is defined where the Field Replaceable Unit (FRU) Text for a device is represented by a string in the new MCA_SYND1 and MCA_SYND2 registers. This feature is supported per MCA bank, and it is advertised by the McaFruTextInMca bit (MCA_CONFIG[9]).
The FRU Text is populated dynamically for each individual error state (MCA_STATUS, MCA_ADDR, et al.). Handle the case where an MCA bank covers multiple devices, for example, a Unified Memory Controller (UMC) bank that manages two DIMMs.
[ Yazen: Add Avadhut as co-developer for wrapper changes. ] [ bp: Do not expose MCA_CONFIG to userspace yet. ]
arch/x86/include/asm/mce.h +1 -0
@@ -61,6 +61,7 @@* - TCC bit is present in MCx_STATUS. */ #define MCI_CONFIG_MCAX 0x1 +#define MCI_CONFIG_FRUTEXT BIT_ULL(9)#define MCI_IPID_MCATYPE 0xFFFF0000#define MCI_IPID_HWID 0xFFF
drivers/edac/mce_amd.c +12 -6
@@ -795,6 +795,7 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)struct mce *m = (struct mce *)data;struct mce_hw_err *err =to_mce_hw_err (m);unsigned int fam =x86_family (m->cpuid); +u32 mca_config_lo =0 , dummy;int ecc;if (m->kflags &MCE_HANDLED_CEC )
@@ -814,11 +815,9 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data) ((m->status & MCI_STATUS_PCC) ? "PCC" : "-"));if (boot_cpu_has (X86_FEATURE_SMCA )) { -u32 low, high; -u32 addr =MSR_AMD64_SMCA_MCx_CONFIG (m->bank); +rdmsr_safe (MSR_AMD64_SMCA_MCx_CONFIG (m->bank), &mca_config_lo, &dummy); -if (!rdmsr_safe (addr, &low, &high) && - (low &MCI_CONFIG_MCAX )) +if (mca_config_lo &MCI_CONFIG_MCAX )pr_cont ("|%s" , ((m->status &MCI_STATUS_TCC ) ?"TCC" :"-" ));pr_cont ("|%s" , ((m->status &MCI_STATUS_SYNDV ) ?"SyndV" :"-" ));
@@ -853,8 +852,15 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)if (m->status &MCI_STATUS_SYNDV ) {pr_cont (", Syndrome: 0x%016llx\n" , m->synd); -pr_emerg (HW_ERR "Syndrome1: 0x%016llx, Syndrome2: 0x%016llx" , - err->vendor.amd.synd1, err->vendor.amd.synd2); +if (mca_config_lo &MCI_CONFIG_FRUTEXT ) { +char frutext[17 ]; + + frutext[16 ] ='\0' ; +memcpy (&frutext[0 ], &err->vendor.amd.synd1,8 ); +memcpy (&frutext[8 ], &err->vendor.amd.synd2,8 ); + +pr_emerg (HW_ERR "FRU Text: %s" , frutext); + } }pr_cont ("\n" );
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteRe: [PATCH v7 5/5] EDAC/mce_amd: Add support for FRU Text in MCA
Quoted 12 lines · Borislav Petkov
Quoted 1 line · Borislav Petkov
Bah, crap. Lemme go back and take a second stab at this.
Second try.
The reason why I don't want to expose
MCA_CONFIGto userspace is, well, userspace doesn't need to know any "management" information the hw gives. It either gets FRU text in that tracepoint or it doesn't. But it doesn't need to know whatMCA_CONFIGsaid or didn't say.Ok?
So, for now, in the kernel, we log SYND1/2 registers only when they contain FRUText.
While in the userspace, since MCA_CONFIG is not in the picture, we always interpret SYND1/2 data as FRUText.
Rasdaemon might need to be tweaked accordingly. Will take care of it. Overall, sounds good.
Do you want me send out a revised version with these changes?
Quoted 81 lines
Author: Yazen Ghannam <[email protected]> Date: Tue Oct 22 19:36:31 2024 +0000EDAC/mce_amd: Add support for FRU text in MCA
A new "FRU Text in MCA" feature is defined where the Field Replaceable Unit (FRU) Text for a device is represented by a string in the new
MCA_SYND1andMCA_SYND2registers. This feature is supported per MCA bank, and it is advertised by the McaFruTextInMca bit (MCA_CONFIG[9]).The FRU Text is populated dynamically for each individual error state (
MCA_STATUS,MCA_ADDR, et al.). Handle the case where an MCA bank covers multiple devices, for example, a Unified Memory Controller (UMC) bank that manages two DIMMs.[ Yazen: Add Avadhut as co-developer for wrapper changes. ] [ bp: Do not expose
MCA_CONFIGto userspace yet. ]Signed-off-by Yazen Ghannam <[email protected]>Co-developed-by Avadhut Naik <[email protected]>Signed-off-by Avadhut Naik <[email protected]>Signed-off-by Borislav Petkov (AMD) <[email protected]>arch/x86/include/asm/mce.h +1
-0@@ -61,6 +61,7 @@* - TCC bit is present in MCx_STATUS. */ #define MCI_CONFIG_MCAX 0x1 +#define MCI_CONFIG_FRUTEXT BIT_ULL(9)#define MCI_IPID_MCATYPE 0xFFFF0000#define MCI_IPID_HWID 0xFFFdrivers/edac/mce_amd.c +12
-6@@ -795,6 +795,7 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)struct mce *m = (struct mce *)data;struct mce_hw_err *err =to_mce_hw_err (m);unsigned int fam =x86_family (m->cpuid); +u32 mca_config_lo =0 , dummy;int ecc;if (m->kflags &MCE_HANDLED_CEC )@@ -814,11 +815,9 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data) ((m->status & MCI_STATUS_PCC) ? "PCC" : "-"));if (boot_cpu_has (X86_FEATURE_SMCA )) { -u32 low, high; -u32 addr =MSR_AMD64_SMCA_MCx_CONFIG (m->bank); +rdmsr_safe (MSR_AMD64_SMCA_MCx_CONFIG (m->bank), &mca_config_lo, &dummy); -if (!rdmsr_safe (addr, &low, &high) && - (low &MCI_CONFIG_MCAX )) +if (mca_config_lo &MCI_CONFIG_MCAX )pr_cont ("|%s" , ((m->status &MCI_STATUS_TCC ) ?"TCC" :"-" ));pr_cont ("|%s" , ((m->status &MCI_STATUS_SYNDV ) ?"SyndV" :"-" ));@@ -853,8 +852,15 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)if (m->status &MCI_STATUS_SYNDV ) {pr_cont (", Syndrome: 0x%016llx\n" , m->synd); -pr_emerg (HW_ERR "Syndrome1: 0x%016llx, Syndrome2: 0x%016llx" , - err->vendor.amd.synd1, err->vendor.amd.synd2); +if (mca_config_lo &MCI_CONFIG_FRUTEXT ) { +char frutext[17 ]; + + frutext[16 ] ='\0' ; +memcpy (&frutext[0 ], &err->vendor.amd.synd1,8 ); +memcpy (&frutext[8 ], &err->vendor.amd.synd2,8 ); + +pr_emerg (HW_ERR "FRU Text: %s" , frutext); + } }pr_cont ("\n" );
Signature · 2 lines
Thanks, Avadhut Naik
Yazen Ghannam
maintainerRe: [PATCH v7 5/5] EDAC/mce_amd: Add support for FRU Text in MCA
Quoted 13 lines · Avadhut
Quoted 10 lines · Borislav Petkov
Quoted 1 line · Borislav Petkov
Bah, crap. Lemme go back and take a second stab at this.
Second try.
The reason why I don't want to expose
MCA_CONFIGto userspace is, well, userspace doesn't need to know any "management" information the hw gives. It either gets FRU text in that tracepoint or it doesn't. But it doesn't need to know whatMCA_CONFIGsaid or didn't say.
Quoted 9 lines
Quoted 2 lines
Ok?
So, for now, in the kernel, we log SYND1/2 registers only when they contain FRUText.
While in the userspace, sinceMCA_CONFIGis not in the picture, we always interpret SYND1/2 data as FRUText.
Rasdaemon might need to be tweaked accordingly. Will take care of it. Overall, sounds good.
Sounds good to me too.
Thanks,
Yazen
Quoted 87 lines
Do you want me send out a revised version with these changes?
Quoted 81 lines
Author: Yazen Ghannam <[email protected]> Date: Tue Oct 22 19:36:31 2024 +0000EDAC/mce_amd: Add support for FRU text in MCA
A new "FRU Text in MCA" feature is defined where the Field Replaceable Unit (FRU) Text for a device is represented by a string in the new
MCA_SYND1andMCA_SYND2registers. This feature is supported per MCA bank, and it is advertised by the McaFruTextInMca bit (MCA_CONFIG[9]).The FRU Text is populated dynamically for each individual error state (
MCA_STATUS,MCA_ADDR, et al.). Handle the case where an MCA bank covers multiple devices, for example, a Unified Memory Controller (UMC) bank that manages two DIMMs.[ Yazen: Add Avadhut as co-developer for wrapper changes. ] [ bp: Do not expose
MCA_CONFIGto userspace yet. ]Signed-off-by Yazen Ghannam <[email protected]>Co-developed-by Avadhut Naik <[email protected]>Signed-off-by Avadhut Naik <[email protected]>Signed-off-by Borislav Petkov (AMD) <[email protected]>arch/x86/include/asm/mce.h +1
-0@@ -61,6 +61,7 @@* - TCC bit is present in MCx_STATUS. */ #define MCI_CONFIG_MCAX 0x1 +#define MCI_CONFIG_FRUTEXT BIT_ULL(9)#define MCI_IPID_MCATYPE 0xFFFF0000#define MCI_IPID_HWID 0xFFFdrivers/edac/mce_amd.c +12
-6@@ -795,6 +795,7 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)struct mce *m = (struct mce *)data;struct mce_hw_err *err =to_mce_hw_err (m);unsigned int fam =x86_family (m->cpuid); +u32 mca_config_lo =0 , dummy;int ecc;if (m->kflags &MCE_HANDLED_CEC )@@ -814,11 +815,9 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data) ((m->status & MCI_STATUS_PCC) ? "PCC" : "-"));if (boot_cpu_has (X86_FEATURE_SMCA )) { -u32 low, high; -u32 addr =MSR_AMD64_SMCA_MCx_CONFIG (m->bank); +rdmsr_safe (MSR_AMD64_SMCA_MCx_CONFIG (m->bank), &mca_config_lo, &dummy); -if (!rdmsr_safe (addr, &low, &high) && - (low &MCI_CONFIG_MCAX )) +if (mca_config_lo &MCI_CONFIG_MCAX )pr_cont ("|%s" , ((m->status &MCI_STATUS_TCC ) ?"TCC" :"-" ));pr_cont ("|%s" , ((m->status &MCI_STATUS_SYNDV ) ?"SyndV" :"-" ));@@ -853,8 +852,15 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)if (m->status &MCI_STATUS_SYNDV ) {pr_cont (", Syndrome: 0x%016llx\n" , m->synd); -pr_emerg (HW_ERR "Syndrome1: 0x%016llx, Syndrome2: 0x%016llx" , - err->vendor.amd.synd1, err->vendor.amd.synd2); +if (mca_config_lo &MCI_CONFIG_FRUTEXT ) { +char frutext[17 ]; + + frutext[16 ] ='\0' ; +memcpy (&frutext[0 ], &err->vendor.amd.synd1,8 ); +memcpy (&frutext[8 ], &err->vendor.amd.synd2,8 ); + +pr_emerg (HW_ERR "FRU Text: %s" , frutext); + } }pr_cont ("\n" );Signature · 2 lines
Thanks, Avadhut Naik
Borislav Petkov
maintainerRe: [PATCH v7 5/5] EDAC/mce_amd: Add support for FRU Text in MCA
In reply to Naik, AvadhutQuoted 4 lines · Avadhut
So, for now, in the kernel, we log SYND1/2 registers only when they contain FRUText. While in the userspace, since
MCA_CONFIGis not in the picture, we always interpret SYND1/2 data as FRUText. Rasdaemon might need to be tweaked accordingly. Will take care of it. Overall, sounds good.
Thanks.
Quoted 1 line
Do you want me send out a revised version with these changes?
Nah, I will queue them soon as I have all the bits here already.
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette[tip: ras/core] EDAC/mce_amd: Add support for FRU text in MCA
In reply to Avadhut NaikThe following commit has been merged into the ras/core branch of tip:
The following commit has been merged into the ras/core branch of tip:
Commit-ID: 612c2addff367ee461dc99ffca2bc786f105d2ec Gitweb: https://git.kernel.org/tip/612c2addff367ee461dc99ffca2bc786f105d2ec Author: Yazen Ghannam <[email protected]> AuthorDate: Tue, 22 Oct 2024 19:36:31 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Thu, 31 Oct 2024 10:53:04 +01:00
EDAC/mce_amd: Add support for FRU text in MCA
A new "FRU Text in MCA" feature is defined where the Field Replaceable Unit (FRU) Text for a device is represented by a string in the new MCA_SYND1 and MCA_SYND2 registers. This feature is supported per MCA bank, and it is advertised by the McaFruTextInMca bit (MCA_CONFIG[9]).
The FRU Text is populated dynamically for each individual error state (MCA_STATUS, MCA_ADDR, et al.). Handle the case where an MCA bank covers multiple devices, for example, a Unified Memory Controller (UMC) bank that manages two DIMMs.
[ Yazen: Add Avadhut as co-developer for wrapper changes. ] [ bp: Do not expose MCA_CONFIG to userspace yet. ]
--- arch/x86/include/asm/mce.h | 1 + drivers/edac/mce_amd.c | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-)
arch/x86/include/asm/mce.h +1 -0
@@ -61,6 +61,7 @@* - TCC bit is present in MCx_STATUS. */ #define MCI_CONFIG_MCAX 0x1 +#define MCI_CONFIG_FRUTEXT BIT_ULL(9)#define MCI_IPID_MCATYPE 0xFFFF0000#define MCI_IPID_HWID 0xFFF
drivers/edac/mce_amd.c +12 -6
@@ -795,6 +795,7 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)struct mce *m = (struct mce *)data;struct mce_hw_err *err =to_mce_hw_err (m);unsigned int fam =x86_family (m->cpuid); +u32 mca_config_lo =0 , dummy;int ecc;if (m->kflags &MCE_HANDLED_CEC )
@@ -814,11 +815,9 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data) ((m->status & MCI_STATUS_PCC) ? "PCC" : "-"));if (boot_cpu_has (X86_FEATURE_SMCA )) { -u32 low, high; -u32 addr =MSR_AMD64_SMCA_MCx_CONFIG (m->bank); +rdmsr_safe (MSR_AMD64_SMCA_MCx_CONFIG (m->bank), &mca_config_lo, &dummy); -if (!rdmsr_safe (addr, &low, &high) && - (low &MCI_CONFIG_MCAX )) +if (mca_config_lo &MCI_CONFIG_MCAX )pr_cont ("|%s" , ((m->status &MCI_STATUS_TCC ) ?"TCC" :"-" ));pr_cont ("|%s" , ((m->status &MCI_STATUS_SYNDV ) ?"SyndV" :"-" ));
@@ -853,8 +852,15 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)if (m->status &MCI_STATUS_SYNDV ) {pr_cont (", Syndrome: 0x%016llx\n" , m->synd); -pr_emerg (HW_ERR "Syndrome1: 0x%016llx, Syndrome2: 0x%016llx" , - err->vendor.amd.synd1, err->vendor.amd.synd2); +if (mca_config_lo &MCI_CONFIG_FRUTEXT ) { +char frutext[17 ]; + + frutext[16 ] ='\0' ; +memcpy (&frutext[0 ], &err->vendor.amd.synd1,8 ); +memcpy (&frutext[8 ], &err->vendor.amd.synd2,8 ); + +pr_emerg (HW_ERR "FRU Text: %s" , frutext); + } }pr_cont ("\n" );
Hi,
Any further feedback on this set?
If not, can this please be considered for merging in?
Quoted 5 lines · Avadhut Naik
This patchset adds a new wrapper for struct mce to prevent its bloating and export vendor specific error information. Additionally, support is also introduced for two new "syndrome" MSRs used in newer AMD Scalable MCA (SMCA) systems. Also, a new "FRU Text in MCA" feature that uses these new "syndrome" MSRs has been addded.
[...]
Quoted 1 line
base-commit:
d7ec15ce8bdc955ce383123c4f01ad0a8155fb90
Signature · 2 lines
Thanks, Avadhut Naik
Borislav Petkov
maintainerQuoted 2 lines · Avadhut
Any further feedback on this set?
If not, can this please be considered for merging in?
You're on the to-review list which is ever-growing. :-(
While waiting, how about you review some other people's code? Whatever you find interesting on lkml or somewhere else...
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette