EDAC: Improve memory address decoding for i10nm driver
Subsystems (4)
Tony Luck
maintainercover EDAC: Improve memory address decoding for i10nm driver
Calling firmware to translate memory addresses has a high impact on system because the call uses SMI.
The 10nm server processors (Icelake and Tremont) provide additional information in the IA32_MCi_MISC registers that can be used to decode the address of an error in DDR memory.
Couple of prep patches before the main event in part 3 that decodes the address from the MISC register.
Qiuxu Zhuo (2):
EDAC/skx_common: Use driver decoder first
EDAC/skx_common: Make output format similar
Youquan Song (1):
EDAC/i10nm: Add driver decoder for Ice Lake and Tremont CPUs
arch/x86/include/asm/mce.h | 1 + drivers/edac/skx_common.h | 6 ++ drivers/edac/i10nm_base.c | 134 ++++++++++++++++++++++++++++++++++++- drivers/edac/skx_base.c | 9 ++- drivers/edac/skx_common.c | 21 +++--- 5 files changed, 158 insertions(+), 13 deletions(-)
base-commit: b90cb1053190353cc30f0fef0ef1f378ccc063c5
Signature · 1 line
2.37.1
Tony Luck
maintainerPATCH 1/3 EDAC/skx_common: Use driver decoder first
From: Qiuxu Zhuo <[email protected]>
The performance of driver decoder[1] is better than the performance of firmware decoder[2], especially on frequent correctable errors.
So use the driver decoder first, fall back to firmware decoder if the driver decoder is unavailable. Also rename the function pointer skx_decode to driver_decode (better name to contrast with adxl_decode).
[1] Decode errors by extracting error information from registers of memory controllers and/or MCA bank registers.
[2] Decode errors by calling ACPI DSM methods.
--- drivers/edac/skx_common.h | 1 + drivers/edac/skx_base.c | 9 +++++++-- drivers/edac/skx_common.c | 16 +++++++++------- 3 files changed, 17 insertions(+), 9 deletions(-)
drivers/edac/skx_common.h +1 -0
@@ -136,6 +136,7 @@ struct decoded_addr {int column;int bank_address;int bank_group; +bool decoded_by_adxl; };struct res_config {
drivers/edac/skx_base.c +7 -2
@@ -714,8 +714,13 @@ static int __init skx_init(void)skx_set_decode (skx_decode, skx_show_retry_rd_err_log); -if (nvdimm_count &&skx_adxl_get () == -ENODEV ) -skx_printk (KERN_NOTICE ,"Only decoding DDR4 address!\n" ); +if (nvdimm_count &&skx_adxl_get () != -ENODEV ) { +skx_set_decode (NULL , skx_show_retry_rd_err_log); + }else { +if (nvdimm_count) +skx_printk (KERN_NOTICE ,"Only decoding DDR4 address!\n" ); +skx_set_decode (skx_decode, skx_show_retry_rd_err_log); + }/* Ensure that the OPSTATE is set correctly for POLL or NMI */ opstate_init ();
drivers/edac/skx_common.c +9 -7
@@ -40,7 +40,7 @@ static char *adxl_msg;static unsigned long adxl_nm_bitmap;static char skx_msg[MSG_SIZE ]; -static skx_decode_f skx_decode; +static skx_decode_f driver_decode;static skx_show_retry_log_f skx_show_retry_rd_err_log;static u64 skx_tolm, skx_tohm;static LIST_HEAD (dev_edac_list);
@@ -173,6 +173,8 @@ static bool skx_adxl_decode(struct decoded_addr *res, bool error_in_1st_level_mebreak ; } + res->decoded_by_adxl = true; +return true; }
@@ -183,7 +185,7 @@ void skx_set_mem_cfg(bool mem_cfg_2lm)void skx_set_decode (skx_decode_f decode,skx_show_retry_log_f show_retry_log) { - skx_decode = decode; + driver_decode = decode; skx_show_retry_rd_err_log = show_retry_log; }
@@ -591,7 +593,7 @@ static void skx_mce_output_error(struct mem_ctl_info *mci,break ; } } -if (adxl_component_count) { +if (res->decoded_by_adxl) { len = snprintf(skx_msg, MSG_SIZE, "%s%s err_code:0x%04x:0x%04x %s", overflow ? " OVERFLOW" : "", (uncorrected_error && recoverable) ? " recoverable" : "",
@@ -651,11 +653,11 @@ int skx_mce_check_error(struct notifier_block *nb, unsigned long val,memset (&res,0 ,sizeof (res)); res.addr = mce->addr; -if (adxl_component_count) { -if (!skx_adxl_decode (&res,skx_error_in_1st_level_mem (mce))) +/* Try driver decoder first */ +if (!(driver_decode &&driver_decode (&res))) { +/* Then try firmware decoder (ACPI DSM methods) */ +if (!(adxl_component_count &&skx_adxl_decode (&res,skx_error_in_1st_level_mem (mce))))return NOTIFY_DONE ; - }else if (!skx_decode || !skx_decode (&res)) { -return NOTIFY_DONE ; } mci = res.dev->imc[res.imc].mci;
Signature · 1 line
2.37.1
Tony Luck
maintainerPATCH 2/3 EDAC/skx_common: Make output format similar
In reply to Tony LuckFrom: Qiuxu Zhuo <[email protected]>
The decoded output format of driver decoder is different from the output format of firmware decoder. Make output format similar regardless of decode function (Align driver decoder's to firmware decoder's).
--- drivers/edac/skx_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/edac/skx_common.c +2 -2
@@ -600,12 +600,12 @@ static void skx_mce_output_error(struct mem_ctl_info *mci, mscod, errcode, adxl_msg); }else { len =snprintf (skx_msg,MSG_SIZE , -"%s%s err_code:0x%04x:0x%04x socket:%d imc:%d rank:%d bg:%d ba:%d row:0x%x col:0x%x" , +"%s%s err_code:0x%04x:0x%04x ProcessorSocketId:0x%x MemoryControllerId:0x%x PhysicalRankId:0x%x Row:0x%x Column:0x%x Bank:0x%x BankGroup:0x%x" , overflow ?" OVERFLOW" :"" , (uncorrected_error && recoverable) ?" recoverable" :"" , mscod, errcode, res->socket, res->imc, res->rank, - res->bank_group, res->bank_address, res->row, res->column); + res->row, res->column, res->bank_address, res->bank_group); }if (skx_show_retry_rd_err_log)
Signature · 1 line
2.37.1
Tony Luck
maintainerPATCH 3/3 EDAC/i10nm: Add driver decoder for Ice Lake and Tremont CPUs
In reply to Tony LuckFrom: Youquan Song <[email protected]>
Current i10nm_edac only supports firmware decoder (ACPI DSM methods). MCA bank registers of Ice Lake or Tremont CPUs contain the information to decode DDR memory errors. To get better decoding performance, add the driver decoder (decoding DDR memory errors via extracting error information from MCA bank registers) for Ice Lake and Tremont CPUs.
--- arch/x86/include/asm/mce.h | 1 + drivers/edac/skx_common.h | 5 ++ drivers/edac/i10nm_base.c | 134 ++++++++++++++++++++++++++++++++++++- drivers/edac/skx_common.c | 1 + 4 files changed, 139 insertions(+), 2 deletions(-)
arch/x86/include/asm/mce.h +1 -0
@@ -42,6 +42,7 @@#define MCI_STATUS_CEC_SHIFT 38/* Corrected Error Count */ #define MCI_STATUS_CEC_MASK GENMASK_ULL(52,38)#define MCI_STATUS_CEC (c) (((c) & MCI_STATUS_CEC_MASK) >> MCI_STATUS_CEC_SHIFT) +#define MCI_STATUS_MSCOD (m) (((m) >> 16) & 0xffff)/* AMD-specific bits */ #define MCI_STATUS_TCC BIT_ULL(55)/* Task context corrupt */
drivers/edac/skx_common.h +5 -0
@@ -10,6 +10,7 @@#define _SKX_COMM_EDAC_H#include <linux/bits.h> +#include <asm/mce.h> #define MSG_SIZE 1024
@@ -52,6 +53,9 @@#define IS_DIMM_PRESENT (r) GET_BITFIELD(r, 15, 15)#define IS_NVDIMM_PRESENT (r, i) GET_BITFIELD(r, i, i) +#define MCI_MISC_ECC_MODE (m) (((m) >> 59) & 15) +#define MCI_MISC_ECC_DDRT 8/* read from DDRT */ +/* * Each cpu socket contains some pci devices that provide global * information, and also some that are local to each of the two
@@ -120,6 +124,7 @@ enum {#define BIT_NM_DIMM BIT_ULL(INDEX_NM_DIMM)struct decoded_addr { +struct mce *mce;struct skx_dev *dev;u64 addr;int socket;
drivers/edac/i10nm_base.c +132 -2
166 lines not on this page · raw message
drivers/edac/skx_common.c +1 -0
@@ -651,6 +651,7 @@ int skx_mce_check_error(struct notifier_block *nb, unsigned long val,return NOTIFY_DONE ;memset (&res,0 ,sizeof (res)); + res.mce = mce; res.addr = mce->addr;/* Try driver decoder first */
Signature · 1 line
2.37.1