Make ghes_edac a proper module
Subsystems (15)
v10 cover Make ghes_edac a proper module
Commit dc4e8c07e9e2 ("ACPI: APEI: explicit init of HEST and GHES in apci_init()") introduced a bug that ghes_edac_register() would be invoked before edac_init(). Because at that time, the bus "edac" hasn't been even registered, this created sysfs /devices/mc0 instead of /sys/devices/system/edac/mc/mc0 on an Ampere eMag server.
The solution is to make ghes_edac a proper module.
Changelog:
v10:
- add the RCU_INITIALIZER and use the unrcu_pointer wrap for victim
v9:https://lore.kernel.org/lkml/[email protected]/
- drop the unrcu_pointer patch 06 of v8
- add Ard's xchg_release patch to use a better memory barrier
v8:https://lore.kernel.org/lkml/[email protected]/
- merge v7 two force_enable and ghes_get_devices() patches into one
- make force_enable static
v7:https://lore.kernel.org/lkml/[email protected]/
- remove the ghes_edac_preferred and ghes_present (suggested by Borislav)
- adjust the patch splitting, no major functional changes
- remove the r-b tag in those changed patches
v6:https://www.spinics.net/lists/kernel/msg4511453.html
- no code changes from v5 patches
- add the reviewed and acked by from Toshi
- describe the removal of ghes_edac_force_enable checking in Patch 05
v5: https://www.spinics.net/lists/kernel/msg4502787.html
- add the review-by from Toshi for patch 04 and 06
- refine the commit msg
- remove the unconditional set of ghes_edac_force_enable on Arm
v4: https://lore.kernel.org/lkml/[email protected]/
- move the kernel boot option to ghes module parameter
- collapse th ghes_present and ghes_edac_preferred into one patch
v3: https://lore.kernel.org/lkml/[email protected]/
- refine the commit logs
- introduce ghes preferred and present flag (by Toshi)
- move force_load to setup parameter
- add the ghes_edac_preferred() check for x86/Arm edac drivers
v2: https://lore.kernel.org/lkml/[email protected]/
- add acked-by tag of Patch 1 from Ard
- split the notifier patch
- add 2 patch to get regular drivers selected when ghes edac is not loaded
- fix an errno in igen6 driver
- add a patch to fix the sparse warning of ghes
- refine the commit logs
v1: https://lore.kernel.org/lkml/[email protected]/
Ard Biesheuvel (1):
apei/ghes: Use xchg_release() for updating new cache slot instead of
cmpxchg()
Jia He (6):
efi/cper: export several helpers for ghes_edac to use EDAC/ghes: Add a notifier for reporting memory errors EDAC/ghes: Prepare to make ghes_edac a proper module EDAC/ghes: Make ghes_edac a proper module to remove the dependency on
ghes
EDAC: Add the ghes_get_devices() check for chipset-specific edac
drivers
EDAC/igen6: Return consistent errno when another edac driver is
enabled
drivers/acpi/apei/ghes.c | 111 +++++++++++++++++++++++++-------- drivers/edac/Kconfig | 4 +- drivers/edac/amd64_edac.c | 3 + drivers/edac/armada_xp_edac.c | 3 + drivers/edac/edac_module.h | 1 + drivers/edac/ghes_edac.c | 90 +++++++++++++++----------- drivers/edac/i10nm_base.c | 3 + drivers/edac/igen6_edac.c | 5 +- drivers/edac/layerscape_edac.c | 3 + drivers/edac/pnd2_edac.c | 3 + drivers/edac/sb_edac.c | 3 + drivers/edac/skx_base.c | 3 + drivers/edac/thunderx_edac.c | 3 + drivers/edac/xgene_edac.c | 3 + drivers/firmware/efi/cper.c | 3 + include/acpi/ghes.h | 34 +++------- 16 files changed, 187 insertions(+), 88 deletions(-)
Signature · 1 line
2.25.1
PATCH v10 1/7 efi/cper: export several helpers for ghes_edac to use
Before ghes_edac can be turned back into a proper module again, export several helpers which are going to be used by it.
--- drivers/firmware/efi/cper.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/firmware/efi/cper.c +3 -0
@@ -290,6 +290,7 @@ int cper_mem_err_location(struct cper_mem_err_compact *mem, char *msg)return n; } +EXPORT_SYMBOL_GPL (cper_mem_err_location);int cper_dimm_err_location (struct cper_mem_err_compact *mem,char *msg) {
@@ -310,6 +311,7 @@ int cper_dimm_err_location(struct cper_mem_err_compact *mem, char *msg)return n; } +EXPORT_SYMBOL_GPL (cper_dimm_err_location);void cper_mem_err_pack (const struct cper_sec_mem_err *mem,struct cper_mem_err_compact *cmem)
@@ -331,6 +333,7 @@ void cper_mem_err_pack(const struct cper_sec_mem_err *mem, cmem->mem_array_handle = mem->mem_array_handle; cmem->mem_dev_handle = mem->mem_dev_handle; } +EXPORT_SYMBOL_GPL (cper_mem_err_pack);const char *cper_mem_err_unpack (struct trace_seq *p,struct cper_mem_err_compact *cmem)
Signature · 1 line
2.25.1
PATCH v10 2/7 EDAC/ghes: Add a notifier for reporting memory errors
In reply to Jia HeTo make a proper module, add a notifier for reporting memory errors. Use an atomic notifier because calls sites like ghes_proc_in_irq() run in interrupt context.
--- drivers/acpi/apei/ghes.c | 16 +++++++++++++++- drivers/edac/ghes_edac.c | 19 +++++++++++++++++-- include/acpi/ghes.h | 10 +++------- 3 files changed, 35 insertions(+), 10 deletions(-)
drivers/acpi/apei/ghes.c +15 -1
@@ -94,6 +94,8 @@#define FIX_APEI_GHES_SDEI_CRITICAL __end_of_fixed_addresses#endif +static ATOMIC_NOTIFIER_HEAD (ghes_report_chain); +static inline bool is_hest_type_generic_v2 (struct ghes *ghes) {return ghes->generic->header.type ==ACPI_HEST_TYPE_GENERIC_ERROR_V2 ;
@@ -645,7 +647,7 @@ static bool ghes_do_proc(struct ghes *ghes,if (guid_equal (sec_type, &CPER_SEC_PLATFORM_MEM )) {struct cper_sec_mem_err *mem_err =acpi_hest_get_payload (gdata); -ghes_edac_report_mem_error (sev, mem_err); +atomic_notifier_call_chain (&ghes_report_chain, sev, mem_err);arch_apei_report_mem_error (sev, mem_err); queued =ghes_handle_memory_failure (gdata, sev);
@@ -1497,3 +1499,15 @@ void __init acpi_ghes_init(void)else pr_info (GHES_PFX "Failed to enable APEI firmware first mode.\n" ); } + +void ghes_register_report_chain (struct notifier_block *nb) +{ +atomic_notifier_chain_register (&ghes_report_chain, nb); +} +EXPORT_SYMBOL_GPL (ghes_register_report_chain); + +void ghes_unregister_report_chain (struct notifier_block *nb) +{ +atomic_notifier_chain_unregister (&ghes_report_chain, nb); +} +EXPORT_SYMBOL_GPL (ghes_unregister_report_chain);
drivers/edac/ghes_edac.c +17 -2
@@ -14,6 +14,7 @@#include <linux/dmi.h> #include "edac_module.h" #include <ras/ras_event.h> +#include <linux/notifier.h> #define OTHER_DETAIL_LEN 400
@@ -267,11 +268,14 @@ static int print_mem_error_other_detail(const struct cper_sec_mem_err *mem, charreturn n; } -void ghes_edac_report_mem_error (int sev,struct cper_sec_mem_err *mem_err) +static int ghes_edac_report_mem_error (struct notifier_block *nb, +unsigned long val,void *data) { +struct cper_sec_mem_err *mem_err = (struct cper_sec_mem_err *)data;struct cper_mem_err_compact cmem;struct edac_raw_error_desc *e;struct mem_ctl_info *mci; +unsigned long sev = val;struct ghes_pvt *pvt;unsigned long flags;char *p;
@@ -282,7 +286,7 @@ void ghes_edac_report_mem_error(int sev, struct cper_sec_mem_err *mem_err)* know. */ if (WARN_ON_ONCE (in_nmi ())) -return ; +return NOTIFY_OK ;spin_lock_irqsave (&ghes_lock, flags);
@@ -374,8 +378,15 @@ void ghes_edac_report_mem_error(int sev, struct cper_sec_mem_err *mem_err) unlock:spin_unlock_irqrestore (&ghes_lock, flags); + +return NOTIFY_OK ; } +static struct notifier_block ghes_edac_mem_err_nb = { + .notifier_call = ghes_edac_report_mem_error, + .priority =0 , +}; +/* * Known systems that are safe to enable this module. */
@@ -503,6 +514,8 @@ int ghes_edac_register(struct ghes *ghes, struct device *dev) ghes_pvt = pvt;spin_unlock_irqrestore (&ghes_lock, flags); +ghes_register_report_chain (&ghes_edac_mem_err_nb); +/* only set on success */ refcount_set (&ghes_refcount,1 );
@@ -548,6 +561,8 @@ void ghes_edac_unregister(struct ghes *ghes)if (mci)edac_mc_free (mci); +ghes_unregister_report_chain (&ghes_edac_mem_err_nb); + unlock:mutex_unlock (&ghes_reg_mutex); }
include/acpi/ghes.h +3 -7
@@ -76,18 +76,11 @@ int ghes_estatus_pool_init(int num_ghes);/* From drivers/edac/ghes_edac.c */ #ifdef CONFIG_EDAC_GHES -void ghes_edac_report_mem_error (int sev,struct cper_sec_mem_err *mem_err); -int ghes_edac_register (struct ghes *ghes,struct device *dev);void ghes_edac_unregister (struct ghes *ghes);#else -static inline void ghes_edac_report_mem_error (int sev, -struct cper_sec_mem_err *mem_err) -{ -} -static inline int ghes_edac_register (struct ghes *ghes,struct device *dev) {return -ENODEV ;
@@ -145,4 +138,7 @@ int ghes_notify_sea(void);static inline int ghes_notify_sea (void ) {return -ENOENT ; }#endif +struct notifier_block ; +extern void ghes_register_report_chain (struct notifier_block *nb); +extern void ghes_unregister_report_chain (struct notifier_block *nb);#endif /* GHES_H */
Signature · 1 line
2.25.1
PATCH v10 3/7 EDAC/ghes: Prepare to make ghes_edac a proper module
In reply to Jia HeTo make ghes_edac a proper module, prepare to decouple its dependencies on ghes.
ghes_edac_register() is too late to set module flag ghes_edac.force_load. Also, other edac drivers should not be able to control this flag. Move this flag to the module parameter in ghes and make it static.
Introduce a helper ghes_get_devices(), which returns the dev list GHES probed when the platform-check passes on the system.
The previous force_load check is not needed in ghes_edac_unregister() since it will be checked in module_init of ghes_edac later.
--- drivers/acpi/apei/ghes.c | 46 ++++++++++++++++++++++++++++++++++++++++ drivers/edac/ghes_edac.c | 35 ++---------------------------- include/acpi/ghes.h | 6 ++++++ 3 files changed, 54 insertions(+), 33 deletions(-)
drivers/acpi/apei/ghes.c +46 -0
@@ -109,6 +109,13 @@ static inline bool is_hest_type_generic_v2(struct ghes *ghes)bool ghes_disable;module_param_named (disable, ghes_disable, bool,0 ); +/* +* "ghes.edac_force_enable" forcibly enables ghes_edac and skips the platform +* check. +*/ +static bool ghes_edac_force_enable; +module_param_named (edac_force_enable, ghes_edac_force_enable, bool,0 ); +/* * All error sources notified with HED (Hardware Error Device) share a * single notifier callback, so they need to be linked and checked one
@@ -120,6 +127,9 @@ module_param_named(disable, ghes_disable, bool, 0);static LIST_HEAD (ghes_hed);static DEFINE_MUTEX (ghes_list_mutex); +static LIST_HEAD (ghes_devs); +static DEFINE_MUTEX (ghes_devs_mutex); +/* * Because the memory area used to transfer hardware error information * from BIOS to Linux can be determined only in NMI, IRQ or timer
@@ -1380,6 +1390,12 @@ static int ghes_probe(struct platform_device *ghes_dev)ghes_edac_register (ghes, &ghes_dev->dev); + ghes->dev = &ghes_dev->dev; + +mutex_lock (&ghes_devs_mutex); +list_add_tail (&ghes->elist, &ghes_devs); +mutex_unlock (&ghes_devs_mutex); +/* Handle any pending errors right away */ spin_lock_irqsave (&ghes_notify_lock_irq, flags);ghes_proc (ghes);
@@ -1444,6 +1460,10 @@ static int ghes_remove(struct platform_device *ghes_dev)ghes_edac_unregister (ghes); +mutex_lock (&ghes_devs_mutex); +list_del (&ghes->elist); +mutex_unlock (&ghes_devs_mutex); +kfree (ghes);platform_set_drvdata (ghes_dev,NULL );
@@ -1500,6 +1520,32 @@ void __init acpi_ghes_init(void)pr_info (GHES_PFX "Failed to enable APEI firmware first mode.\n" ); } +/* +* Known x86 systems that prefer GHES error reporting: +*/ +static struct acpi_platform_list plat_list[] = { + {"HPE " ,"Server " ,0 ,ACPI_SIG_FADT , all_versions}, + { }/* End */ +}; + +struct list_head *ghes_get_devices (void ) +{ +int idx =-1 ; + +if (IS_ENABLED (CONFIG_X86 )) { + idx =acpi_match_platform_list (plat_list); +if (idx <0 ) { +if (!ghes_edac_force_enable) +return NULL ; + +pr_warn_once ("Force-loading ghes_edac on an unsupported platform. You're on your own!\n" ); + } + } + +return &ghes_devs; +} +EXPORT_SYMBOL_GPL (ghes_get_devices); +void ghes_register_report_chain (struct notifier_block *nb) {atomic_notifier_chain_register (&ghes_report_chain, nb);
drivers/edac/ghes_edac.c +2 -33
@@ -54,10 +54,6 @@ static DEFINE_MUTEX(ghes_reg_mutex);*/ static DEFINE_SPINLOCK (ghes_lock); -/* "ghes_edac.force_load=1" skips the platform check */ -static bool __read_mostly force_load; -module_param (force_load, bool,0 ); -static bool system_scanned;/* Memory Device - Type 17 of SMBIOS spec */
@@ -387,14 +383,6 @@ static struct notifier_block ghes_edac_mem_err_nb = { .priority = 0, }; -/* -* Known systems that are safe to enable this module. -*/ -static struct acpi_platform_list plat_list[] = { - {"HPE " ,"Server " ,0 ,ACPI_SIG_FADT , all_versions}, - { }/* End */ -}; -int ghes_edac_register (struct ghes *ghes,struct device *dev) {bool fake = false;
@@ -402,19 +390,8 @@ int ghes_edac_register(struct ghes *ghes, struct device *dev)struct ghes_pvt *pvt;struct edac_mc_layer layers[1 ];unsigned long flags; -int idx =-1 ;int rc =0 ; -if (IS_ENABLED (CONFIG_X86 )) { -/* Check if safe to enable on this system */ - idx =acpi_match_platform_list (plat_list); -if (!force_load && idx <0 ) -return -ENODEV ; - }else { - force_load = true; - idx =0 ; - } -/* finish another registration/unregistration instance first */ mutex_lock (&ghes_reg_mutex);
@@ -458,15 +435,10 @@ int ghes_edac_register(struct ghes *ghes, struct device *dev)pr_info ("This system has a very crappy BIOS: It doesn't even list the DIMMS.\n" );pr_info ("Its SMBIOS info is wrong. It is doubtful that the error report would\n" );pr_info ("work on such system. Use this driver with caution\n" ); - }else if (idx <0 ) { -pr_info ("This EDAC driver relies on BIOS to enumerate memory and get error reports.\n" ); -pr_info ("Unfortunately, not all BIOSes reflect the memory layout correctly.\n" ); -pr_info ("So, the end result of using this driver varies from vendor to vendor.\n" ); -pr_info ("If you find incorrect reports, please contact your hardware vendor\n" ); -pr_info ("to correct its BIOS.\n" ); -pr_info ("This system has %d DIMM sockets.\n" , ghes_hw.num_dimms); } +pr_info ("This system has %d DIMM sockets.\n" , ghes_hw.num_dimms); +if (!fake) {struct dimm_info *src, *dst;int i =0 ;
@@ -535,9 +507,6 @@ void ghes_edac_unregister(struct ghes *ghes)struct mem_ctl_info *mci;unsigned long flags; -if (!force_load) -return ; -mutex_lock (&ghes_reg_mutex); system_scanned = false;
include/acpi/ghes.h +6 -0
@@ -27,6 +27,8 @@ struct ghes {struct timer_list timer;unsigned int irq; }; +struct device *dev; +struct list_head elist; };struct ghes_estatus_node {
@@ -80,6 +82,8 @@ int ghes_edac_register(struct ghes *ghes, struct device *dev);void ghes_edac_unregister (struct ghes *ghes); +struct list_head *ghes_get_devices (void ); +#else static inline int ghes_edac_register (struct ghes *ghes,struct device *dev) {
@@ -89,6 +93,8 @@ static inline int ghes_edac_register(struct ghes *ghes, struct device *dev)static inline void ghes_edac_unregister (struct ghes *ghes) { } + +static inline struct list_head *ghes_get_devices (void ) {return NULL ; }#endif static inline int acpi_hest_get_version (struct acpi_hest_generic_data *gdata)
Signature · 1 line
2.25.1
PATCH v10 4/7 EDAC/ghes: Make ghes_edac a proper module to remove the dependency on ghes
In reply to Jia HeCommit dc4e8c07e9e2 ("ACPI: APEI: explicit init of HEST and GHES in apci_init()") introduced a bug that ghes_edac_register() would be invoked before edac_init(). Because at that time, the bus "edac" hadn't been even registered, this created sysfs /devices/mc0 instead of /sys/devices/system/edac/mc/mc0 on an Ampere eMag server.
To remove the dependency of ghes_edac on ghes, make it a proper module. Use a list to save the probing devices in ghes_probe(), and defer the ghes_edac_register() to module_init() of the new ghes_edac module by iterating over the devices list.
--- drivers/acpi/apei/ghes.c | 4 ---- drivers/edac/Kconfig | 4 ++-- drivers/edac/ghes_edac.c | 40 ++++++++++++++++++++++++++++++++++++++-- include/acpi/ghes.h | 22 ++-------------------- 4 files changed, 42 insertions(+), 28 deletions(-)
drivers/acpi/apei/ghes.c +0 -4
@@ -1388,8 +1388,6 @@ static int ghes_probe(struct platform_device *ghes_dev)platform_set_drvdata (ghes_dev, ghes); -ghes_edac_register (ghes, &ghes_dev->dev); - ghes->dev = &ghes_dev->dev;mutex_lock (&ghes_devs_mutex);
@@ -1458,8 +1456,6 @@ static int ghes_remove(struct platform_device *ghes_dev)ghes_fini (ghes); -ghes_edac_unregister (ghes); -mutex_lock (&ghes_devs_mutex);list_del (&ghes->elist);mutex_unlock (&ghes_devs_mutex);
drivers/edac/Kconfig +2 -2
@@ -53,8 +53,8 @@ config EDAC_DECODE_MCE has been initialized. config EDAC_GHES - bool "Output ACPI APEI/GHES BIOS detected errors via EDAC" - depends on ACPI_APEI_GHES && (EDAC=y) + tristate "Output ACPI APEI/GHES BIOS detected errors via EDAC" + depends on ACPI_APEI_GHES select UEFI_CPER help Not all machines support hardware-driven error report. Some of those
drivers/edac/ghes_edac.c +38 -2
@@ -56,6 +56,8 @@ static DEFINE_SPINLOCK(ghes_lock);static bool system_scanned; +static struct list_head *ghes_devs; +/* Memory Device - Type 17 of SMBIOS spec */ struct memdev_dmi_entry {u8 type;
@@ -383,7 +385,7 @@ static struct notifier_block ghes_edac_mem_err_nb = { .priority = 0, }; -int ghes_edac_register (struct ghes *ghes,struct device *dev) +static int ghes_edac_register (struct device *dev) {bool fake = false;struct mem_ctl_info *mci;
@@ -502,7 +504,7 @@ int ghes_edac_register(struct ghes *ghes, struct device *dev)return rc; } -void ghes_edac_unregister (struct ghes *ghes) +static void ghes_edac_unregister (struct ghes *ghes) {struct mem_ctl_info *mci;unsigned long flags;
@@ -535,3 +537,37 @@ void ghes_edac_unregister(struct ghes *ghes) unlock:mutex_unlock (&ghes_reg_mutex); } + +static int __init ghes_edac_init (void ) +{ +struct ghes *g, *g_tmp; + + ghes_devs =ghes_get_devices (); +if (!ghes_devs) +return -ENODEV ; + +if (list_empty (ghes_devs)) { +pr_info ("GHES probing device list is empty" ); +return -ENODEV ; + } + +list_for_each_entry_safe (g, g_tmp, ghes_devs, elist) { +ghes_edac_register (g->dev); + } + +return 0 ; +} +module_init (ghes_edac_init); + +static void __exit ghes_edac_exit(void) +{ +struct ghes *g, *g_tmp; + +list_for_each_entry_safe (g, g_tmp, ghes_devs, elist) { +ghes_edac_unregister (g); + } +} +module_exit (ghes_edac_exit); + +MODULE_LICENSE ("GPL" ); +MODULE_DESCRIPTION ("Output ACPI APEI/GHES BIOS detected errors module via EDAC" );
include/acpi/ghes.h +2 -20
@@ -71,32 +71,14 @@ int ghes_register_vendor_record_notifier(struct notifier_block *nb);* @nb: pointer to the notifier_block structure of the vendor record handler. */ void ghes_unregister_vendor_record_notifier (struct notifier_block *nb); -#endif - -int ghes_estatus_pool_init (int num_ghes); - -/* From drivers/edac/ghes_edac.c */ - -#ifdef CONFIG_EDAC_GHES -int ghes_edac_register (struct ghes *ghes,struct device *dev); - -void ghes_edac_unregister (struct ghes *ghes);struct list_head *ghes_get_devices (void ); -#else -static inline int ghes_edac_register (struct ghes *ghes,struct device *dev) -{ -return -ENODEV ; -} - -static inline void ghes_edac_unregister (struct ghes *ghes) -{ -} -static inline struct list_head *ghes_get_devices (void ) {return NULL ; }#endif +int ghes_estatus_pool_init (int num_ghes); +static inline int acpi_hest_get_version (struct acpi_hest_generic_data *gdata) {return gdata->revision >>8 ;
Signature · 1 line
2.25.1
PATCH v10 5/7 EDAC: Add the ghes_get_devices() check for chipset-specific edac drivers
In reply to Jia HeAdd ghes_get_devices() check for chipset-specific edac drivers to ensure that ghes_edac is used on the platform where ghes_edac is preferred over chipset-specific edac driver.
Unlike the existing edac_get_owner() check, the ghes_get_devices() check works independent to the module_init ordering.
--- drivers/edac/amd64_edac.c | 3 +++ drivers/edac/armada_xp_edac.c | 3 +++ drivers/edac/edac_module.h | 1 + drivers/edac/i10nm_base.c | 3 +++ drivers/edac/igen6_edac.c | 3 +++ drivers/edac/layerscape_edac.c | 3 +++ drivers/edac/pnd2_edac.c | 3 +++ drivers/edac/sb_edac.c | 3 +++ drivers/edac/skx_base.c | 3 +++ drivers/edac/thunderx_edac.c | 3 +++ drivers/edac/xgene_edac.c | 3 +++ 11 files changed, 31 insertions(+)
drivers/edac/amd64_edac.c +3 -0
@@ -4329,6 +4329,9 @@ static int __init amd64_edac_init(void)int err = -ENODEV ;int i; +if (ghes_get_devices ()) +return -EBUSY ; + owner =edac_get_owner ();if (owner &&strncmp (owner,EDAC_MOD_STR ,sizeof (EDAC_MOD_STR )))return -EBUSY ;
drivers/edac/armada_xp_edac.c +3 -0
@@ -599,6 +599,9 @@ static int __init armada_xp_edac_init(void) {int res; +if (ghes_get_devices ()) +return -EBUSY ; +/* only polling is supported */ edac_op_state =EDAC_OPSTATE_POLL ;
drivers/edac/edac_module.h +1 -0
@@ -11,6 +11,7 @@#ifndef __EDAC_MODULE_H__#define __EDAC_MODULE_H__ +#include <acpi/ghes.h> #include "edac_mc.h" #include "edac_pci.h" #include "edac_device.h"
drivers/edac/i10nm_base.c +3 -0
@@ -548,6 +548,9 @@ static int __init i10nm_init(void)edac_dbg (2 ,"\n" ); +if (ghes_get_devices ()) +return -EBUSY ; + owner =edac_get_owner ();if (owner &&strncmp (owner,EDAC_MOD_STR ,sizeof (EDAC_MOD_STR )))return -EBUSY ;
drivers/edac/igen6_edac.c +3 -0
@@ -1271,6 +1271,9 @@ static int __init igen6_init(void)edac_dbg (2 ,"\n" ); +if (ghes_get_devices ()) +return -EBUSY ; + owner =edac_get_owner ();if (owner &&strncmp (owner,EDAC_MOD_STR ,sizeof (EDAC_MOD_STR )))return -ENODEV ;
drivers/edac/layerscape_edac.c +3 -0
@@ -38,6 +38,9 @@ static int __init fsl_ddr_mc_init(void) {int res; +if (ghes_get_devices ()) +return -EBUSY ; +/* make sure error reporting method is sane */ switch (edac_op_state) {case EDAC_OPSTATE_POLL :
drivers/edac/pnd2_edac.c +3 -0
@@ -1528,6 +1528,9 @@ static int __init pnd2_init(void)edac_dbg (2 ,"\n" ); +if (ghes_get_devices ()) +return -EBUSY ; + owner =edac_get_owner ();if (owner &&strncmp (owner,EDAC_MOD_STR ,sizeof (EDAC_MOD_STR )))return -EBUSY ;
drivers/edac/sb_edac.c +3 -0
@@ -3506,6 +3506,9 @@ static int __init sbridge_init(void)edac_dbg (2 ,"\n" ); +if (ghes_get_devices ()) +return -EBUSY ; + owner =edac_get_owner ();if (owner &&strncmp (owner,EDAC_MOD_STR ,sizeof (EDAC_MOD_STR )))return -EBUSY ;
drivers/edac/skx_base.c +3 -0
@@ -653,6 +653,9 @@ static int __init skx_init(void)edac_dbg (2 ,"\n" ); +if (ghes_get_devices ()) +return -EBUSY ; + owner =edac_get_owner ();if (owner &&strncmp (owner,EDAC_MOD_STR ,sizeof (EDAC_MOD_STR )))return -EBUSY ;
drivers/edac/thunderx_edac.c +3 -0
@@ -2114,6 +2114,9 @@ static int __init thunderx_edac_init(void) {int rc =0 ; +if (ghes_get_devices ()) +return -EBUSY ; + rc =pci_register_driver (&thunderx_lmc_driver);if (rc)return rc;
drivers/edac/xgene_edac.c +3 -0
@@ -2004,6 +2004,9 @@ static int __init xgene_edac_init(void) {int rc; +if (ghes_get_devices ()) +return -EBUSY ; +/* Make sure error reporting method is sane */ switch (edac_op_state) {case EDAC_OPSTATE_POLL :
Signature · 1 line
2.25.1
PATCH v10 6/7 apei/ghes: Use xchg_release() for updating new cache slot instead of cmpxchg()
In reply to Jia HeFrom: Ard Biesheuvel <[email protected]>
From: Ard Biesheuvel <[email protected]>
ghes_estatus_cache_add() selects a slot, and either succeeds in replacing its contents with a pointer to a new cached item, or it just gives up and frees the new item again, without attempting to select another slot even if one might be available.
Since only inserting new items is needed, the race can only cause a failure if the selected slot was updated with another new item concurrently, which means that it is arbitrary which of those two items gets dropped. This means the cmpxchg() and the special case are not necessary, and hence just drop the existing item unconditionally. Note that this does not result in loss of error events, it simply means we might cause a false cache miss, and report the same event one additional time in quick succession even if the cache should have prevented that.
Move the xchg_release() and call_rcu out of rcu_read_lock/unlock section since there is no actually dereferencing the pointer at all.
--- drivers/acpi/apei/ghes.c | 49 ++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 22 deletions(-)
drivers/acpi/apei/ghes.c +27 -22
@@ -150,7 +150,7 @@ struct ghes_vendor_record_entry {static struct gen_pool *ghes_estatus_pool;static unsigned long ghes_estatus_pool_size_request; -static struct ghes_estatus_cache *ghes_estatus_caches[GHES_ESTATUS_CACHES_SIZE ]; +static struct ghes_estatus_cache __rcu *ghes_estatus_caches[GHES_ESTATUS_CACHES_SIZE ];static atomic_t ghes_estatus_cache_alloced;static int ghes_panic_timeout__read_mostly =30 ;
@@ -785,31 +785,26 @@ static struct ghes_estatus_cache *ghes_estatus_cache_alloc(return cache; } -static void ghes_estatus_cache_free (struct ghes_estatus_cache *cache) +static void ghes_estatus_cache_rcu_free (struct rcu_head *head) { +struct ghes_estatus_cache *cache;u32 len; + cache = container_of(head, struct ghes_estatus_cache, rcu); len =cper_estatus_len (GHES_ESTATUS_FROM_CACHE (cache)); len =GHES_ESTATUS_CACHE_LEN (len);gen_pool_free (ghes_estatus_pool, (unsigned long )cache, len);atomic_dec (&ghes_estatus_cache_alloced); } -static void ghes_estatus_cache_rcu_free (struct rcu_head *head) -{ -struct ghes_estatus_cache *cache; - - cache = container_of(head, struct ghes_estatus_cache, rcu); -ghes_estatus_cache_free (cache); -} -static void ghes_estatus_cache_add (struct acpi_hest_generic *generic,struct acpi_hest_generic_status *estatus) {int i, slot =-1 , count;unsigned long long now, duration, period, max_period =0 ; -struct ghes_estatus_cache *cache, *slot_cache =NULL , *new_cache; +struct ghes_estatus_cache *cache, *new_cache; +struct ghes_estatus_cache __rcu *victim; new_cache =ghes_estatus_cache_alloc (generic, estatus);if (new_cache ==NULL )
@@ -820,13 +815,11 @@ static void ghes_estatus_cache_add( cache =rcu_dereference (ghes_estatus_caches[i]);if (cache ==NULL ) { slot = i; - slot_cache =NULL ;break ; } duration = now - cache->time_in;if (duration >=GHES_ESTATUS_IN_CACHE_MAX_NSEC ) { slot = i; - slot_cache = cache;break ; } count =atomic_read (&cache->count);
@@ -835,18 +828,30 @@ static void ghes_estatus_cache_add(if (period > max_period) { max_period = period; slot = i; - slot_cache = cache; } } -/* new_cache must be put into array after its contents are written */ -smp_wmb (); -if (slot !=-1 &&cmpxchg (ghes_estatus_caches + slot, - slot_cache, new_cache) == slot_cache) { -if (slot_cache) -call_rcu (&slot_cache->rcu, ghes_estatus_cache_rcu_free); - }else -ghes_estatus_cache_free (new_cache);rcu_read_unlock (); + +if (slot !=-1 ) { +/* +* Use release semantics to ensure that ghes_estatus_cached() +* running on another CPU will see the updated cache fields if +* it can see the new value of the pointer. +*/ + victim =xchg_release (&ghes_estatus_caches[slot], +RCU_INITIALIZER (new_cache)); + +/* +* At this point, victim may point to a cached item different +* from the one based on which we selected the slot. Instead of +* going to the loop again to pick another slot, let's just +* drop the other item anyway: this may cause a false cache +* miss later on, but that won't cause any problems. +*/ +if (victim) +call_rcu (&unrcu_pointer (victim)->rcu, + ghes_estatus_cache_rcu_free); + } } static void __ghes_panic(struct ghes *ghes,
Signature · 1 line
2.25.1
Borislav Petkov
maintainerRe: [PATCH v10 6/7] apei/ghes: Use xchg_release() for updating new cache slot instead of cmpxchg()
Quoted 9 lines · Jia He
From: Ard Biesheuvel <[email protected]>
From: Ard Biesheuvel <[email protected]>
ghes_estatus_cache_add()selects a slot, and either succeeds in replacing its contents with a pointer to a new cached item, or it just gives up and frees the new item again, without attempting to select another slot even if one might be available.
Quoted 4 lines
Since only inserting new items is needed, the race can only cause a failure if the selected slot was updated with another new item concurrently, which means that it is arbitrary which of those two items gets dropped. This means the
cmpxchg()and the special case are not necessary,
Hmm, are you sure about this?
Looking at this complex code, I *think* the intent of the cache is to collect already reported errors - the ghes_estatus_cached() checks - and the adding happens when you report a new one:
if (!ghes_estatus_cached(estatus)) {
if (ghes_print_estatus(NULL, ghes->generic, estatus))
ghes_estatus_cache_add(ghes->generic, estatus);Now, the loop in ghes_estatus_cache_add() is trying to pick out the, well, oldest element in there. Meaning, something which got reported already but a long while ago. There's even a sentence trying to say what this does:
/*
* GHES error status reporting throttle, to report more kinds of
* errors, instead of just most frequently occurred errors. */
And the cmpxchg() is there to make sure when that selected element slot_cache is removed, it really *is* that element that gets removed and not one which replaced it in the meantime.
So it is likely I'm missing something here but it sure looks like this is some sort of a complex, lockless, LRU scheme...
Hmmm.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteArd Biesheuvel
maintainerRe: [PATCH v10 6/7] apei/ghes: Use xchg_release() for updating new cache slot instead of cmpxchg()
Quoted 36 lines · Borislav Petkov
Quoted 9 lines · Jia He
From: Ard Biesheuvel <[email protected]>
From: Ard Biesheuvel <[email protected]>
ghes_estatus_cache_add()selects a slot, and either succeeds in replacing its contents with a pointer to a new cached item, or it just gives up and frees the new item again, without attempting to select another slot even if one might be available.Quoted 4 lines
Since only inserting new items is needed, the race can only cause a failure if the selected slot was updated with another new item concurrently, which means that it is arbitrary which of those two items gets dropped. This means the
cmpxchg()and the special case are not necessary,Hmm, are you sure about this?
Looking at this complex code, I *think* the intent of the cache is to collect already reported errors - the
ghes_estatus_cached()checks - and the adding happens when you report a new one:if (!ghes_estatus_cached(estatus)) { if (ghes_print_estatus(NULL, ghes->generic, estatus)) ghes_estatus_cache_add(ghes->generic, estatus);Now, the loop in
ghes_estatus_cache_add()is trying to pick out the, well, oldest element in there. Meaning, something which got reported already but a long while ago. There's even a sentence trying to say what this does:/*
* GHES error status reporting throttle, to report more kinds of
* errors, instead of just most frequently occurred errors. */
Quoted 7 lines
And the
cmpxchg()is there to make sure when that selected elementslot_cacheis removed, it really *is* that element that gets removed and not one which replaced it in the meantime.So it is likely I'm missing something here but it sure looks like this is some sort of a complex, lockless, LRU scheme...
You are correct.
But the point is that the new element we are adding has the same properties as the one we want to avoid replacing inadvertently, and if the cmpxchg() failed, we just drop it on the floor.
So instead of dropping 'our' new element, we now drop 'the other' new element.
The correct approach here would be to rerun the selection loop on failure, but I doubt whether it is worth it. This is just a fancy rate limiter.
Borislav Petkov
maintainerRe: [PATCH v10 6/7] apei/ghes: Use xchg_release() for updating new cache slot instead of cmpxchg()
Quoted 2 lines · Ard Biesheuvel
But the point is that the new element we are adding has the same properties as the one we want to avoid replacing inadvertently,
No, we're removing the oldest element we found. The new one is anything but we don't compare it to slot_cache which we're about to remove.
Quoted 1 line
and if the
cmpxchg()failed, we just drop it on the floor.
Yeah, I guess the intent here was: oh well, we'll log that thing again because our "throttling cache" didn't manage to enter it.
Quoted 2 lines
So instead of dropping 'our' new element, we now drop 'the other' new element.
Aha, this is what you mean with logging something twice. That other new element gets dropped so if it happens again, it'll get logged and if it then gets entered in the cache properly, then it gets ignored on the next logging run.
Oh well, fine with me.
Quoted 3 lines
The correct approach here would be to rerun the selection loop on failure, but I doubt whether it is worth it. This is just a fancy rate limiter.
Yap, exactly.
Ok, so I'll try to summarize what we talked here in the commit message so that it is written down somewhere for later.
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteBorislav Petkov
maintainerPATCH 1/1 apei/ghes: Use xchg_release() for updating new cache slot instead of cmpxchg()
Ok,
here's what I've done to it, holler if something's still missing.
@rjw, if you wanna take this through your tree, it should work too - it is unrelated to the ghes_edac changes we're doing. Or I can carry it, whatever you prefer.
Thx.
---
From: Ard Biesheuvel <[email protected]>
Some documentation first, about how this machinery works:
It seems, the intent of the GHES error records cache is to collect already reported errors - see the ghes_estatus_cached() checks. There's even a sentence trying to say what this does:
/*
* GHES error status reporting throttle, to report more kinds of
* errors, instead of just most frequently occurred errors. */
New elements are added to the cache this way:
if (!ghes_estatus_cached(estatus)) {
if (ghes_print_estatus(NULL, ghes->generic, estatus))
ghes_estatus_cache_add(ghes->generic, estatus);The intent being, once this new error record is reported, it gets cached so that it doesn't get reported for a while due to too many, same-type error records getting reported in burst-like scenarios. I.e., new, unreported error types can have a higher chance of getting reported.
Now, the loop in ghes_estatus_cache_add() is trying to pick out the oldest element in there. Meaning, something which got reported already but a long while ago, i.e., a LRU-type scheme.
And the cmpxchg() is there presumably to make sure when that selected element slot_cache is removed, it really *is* that element that gets removed and not one which replaced it in the meantime.
Now, ghes_estatus_cache_add() selects a slot, and either succeeds in replacing its contents with a pointer to a newly cached item, or it just gives up and frees the new item again, without attempting to select another slot even if one might be available.
Since only inserting new items is being done here, the race can only cause a failure if the selected slot was updated with another new item concurrently, which means that it is arbitrary which of those two items gets dropped.
And "dropped" here means, the item doesn't get added to the cache so the next time it is seen, it'll get reported again and an insertion attempt will be done again. Eventually, it'll get inserted and all those times when the insertion fails, the item will get reported although the cache is supposed to prevent that and "ratelimit" those repeated error records. Not a big deal in any case.
This means the cmpxchg() and the special case are not necessary. Therefore, just drop the existing item unconditionally.
Move the xchg_release() and call_rcu() out of rcu_read_lock/unlock section since there is no actually dereferencing the pointer at all.
[ bp:
- Flesh out and summarize what was discussed on the thread now that that cache contraption is understood;
- Touch up code style. ]
--- drivers/acpi/apei/ghes.c | 60 ++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 27 deletions(-)
drivers/acpi/apei/ghes.c +33 -27
@@ -154,7 +154,7 @@ struct ghes_vendor_record_entry {static struct gen_pool *ghes_estatus_pool;static unsigned long ghes_estatus_pool_size_request; -static struct ghes_estatus_cache *ghes_estatus_caches[GHES_ESTATUS_CACHES_SIZE ]; +static struct ghes_estatus_cache __rcu *ghes_estatus_caches[GHES_ESTATUS_CACHES_SIZE ];static atomic_t ghes_estatus_cache_alloced;static int ghes_panic_timeout__read_mostly =30 ;
@@ -789,48 +789,42 @@ static struct ghes_estatus_cache *ghes_estatus_cache_alloc(return cache; } -static void ghes_estatus_cache_free (struct ghes_estatus_cache *cache) +static void ghes_estatus_cache_rcu_free (struct rcu_head *head) { +struct ghes_estatus_cache *cache;u32 len; + cache = container_of(head, struct ghes_estatus_cache, rcu); len =cper_estatus_len (GHES_ESTATUS_FROM_CACHE (cache)); len =GHES_ESTATUS_CACHE_LEN (len);gen_pool_free (ghes_estatus_pool, (unsigned long )cache, len);atomic_dec (&ghes_estatus_cache_alloced); } -static void ghes_estatus_cache_rcu_free (struct rcu_head *head) -{ -struct ghes_estatus_cache *cache; - - cache = container_of(head, struct ghes_estatus_cache, rcu); -ghes_estatus_cache_free (cache); -} - -static void ghes_estatus_cache_add ( -struct acpi_hest_generic *generic, -struct acpi_hest_generic_status *estatus) +static void +ghes_estatus_cache_add (struct acpi_hest_generic *generic, +struct acpi_hest_generic_status *estatus) { -int i, slot =-1 , count;unsigned long long now, duration, period, max_period =0 ; -struct ghes_estatus_cache *cache, *slot_cache =NULL , *new_cache; +struct ghes_estatus_cache *cache, *new_cache; +struct ghes_estatus_cache __rcu *victim; +int i, slot =-1 , count; new_cache =ghes_estatus_cache_alloc (generic, estatus); -if (new_cache ==NULL ) +if (!new_cache)return ; +rcu_read_lock (); now =sched_clock ();for (i =0 ; i <GHES_ESTATUS_CACHES_SIZE ; i++) { cache =rcu_dereference (ghes_estatus_caches[i]);if (cache ==NULL ) { slot = i; - slot_cache =NULL ;break ; } duration = now - cache->time_in;if (duration >=GHES_ESTATUS_IN_CACHE_MAX_NSEC ) { slot = i; - slot_cache = cache;break ; } count =atomic_read (&cache->count);
@@ -839,18 +833,30 @@ static void ghes_estatus_cache_add(if (period > max_period) { max_period = period; slot = i; - slot_cache = cache; } } -/* new_cache must be put into array after its contents are written */ -smp_wmb (); -if (slot !=-1 &&cmpxchg (ghes_estatus_caches + slot, - slot_cache, new_cache) == slot_cache) { -if (slot_cache) -call_rcu (&slot_cache->rcu, ghes_estatus_cache_rcu_free); - }else -ghes_estatus_cache_free (new_cache);rcu_read_unlock (); + +if (slot !=-1 ) { +/* +* Use release semantics to ensure that ghes_estatus_cached() +* running on another CPU will see the updated cache fields if +* it can see the new value of the pointer. +*/ + victim =xchg_release (&ghes_estatus_caches[slot], +RCU_INITIALIZER (new_cache)); + +/* +* At this point, victim may point to a cached item different +* from the one based on which we selected the slot. Instead of +* going to the loop again to pick another slot, let's just +* drop the other item anyway: this may cause a false cache +* miss later on, but that won't cause any problems. +*/ +if (victim) +call_rcu (&unrcu_pointer (victim)->rcu, + ghes_estatus_cache_rcu_free); + } } static void __ghes_panic(struct ghes *ghes,
Signature · 7 lines
2.35.1
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteArd Biesheuvel
maintainerRe: [PATCH] apei/ghes: Use xchg_release() for updating new cache slot instead of cmpxchg()
Quoted 9 lines · Borislav Petkov
Ok,
here's what I've done to it, holler if something's still missing.
@rjw, if you wanna take this through your tree, it should work too - it is unrelated to the
ghes_edacchanges we're doing. Or I can carry it, whatever you prefer.
Thanks for summarizing that, I'm sure it will be helpful some day :-)
Quoted 191 lines
---
From: Ard Biesheuvel <[email protected]>Some documentation first, about how this machinery works:
It seems, the intent of the GHES error records cache is to collect already reported errors - see the
ghes_estatus_cached()checks. There's even a sentence trying to say what this does:/*
* GHES error status reporting throttle, to report more kinds of
* errors, instead of just most frequently occurred errors. */New elements are added to the cache this way:
if (!ghes_estatus_cached(estatus)) { if (ghes_print_estatus(NULL, ghes->generic, estatus)) ghes_estatus_cache_add(ghes->generic, estatus);The intent being, once this new error record is reported, it gets cached so that it doesn't get reported for a while due to too many, same-type error records getting reported in burst-like scenarios. I.e., new, unreported error types can have a higher chance of getting reported.
Now, the loop in
ghes_estatus_cache_add()is trying to pick out the oldest element in there. Meaning, something which got reported already but a long while ago, i.e., a LRU-type scheme.And the
cmpxchg()is there presumably to make sure when that selected elementslot_cacheis removed, it really *is* that element that gets removed and not one which replaced it in the meantime.Now,
ghes_estatus_cache_add()selects a slot, and either succeeds in replacing its contents with a pointer to a newly cached item, or it just gives up and frees the new item again, without attempting to select another slot even if one might be available.Since only inserting new items is being done here, the race can only cause a failure if the selected slot was updated with another new item concurrently, which means that it is arbitrary which of those two items gets dropped.
And "dropped" here means, the item doesn't get added to the cache so the next time it is seen, it'll get reported again and an insertion attempt will be done again. Eventually, it'll get inserted and all those times when the insertion fails, the item will get reported although the cache is supposed to prevent that and "ratelimit" those repeated error records. Not a big deal in any case.
This means the
cmpxchg()and the special case are not necessary. Therefore, just drop the existing item unconditionally.Move the
xchg_release()andcall_rcu()out of rcu_read_lock/unlock section since there is no actually dereferencing the pointer at all.[ bp:
- Flesh out and summarize what was discussed on the thread now that that cache contraption is understood;
- Touch up code style. ]Co-developed-by Jia He <[email protected]>Signed-off-by Jia He <[email protected]>Signed-off-by Ard Biesheuvel <[email protected]>Signed-off-by Borislav Petkov <[email protected]>--- drivers/acpi/apei/ghes.c | 60 ++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 27 deletions(-)drivers/acpi/apei/ghes.c +33
-28@@ -154,7 +154,7 @@ struct ghes_vendor_record_entry {static struct gen_pool *ghes_estatus_pool;static unsigned long ghes_estatus_pool_size_request; -static struct ghes_estatus_cache *ghes_estatus_caches[GHES_ESTATUS_CACHES_SIZE ]; +static struct ghes_estatus_cache __rcu *ghes_estatus_caches[GHES_ESTATUS_CACHES_SIZE ];static atomic_t ghes_estatus_cache_alloced;static int ghes_panic_timeout__read_mostly =30 ;@@ -789,48 +789,42 @@ static struct ghes_estatus_cache *ghes_estatus_cache_alloc(return cache; } -static void ghes_estatus_cache_free (struct ghes_estatus_cache *cache) +static void ghes_estatus_cache_rcu_free (struct rcu_head *head) { +struct ghes_estatus_cache *cache;u32 len; + cache = container_of(head, struct ghes_estatus_cache, rcu); len =cper_estatus_len (GHES_ESTATUS_FROM_CACHE (cache)); len =GHES_ESTATUS_CACHE_LEN (len);gen_pool_free (ghes_estatus_pool, (unsigned long )cache, len);atomic_dec (&ghes_estatus_cache_alloced); } -static void ghes_estatus_cache_rcu_free (struct rcu_head *head) -{ -struct ghes_estatus_cache *cache; - - cache = container_of(head, struct ghes_estatus_cache, rcu); -ghes_estatus_cache_free (cache); -} - -static void ghes_estatus_cache_add ( -struct acpi_hest_generic *generic, -struct acpi_hest_generic_status *estatus) +static void +ghes_estatus_cache_add (struct acpi_hest_generic *generic, +struct acpi_hest_generic_status *estatus) { -int i, slot =-1 , count;unsigned long long now, duration, period, max_period =0 ; -struct ghes_estatus_cache *cache, *slot_cache =NULL , *new_cache; +struct ghes_estatus_cache *cache, *new_cache; +struct ghes_estatus_cache __rcu *victim; +int i, slot =-1 , count; new_cache =ghes_estatus_cache_alloc (generic, estatus); -if (new_cache ==NULL ) +if (!new_cache)return ; +rcu_read_lock (); now =sched_clock ();for (i =0 ; i <GHES_ESTATUS_CACHES_SIZE ; i++) { cache =rcu_dereference (ghes_estatus_caches[i]);if (cache ==NULL ) { slot = i; - slot_cache =NULL ;break ; } duration = now - cache->time_in;if (duration >=GHES_ESTATUS_IN_CACHE_MAX_NSEC ) { slot = i; - slot_cache = cache;break ; } count =atomic_read (&cache->count);@@ -839,18 +833,30 @@ static void ghes_estatus_cache_add(if (period > max_period) { max_period = period; slot = i; - slot_cache = cache; } } -/* new_cache must be put into array after its contents are written */ -smp_wmb (); -if (slot !=-1 &&cmpxchg (ghes_estatus_caches + slot, - slot_cache, new_cache) == slot_cache) { -if (slot_cache) -call_rcu (&slot_cache->rcu, ghes_estatus_cache_rcu_free); - }else -ghes_estatus_cache_free (new_cache);rcu_read_unlock (); + +if (slot !=-1 ) { +/* +* Use release semantics to ensure that ghes_estatus_cached() +* running on another CPU will see the updated cache fields if +* it can see the new value of the pointer. +*/ + victim =xchg_release (&ghes_estatus_caches[slot], +RCU_INITIALIZER (new_cache)); + +/* +* At this point, victim may point to a cached item different +* from the one based on which we selected the slot. Instead of +* going to the loop again to pick another slot, let's just +* drop the other item anyway: this may cause a false cache +* miss later on, but that won't cause any problems. +*/ +if (victim) +call_rcu (&unrcu_pointer (victim)->rcu, + ghes_estatus_cache_rcu_free); + } } static void __ghes_panic(struct ghes *ghes, --2.35.1
--
Regards/Gruss,
Boris.
Rafael J. Wysocki
maintainerRe: [PATCH] apei/ghes: Use xchg_release() for updating new cache slot instead of cmpxchg()
In reply to Borislav PetkovQuoted 8 lines · Borislav Petkov
Ok,
here's what I've done to it, holler if something's still missing.
@rjw, if you wanna take this through your tree, it should work too - it is unrelated to the
ghes_edacchanges we're doing. Or I can carry it, whatever you prefer.
I think I can take it.
Is this urgent or is it OK to queue it up for 6.2?
Quoted 191 lines
---
From: Ard Biesheuvel <ardb(a)kernel.org>Some documentation first, about how this machinery works:
It seems, the intent of the GHES error records cache is to collect already reported errors - see the
ghes_estatus_cached()checks. There's even a sentence trying to say what this does:/*
* GHES error status reporting throttle, to report more kinds of
* errors, instead of just most frequently occurred errors. */New elements are added to the cache this way:
if (!ghes_estatus_cached(estatus)) { if (ghes_print_estatus(NULL, ghes->generic, estatus)) ghes_estatus_cache_add(ghes->generic, estatus);The intent being, once this new error record is reported, it gets cached so that it doesn't get reported for a while due to too many, same-type error records getting reported in burst-like scenarios. I.e., new, unreported error types can have a higher chance of getting reported.
Now, the loop in
ghes_estatus_cache_add()is trying to pick out the oldest element in there. Meaning, something which got reported already but a long while ago, i.e., a LRU-type scheme.And the
cmpxchg()is there presumably to make sure when that selected elementslot_cacheis removed, it really *is* that element that gets removed and not one which replaced it in the meantime.Now,
ghes_estatus_cache_add()selects a slot, and either succeeds in replacing its contents with a pointer to a newly cached item, or it just gives up and frees the new item again, without attempting to select another slot even if one might be available.Since only inserting new items is being done here, the race can only cause a failure if the selected slot was updated with another new item concurrently, which means that it is arbitrary which of those two items gets dropped.
And "dropped" here means, the item doesn't get added to the cache so the next time it is seen, it'll get reported again and an insertion attempt will be done again. Eventually, it'll get inserted and all those times when the insertion fails, the item will get reported although the cache is supposed to prevent that and "ratelimit" those repeated error records. Not a big deal in any case.
This means the
cmpxchg()and the special case are not necessary. Therefore, just drop the existing item unconditionally.Move the
xchg_release()andcall_rcu()out of rcu_read_lock/unlock section since there is no actually dereferencing the pointer at all.[ bp:
- Flesh out and summarize what was discussed on the thread now that that cache contraption is understood;
- Touch up code style. ]Co-developed-by Jia He <justin.he(a)arm.com>Signed-off-by Jia He <justin.he(a)arm.com>Signed-off-by Ard Biesheuvel <ardb(a)kernel.org>Signed-off-by Borislav Petkov <bp(a)suse.de>--- drivers/acpi/apei/ghes.c | 60 ++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 27 deletions(-)drivers/acpi/apei/ghes.c +33
-28@@ -154,7 +154,7 @@ struct ghes_vendor_record_entry {static struct gen_pool *ghes_estatus_pool;static unsigned long ghes_estatus_pool_size_request; -static struct ghes_estatus_cache *ghes_estatus_caches[GHES_ESTATUS_CACHES_SIZE ]; +static struct ghes_estatus_cache __rcu *ghes_estatus_caches[GHES_ESTATUS_CACHES_SIZE ];static atomic_t ghes_estatus_cache_alloced;static int ghes_panic_timeout__read_mostly =30 ;@@ -789,48 +789,42 @@ static struct ghes_estatus_cache *ghes_estatus_cache_alloc(return cache; } -static void ghes_estatus_cache_free (struct ghes_estatus_cache *cache) +static void ghes_estatus_cache_rcu_free (struct rcu_head *head) { +struct ghes_estatus_cache *cache;u32 len; + cache = container_of(head, struct ghes_estatus_cache, rcu); len =cper_estatus_len (GHES_ESTATUS_FROM_CACHE (cache)); len =GHES_ESTATUS_CACHE_LEN (len);gen_pool_free (ghes_estatus_pool, (unsigned long )cache, len);atomic_dec (&ghes_estatus_cache_alloced); } -static void ghes_estatus_cache_rcu_free (struct rcu_head *head) -{ -struct ghes_estatus_cache *cache; - - cache = container_of(head, struct ghes_estatus_cache, rcu); -ghes_estatus_cache_free (cache); -} - -static void ghes_estatus_cache_add ( -struct acpi_hest_generic *generic, -struct acpi_hest_generic_status *estatus) +static void +ghes_estatus_cache_add (struct acpi_hest_generic *generic, +struct acpi_hest_generic_status *estatus) { -int i, slot =-1 , count;unsigned long long now, duration, period, max_period =0 ; -struct ghes_estatus_cache *cache, *slot_cache =NULL , *new_cache; +struct ghes_estatus_cache *cache, *new_cache; +struct ghes_estatus_cache __rcu *victim; +int i, slot =-1 , count; new_cache =ghes_estatus_cache_alloc (generic, estatus); -if (new_cache ==NULL ) +if (!new_cache)return ; +rcu_read_lock (); now =sched_clock ();for (i =0 ; i <GHES_ESTATUS_CACHES_SIZE ; i++) { cache =rcu_dereference (ghes_estatus_caches[i]);if (cache ==NULL ) { slot = i; - slot_cache =NULL ;break ; } duration = now - cache->time_in;if (duration >=GHES_ESTATUS_IN_CACHE_MAX_NSEC ) { slot = i; - slot_cache = cache;break ; } count =atomic_read (&cache->count);@@ -839,18 +833,30 @@ static void ghes_estatus_cache_add(if (period > max_period) { max_period = period; slot = i; - slot_cache = cache; } } -/* new_cache must be put into array after its contents are written */ -smp_wmb (); -if (slot !=-1 &&cmpxchg (ghes_estatus_caches + slot, - slot_cache, new_cache) == slot_cache) { -if (slot_cache) -call_rcu (&slot_cache->rcu, ghes_estatus_cache_rcu_free); - }else -ghes_estatus_cache_free (new_cache);rcu_read_unlock (); + +if (slot !=-1 ) { +/* +* Use release semantics to ensure that ghes_estatus_cached() +* running on another CPU will see the updated cache fields if +* it can see the new value of the pointer. +*/ + victim =xchg_release (&ghes_estatus_caches[slot], +RCU_INITIALIZER (new_cache)); + +/* +* At this point, victim may point to a cached item different +* from the one based on which we selected the slot. Instead of +* going to the loop again to pick another slot, let's just +* drop the other item anyway: this may cause a false cache +* miss later on, but that won't cause any problems. +*/ +if (victim) +call_rcu (&unrcu_pointer (victim)->rcu, + ghes_estatus_cache_rcu_free); + } } static void __ghes_panic(struct ghes *ghes, --2.35.1
--
Regards/Gruss,
Boris.
Borislav Petkov
maintainerRe: [PATCH] apei/ghes: Use xchg_release() for updating new cache slot instead of cmpxchg()
Quoted 1 line · Rafael J. Wysocki
I think I can take it.
Ok, I have it already in the EDAC branch which goes into linux-next but I can zap it.
Quoted 1 line
Is this urgent or is it OK to queue it up for 6.2?
No, 6.2 is fine.
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquettePATCH v10 7/7 EDAC/igen6: Return consistent errno when another edac driver is enabled
In reply to Jia HeOnly a single edac driver can be enabled for EDAC MC. The igen6_init() should be returned with EBUSY instead of ENODEV, which is consistent with other edac drivers.
--- drivers/edac/igen6_edac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/edac/igen6_edac.c +1 -1
@@ -1276,7 +1276,7 @@ static int __init igen6_init(void) owner =edac_get_owner ();if (owner &&strncmp (owner,EDAC_MOD_STR ,sizeof (EDAC_MOD_STR ))) -return -ENODEV ; +return -EBUSY ; edac_op_state =EDAC_OPSTATE_NMI ;
Signature · 1 line
2.25.1
Borislav Petkov
maintainerQuoted 10 lines · Jia He
Commit
dc4e8c07e9e2("ACPI: APEI: explicit init of HEST and GHES inapci_init()") introduced a bug thatghes_edac_register()would be invoked beforeedac_init(). Because at that time, the bus "edac" hasn't been even registered, this created sysfs /devices/mc0 instead of/sys/devices/system/edac/mc/mc0on an Ampere eMag server.The solution is to make
ghes_edaca proper module.Changelog:
v10:
All queued, thanks for the effort.
It'll appear in Linux next soon.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteQuoted 28 lines
-----Original Message-----
From: Borislav Petkov <[email protected]>
Sent: Tuesday, October 25, 2022 10:08 PM
To: Justin He <[email protected]>
Cc: Ard Biesheuvel <[email protected]>; Len Brown <[email protected]>; Tony Luck <[email protected]>; Mauro Carvalho Chehab <[email protected]>; Robert Richter <[email protected]>; Robert Moore <[email protected]>; Qiuxu Zhuo <[email protected]>; Yazen Ghannam <[email protected]>; Jan Luebbe <[email protected]>; Khuong Dinh <[email protected]>; Kani Toshi <[email protected]>; James Morse <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; Rafael J . Wysocki <[email protected]>; Shuai Xue <[email protected]>; Jarkko Sakkinen <[email protected]>; [email protected]; nd <[email protected]>; Peter Zijlstra <[email protected]>
Subject: Re: [PATCH v10 0/7] Makeghes_edaca proper moduleQuoted 7 lines · Jia He
Commit
dc4e8c07e9e2("ACPI: APEI: explicit init of HEST and GHES inapci_init()") introduced a bug thatghes_edac_register()would be invoked beforeedac_init(). Because at that time, the bus "edac" hasn't been even registered, this created sysfs /devices/mc0 instead of/sys/devices/system/edac/mc/mc0on an Ampere eMag server.
Quoted 9 lines
Quoted 4 lines
The solution is to make
ghes_edaca proper module.Changelog:
v10:All queued, thanks for the effort.
It'll appear in Linux next soon.
Thanks for your help and patience 😊
--
Cheers,
Justin (Jia He)