cxl, EINJ: Update EINJ for CXL error types
v15 cover cxl, EINJ: Update EINJ for CXL error types
v15 Changes:
- Update commit messages for patches 2/4 & 3/4 (Tony)
- Add line to cover letter about CXL 2.0+ errors being available under legacy EINJ interface
- Add einj_cxl_rch_error_inject() for CXL 1.0/1.1 error injections in einj-core.c
- Remove checks for einj_initialized in einj_cxl_*_inject functions in einj-cxl.c (Dan)
- Update commit message for patch 1/4 from recommending checking einj_is_initialized() to a more generic "safegaurd against EINJ not being initialized"
- Use more specific headers in einj-cxl.c and einj-cxl.h (Jonathan)
- Use ACPI_APEI_EINJ_CXL_* defines in place of BIT() macros in einj_cxl_error_type_string struct (Jonathan)
- Move error_type_get() above einj_validate_error_type() to cleanup diff (Jonathan)
v14 Changes:
- Remove einj-cxl module and instead compile as part of EINJ module (Dan)
- Change CONFIG_ACPI_APEI_EINJ_CXL from tristate to bool (Dan)
- Fix CONFIG_ACPI_APEI_EINJ_CXL/CONFIG_CXL_BUS dependencies
- Remove EINJ function exports (Dan)
- Organizational changes for CXL content in EINJ kernel documentation (Dan)
- Demote "EINJ table not found." print to pr_debug() from pr_info() (Dan)
The new CXL error types will use the Memory Address field in the SET_ERROR_TYPE_WITH_ADDRESS structure in order to target a CXL 1.1 compliant memory-mapped downstream port. The value of the memory address will be in the port's MMIO range, and it will not represent physical (normal or persistent) memory.
Add the functionality for injecting CXL 1.1/2.0+ errors to the EINJ module, but not through the EINJ legacy interface under /sys/kernel/debug/apei/einj. Instead, make the error types available under /sys/kernel/debug/cxl. This allows for validating the MMIO address for a CXL 1.1 error type while also not making the user responsible for finding it. CXL 2.0+ error types will be available through the legacy EINJ interface and under the new debug/cxl interface since they target the SBDF of the CXL downstream port instead of a MMIO address.
Ben Cheatham (4):
EINJ: Migrate to a platform driver
EINJ: Add CXL error type support
cxl/core: Add CXL EINJ debugfs files
EINJ, Documentation: Update EINJ kernel doc
Documentation/ABI/testing/debugfs-cxl | 30 +++++
.../firmware-guide/acpi/apei/einj.rst | 34 +++++
MAINTAINERS | 1 +
drivers/acpi/apei/Kconfig | 12 ++
drivers/acpi/apei/Makefile | 2 +
drivers/acpi/apei/apei-internal.h | 18 +++
drivers/acpi/apei/{einj.c => einj-core.c} | 123 +++++++++++++++---
drivers/acpi/apei/einj-cxl.c | 116 +++++++++++++++++
drivers/cxl/core/port.c | 42 ++++++
include/linux/einj-cxl.h | 44 +++++++
10 files changed, 401 insertions(+), 21 deletions(-)
rename drivers/acpi/apei/{einj.c => einj-core.c} (90%)
create mode 100644 drivers/acpi/apei/einj-cxl.c
create mode 100644 include/linux/einj-cxl.hSignature · 1 line
2.34.1
PATCH v15 1/4 EINJ: Migrate to a platform driver
Change the EINJ module to install a platform device/driver on module init and move the module init() and exit() functions to driver probe and remove. This change allows the EINJ module to load regardless of whether setting up EINJ succeeds, which allows dependent modules to still load (i.e. the CXL core).
Since EINJ may no longer be initialized when the module loads, any functions that are called from dependent/external modules should safegaurd against the case EINJ didn't load.
--- drivers/acpi/apei/einj.c | 48 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-)
drivers/acpi/apei/einj.c +44 -4
@@ -21,6 +21,7 @@#include <linux/nmi.h> #include <linux/delay.h> #include <linux/mm.h> +#include <linux/platform_device.h> #include <asm/unaligned.h> #include "apei-internal.h"
@@ -137,6 +138,11 @@ static struct apei_exec_ins_type einj_ins_type[] = {*/ static DEFINE_MUTEX (einj_mutex); +/* +* Exported APIs use this flag to exit early if einj_probe() failed. +*/ +static bool einj_initialized__ro_after_init ; +static void *einj_param;static void einj_exec_ctx_init (struct apei_exec_context *ctx)
@@ -703,21 +709,21 @@ static int einj_check_table(struct acpi_table_einj *einj_tab)return 0 ; } -static int __init einj_init (void ) +static int __init einj_probe (struct platform_device *pdev) {int rc;acpi_status status;struct apei_exec_context ctx;if (acpi_disabled) { -pr_info ("ACPI disabled.\n" ); +pr_debug ("ACPI disabled.\n" );return -ENODEV ; } status =acpi_get_table (ACPI_SIG_EINJ ,0 , (struct acpi_table_header **)&einj_tab);if (status ==AE_NOT_FOUND ) { -pr_warn ("EINJ table not found.\n" ); +pr_debug ("EINJ table not found.\n" );return -ENODEV ; }else if (ACPI_FAILURE (status)) { pr_err("Failed to get EINJ table: %s\n",
@@ -805,7 +811,7 @@ static int __init einj_init(void)return rc; } -static void __exit einj_exit(void) +static void __exit einj_remove(struct platform_device *pdev) {struct apei_exec_context ctx;
@@ -826,6 +832,40 @@ static void __exit einj_exit(void)acpi_put_table ((struct acpi_table_header *)einj_tab); } +static struct platform_device *einj_dev; +static struct platform_driver einj_driver = { + .remove_new = einj_remove, + .driver = { + .name ="acpi-einj" , + }, +}; + +static int __init einj_init (void ) +{ +struct platform_device_info einj_dev_info = { + .name ="acpi-einj" , + .id =-1 , + }; +int rc; + + einj_dev =platform_device_register_full (&einj_dev_info); +if (IS_ERR (einj_dev)) +return PTR_ERR (einj_dev); + + rc =platform_driver_probe (&einj_driver, einj_probe); + einj_initialized = rc ==0 ; + +return 0 ; +} + +static void __exit einj_exit(void) +{ +if (einj_initialized) +platform_driver_unregister (&einj_driver); + +platform_device_del (einj_dev); +} +module_init (einj_init);module_exit (einj_exit);
Signature · 1 line
2.34.1
PATCH v15 2/4 EINJ: Add CXL error type support
In reply to Ben CheathamMove CXL protocol error types from einj.c (now einj-core.c) to einj-cxl.c. einj-cxl.c implements the necessary handling for CXL protocol error injection and exposes an API for the CXL core to use said functionality, while also allowing the EINJ module to be built without CXL support. Because CXL error types targeting CXL 1.0/1.1 ports require special handling, only allow them to be injected through the new cxl debugfs interface (next commit) and return an error when attempting to inject through the legacy interface.
---
MAINTAINERS | 1 +
drivers/acpi/apei/Kconfig | 12 +++
drivers/acpi/apei/Makefile | 2 +
drivers/acpi/apei/apei-internal.h | 18 ++++
drivers/acpi/apei/{einj.c => einj-core.c} | 77 ++++++++++----
drivers/acpi/apei/einj-cxl.c | 116 ++++++++++++++++++++++
include/linux/einj-cxl.h | 44 ++++++++
7 files changed, 252 insertions(+), 18 deletions(-)
rename drivers/acpi/apei/{einj.c => einj-core.c} (93%)
create mode 100644 drivers/acpi/apei/einj-cxl.c
create mode 100644 include/linux/einj-cxl.hMAINTAINERS +1 -0
@@ -5289,6 +5289,7 @@ M: Dan Williams <[email protected]> L: [email protected] S: Maintained F: drivers/cxl/ +F: include/linux/cxl-einj.h F: include/linux/cxl-event.h F: include/uapi/linux/cxl_mem.h F: tools/testing/cxl/
drivers/acpi/apei/Kconfig +12 -0
@@ -60,6 +60,18 @@ config ACPI_APEI_EINJ mainly used for debugging and testing the other parts of APEI and some other RAS features. +config ACPI_APEI_EINJ_CXL + bool "CXL Error INJection Support" + default ACPI_APEI_EINJ + depends on ACPI_APEI_EINJ && CXL_BUS <= ACPI_APEI_EINJ + help + Support for CXL protocol Error INJection through debugfs/cxl. + Availability and which errors are supported is dependent on + the host platform. Look to ACPI v6.5 section 18.6.4 and kernel + EINJ documentation for more information. + + If unsure say 'n' + config ACPI_APEI_ERST_DEBUG tristate "APEI Error Record Serialization Table (ERST) Debug Support" depends on ACPI_APEI
drivers/acpi/apei/Makefile +2 -0
@@ -2,6 +2,8 @@ obj-$(CONFIG_ACPI_APEI) += apei.o obj-$(CONFIG_ACPI_APEI_GHES) += ghes.o obj-$(CONFIG_ACPI_APEI_EINJ) += einj.o +einj-y := einj-core.o +einj-$(CONFIG_ACPI_APEI_EINJ_CXL) += einj-cxl.o obj-$(CONFIG_ACPI_APEI_ERST_DEBUG) += erst-dbg.o apei-y := apei-base.o hest.o erst.o bert.o
drivers/acpi/apei/apei-internal.h +18 -0
@@ -130,4 +130,22 @@ static inline u32 cper_estatus_len(struct acpi_hest_generic_status *estatus) }int apei_osc_setup (void ); + +int einj_get_available_error_type (u32 *type); +int einj_error_inject (u32 type,u32 flags,u64 param1,u64 param2,u64 param3, +u64 param4); +int einj_cxl_rch_error_inject (u32 type,u32 flags,u64 param1,u64 param2, +u64 param3,u64 param4); +bool einj_is_cxl_error_type (u64 type); +int einj_validate_error_type (u64 type); + +#ifndef ACPI_EINJ_CXL_CACHE_CORRECTABLE +#define ACPI_EINJ_CXL_CACHE_CORRECTABLE BIT(12) +#define ACPI_EINJ_CXL_CACHE_UNCORRECTABLE BIT(13) +#define ACPI_EINJ_CXL_CACHE_FATAL BIT(14) +#define ACPI_EINJ_CXL_MEM_CORRECTABLE BIT(15) +#define ACPI_EINJ_CXL_MEM_UNCORRECTABLE BIT(16) +#define ACPI_EINJ_CXL_MEM_FATAL BIT(17) +#endif +#endif
drivers/acpi/apei/einj-core.c renamed from drivers/acpi/apei/einj.c +59 -18
144 lines not on this page · raw message
drivers/acpi/apei/einj-cxl.c new file +116 -0
116 lines not on this page · raw message
include/linux/einj-cxl.h new file +44 -0
44 lines not on this page · raw message
Signature · 1 line
2.34.1
kernel test robot
build botRe: [PATCH v15 2/4] EINJ: Add CXL error type support
kernel test robot noticed the following build errors:
Hi Ben,
kernel test robot noticed the following build errors:
[auto build test ERROR on rafael-pm/linux-next]
[also build test ERROR on linus/master v6.8 next-20240312] [cannot apply to rafael-pm/acpi-bus rafael-pm/devprop]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Ben-Cheatham/EINJ-Migrate-to-a-platform-driver/20240311-222800 base: https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git linux-next patch link: https://lore.kernel.org/r/20240311142508.31717-3-Benjamin.Cheatham%40amd.com patch subject: [PATCH v15 2/4] EINJ: Add CXL error type support config: arm64-randconfig-001-20240312 (https://download.01.org/0day-ci/archive/20240312/[email protected]/config) compiler: aarch64-linux-gcc (GCC) 13.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240312/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
aarch64-linux-ld: Unexpected GOT/PLT entries detected!
aarch64-linux-ld: Unexpected run-time procedure linkages detected!
aarch64-linux-ld: drivers/acpi/apei/einj-cxl.o: in function `einj_cxl_inject_error':
>> einj-cxl.c:(.text+0x2b4): undefined reference to `pci_find_host_bridge'
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Re: [PATCH v15 2/4] EINJ: Add CXL error type support
In reply to Ben CheathamThe kernel build bot found a build error with the following config:
CONFIG_PCI=n
CONFIG_CXL_BUS=n
CONFIG_ACPI_APEI_EINJ=y CONFIG_ACPI_APEI_EINJ_CXL=y
The following diff seems to fix the issue:
drivers/acpi/apei/Kconfig +1 -0
@@ -63,6 +63,7 @@ config ACPI_APEI_EINJ config ACPI_APEI_EINJ_CXL bool "CXL Error INJection Support" default ACPI_APEI_EINJ + depends on PCI depends on ACPI_APEI_EINJ && CXL_BUS <= ACPI_APEI_EINJ help Support for CXL protocol Error INJection through debugfs/cxl.
Or if depending on CONFIG_CXL_BUS is preferable (it also depends on CONFIG_PCI):
drivers/acpi/apei/Kconfig +2 -1
@@ -63,7 +63,8 @@ config ACPI_APEI_EINJ config ACPI_APEI_EINJ_CXL bool "CXL Error INJection Support" default ACPI_APEI_EINJ - depends on ACPI_APEI_EINJ && CXL_BUS <= ACPI_APEI_EINJ + depends on ACPI_APEI_EINJ + depends on CXL_BUS && CXL_BUS <= ACPI_APEI_EINJ help Support for CXL protocol Error INJection through debugfs/cxl. Availability and which errors are supported is dependent on
I could send out yet another version, but since this is a one line change I would appreciate it if whoever picks these patches up would just include this fix.
Thanks,
Ben
Re: [PATCH v15 2/4] EINJ: Add CXL error type support
Quoted 15 lines · Ben Cheatham
drivers/acpi/apei/Kconfig +2
-1@@ -63,7 +63,8 @@ config ACPI_APEI_EINJ config ACPI_APEI_EINJ_CXL bool "CXL Error INJection Support" default ACPI_APEI_EINJ - depends on ACPI_APEI_EINJ && CXL_BUS <= ACPI_APEI_EINJ + depends on ACPI_APEI_EINJ + depends on CXL_BUS && CXL_BUS <= ACPI_APEI_EINJ help Support for CXL protocol Error INJection through debugfs/cxl. Availability and which errors are supported is dependent on
Quoted 2 lines
I could send out yet another version, but since this is a one line change I would appreciate it if whoever picks these patches up would just include this fix.
This second version looks better. Will fold.
Re: [PATCH v15 2/4] EINJ: Add CXL error type support
In reply to Ben CheathamQuoted 289 lines · Ben Cheatham
Move CXL protocol error types from
einj.c(noweinj-core.c) toeinj-cxl.c.einj-cxl.cimplements the necessary handling for CXL protocol error injection and exposes an API for the CXL core to use said functionality, while also allowing the EINJ module to be built without CXL support. Because CXL error types targeting CXL 1.0/1.1 ports require special handling, only allow them to be injected through the new cxl debugfs interface (next commit) and return an error when attempting to inject through the legacy interface.Reviewed-by Jonathan Cameron <[email protected]>Signed-off-by Ben Cheatham <[email protected]>--- MAINTAINERS | 1 + drivers/acpi/apei/Kconfig | 12 +++ drivers/acpi/apei/Makefile | 2 + drivers/acpi/apei/apei-internal.h | 18 ++++ drivers/acpi/apei/{einj.c => einj-core.c} | 77 ++++++++++---- drivers/acpi/apei/einj-cxl.c | 116 ++++++++++++++++++++++ include/linux/einj-cxl.h | 44 ++++++++ 7 files changed, 252 insertions(+), 18 deletions(-) rename drivers/acpi/apei/{einj.c => einj-core.c} (93%) create mode 100644 drivers/acpi/apei/einj-cxl.c create mode 100644 include/linux/einj-cxl.hMAINTAINERS +1
-0@@ -5289,6 +5289,7 @@ M: Dan Williams <[email protected]> L: [email protected] S: Maintained F: drivers/cxl/ +F: include/linux/cxl-einj.h F: include/linux/cxl-event.h F: include/uapi/linux/cxl_mem.h F: tools/testing/cxl/drivers/acpi/apei/Kconfig +12
-0@@ -60,6 +60,18 @@ config ACPI_APEI_EINJ mainly used for debugging and testing the other parts of APEI and some other RAS features. +config ACPI_APEI_EINJ_CXL + bool "CXL Error INJection Support" + default ACPI_APEI_EINJ + depends on ACPI_APEI_EINJ && CXL_BUS <= ACPI_APEI_EINJ + help + Support for CXL protocol Error INJection through debugfs/cxl. + Availability and which errors are supported is dependent on + the host platform. Look to ACPI v6.5 section 18.6.4 and kernel + EINJ documentation for more information. + + If unsure say 'n' + config ACPI_APEI_ERST_DEBUG tristate "APEI Error Record Serialization Table (ERST) Debug Support" depends on ACPI_APEIdrivers/acpi/apei/Makefile +2
-0@@ -2,6 +2,8 @@ obj-$(CONFIG_ACPI_APEI) += apei.o obj-$(CONFIG_ACPI_APEI_GHES) += ghes.o obj-$(CONFIG_ACPI_APEI_EINJ) += einj.o +einj-y := einj-core.o +einj-$(CONFIG_ACPI_APEI_EINJ_CXL) += einj-cxl.o obj-$(CONFIG_ACPI_APEI_ERST_DEBUG) += erst-dbg.o apei-y := apei-base.o hest.o erst.o bert.odrivers/acpi/apei/apei-internal.h +18
-0@@ -130,4 +130,22 @@ static inline u32 cper_estatus_len(struct acpi_hest_generic_status *estatus) }int apei_osc_setup (void ); + +int einj_get_available_error_type (u32 *type); +int einj_error_inject (u32 type,u32 flags,u64 param1,u64 param2,u64 param3, +u64 param4); +int einj_cxl_rch_error_inject (u32 type,u32 flags,u64 param1,u64 param2, +u64 param3,u64 param4); +bool einj_is_cxl_error_type (u64 type); +int einj_validate_error_type (u64 type); + +#ifndef ACPI_EINJ_CXL_CACHE_CORRECTABLE +#define ACPI_EINJ_CXL_CACHE_CORRECTABLE BIT(12) +#define ACPI_EINJ_CXL_CACHE_UNCORRECTABLE BIT(13) +#define ACPI_EINJ_CXL_CACHE_FATAL BIT(14) +#define ACPI_EINJ_CXL_MEM_CORRECTABLE BIT(15) +#define ACPI_EINJ_CXL_MEM_UNCORRECTABLE BIT(16) +#define ACPI_EINJ_CXL_MEM_FATAL BIT(17) +#endif +#endif drivers/acpi/apei/einj-core.c renamed from drivers/acpi/apei/einj.c +59
-18@@ -37,6 +37,12 @@#define MEM_ERROR_MASK (ACPI_EINJ_MEMORY_CORRECTABLE | \ ACPI_EINJ_MEMORY_UNCORRECTABLE | \ ACPI_EINJ_MEMORY_FATAL) +#define CXL_ERROR_MASK (ACPI_EINJ_CXL_CACHE_CORRECTABLE | \ + ACPI_EINJ_CXL_CACHE_UNCORRECTABLE | \ + ACPI_EINJ_CXL_CACHE_FATAL | \ + ACPI_EINJ_CXL_MEM_CORRECTABLE | \ + ACPI_EINJ_CXL_MEM_UNCORRECTABLE | \ + ACPI_EINJ_CXL_MEM_FATAL)/* * ACPI version 5 provides a SET_ERROR_TYPE_WITH_ADDRESS action. @@ -141,7 +147,7 @@ static DEFINE_MUTEX(einj_mutex);/* * Exported APIs use this flag to exit early if einj_probe() failed. */ -static bool einj_initialized__ro_after_init ; +bool einj_initialized__ro_after_init ;static void *einj_param;@@ -166,7 +172,7 @@ static int __einj_get_available_error_type(u32 *type) }/* Get error injection capabilities of the platform */ -static int einj_get_available_error_type (u32 *type) +int einj_get_available_error_type (u32 *type) {int rc;@@ -536,8 +542,8 @@ static int __einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2, }/* Inject the specified hardware error */ -static int einj_error_inject (u32 type,u32 flags,u64 param1,u64 param2, -u64 param3,u64 param4) +int einj_error_inject (u32 type,u32 flags,u64 param1,u64 param2,u64 param3, +u64 param4) {int rc;u64 base_addr, size;@@ -560,8 +566,18 @@ static int einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2,if (type &ACPI5_VENDOR_BIT ) {if (vendor_flags !=SETWA_FLAGS_MEM ) goto inject; - }else if (!(type &MEM_ERROR_MASK ) && !(flags &SETWA_FLAGS_MEM )) + }else if (!(type &MEM_ERROR_MASK ) && !(flags &SETWA_FLAGS_MEM )) { goto inject; + } + +/* +* Injections targeting a CXL 1.0/1.1 port have to be injected +* via the einj_cxl_rch_error_inject() path as that does the proper +* validation of the given RCRB base (MMIO) address. +*/ +if (einj_is_cxl_error_type (type) && (flags &SETWA_FLAGS_MEM )) { +return -EINVAL ; + }/* * Disallow crazy address masks that give BIOS leeway to pick @@ -593,6 +609,21 @@ static int einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2,return rc; } +int einj_cxl_rch_error_inject (u32 type,u32 flags,u64 param1,u64 param2, +u64 param3,u64 param4) +{ +int rc; + +if (!(einj_is_cxl_error_type (type) && (flags &SETWA_FLAGS_MEM ))) +return -EINVAL ; + +mutex_lock (&einj_mutex); + rc =__einj_error_inject (type, flags, param1, param2, param3, param4); +mutex_unlock (&einj_mutex); + +return rc; +} +static u32 error_type;static u32 error_flags;static u64 error_param1;@@ -613,12 +644,6 @@ static struct { u32 mask; const char *str; } const einj_error_type_string[] = { { BIT(9), "Platform Correctable" }, { BIT(10), "Platform Uncorrectable non-fatal" }, { BIT(11), "Platform Uncorrectable fatal"}, - { BIT(12), "CXL.cache Protocol Correctable" }, - { BIT(13), "CXL.cache Protocol Uncorrectable non-fatal" }, - { BIT(14), "CXL.cache Protocol Uncorrectable fatal" }, - { BIT(15), "CXL.mem Protocol Correctable" }, - { BIT(16), "CXL.mem Protocol Uncorrectable non-fatal" }, - { BIT(17), "CXL.mem Protocol Uncorrectable fatal" }, { BIT(31), "Vendor Defined Error Types" }, };@@ -647,22 +672,26 @@ static int error_type_get(void *data, u64 *val)return 0 ; } -static int error_type_set (void *data,u64 val) +bool einj_is_cxl_error_type (u64 type) +{ +return (type &CXL_ERROR_MASK ) && (!(type &ACPI5_VENDOR_BIT )); +} + +int einj_validate_error_type (u64 type) { +u32 tval, vendor, available_error_type =0 ;int rc; -u32 available_error_type =0 ; -u32 tval, vendor;/* Only low 32 bits for error type are valid */ -if (val &GENMASK_ULL (63 ,32 )) +if (type &GENMASK_ULL (63 ,32 ))return -EINVAL ;/* * Vendor defined types have 0x80000000 bit set, and * are not enumerated by ACPI_EINJ_GET_ERROR_TYPE */ - vendor = val &ACPI5_VENDOR_BIT ; - tval = val &0x7fffffff ; + vendor = type &ACPI5_VENDOR_BIT ; + tval = type &GENMASK (30 ,0 );/* Only one error type can be specified */ if (tval & (tval -1 ))@@ -671,9 +700,21 @@ static int error_type_set(void *data, u64 val) rc =einj_get_available_error_type (&available_error_type);if (rc)return rc; -if (!(val & available_error_type)) +if (!(type & available_error_type))return -EINVAL ; } + +return 0 ; +} + +static int error_type_set (void *data,u64 val) +{ +int rc; + + rc =einj_validate_error_type (val); +if (rc) +return rc; + error_type = val;return 0 ;drivers/acpi/apei/einj-cxl.c new file +24
-0@@ -0,0 +1,116 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* CXL Error INJection support. Used by CXL core to inject +* protocol errors into CXL ports. +* +* Copyright (C) 2023 Advanced Micro Devices, Inc. +* +* Author: Ben Cheatham <[email protected]> +*/ +#include <linux/einj-cxl.h> +#include <linux/seq_file.h> +#include <linux/pci.h> + +#include "apei-internal.h" + +/* Defined in einj-core.c */ +extern bool einj_initialized; + +static struct {u32 mask;const char *str; }const einj_cxl_error_type_string[] = { + {ACPI_EINJ_CXL_CACHE_CORRECTABLE ,"CXL.cache Protocol Correctable" }, + {ACPI_EINJ_CXL_CACHE_UNCORRECTABLE ,"CXL.cache Protocol Uncorrectable non-fatal" }, + {ACPI_EINJ_CXL_CACHE_FATAL ,"CXL.cache Protocol Uncorrectable fatal" }, + {ACPI_EINJ_CXL_MEM_CORRECTABLE ,"CXL.mem Protocol Correctable" }, + {ACPI_EINJ_CXL_MEM_UNCORRECTABLE ,"CXL.mem Protocol Uncorrectable non-fatal" },
drivers/acpi/apei/einj-cxl.c line 34
Quoted 10 lines
drivers/acpi/apei/einj-cxl.c new file +10
-0+ { ACPI_EINJ_CXL_MEM_FATAL, "CXL.mem Protocol Uncorrectable fatal" }, +}; + +int einj_cxl_available_error_type_show (struct seq_file *m,void *v) +{ +int cxl_err, rc; +u32 available_error_type =0 ; + +if (!einj_initialized) +return -ENXIO ;
One of the unnecessary einj_initialized checks leaked through... removed it on applying.
Re: [PATCH v15 2/4] EINJ: Add CXL error type support
Quoted 295 lines · Dan Williams
Quoted 294 lines · Ben Cheatham
Move CXL protocol error types from
einj.c(noweinj-core.c) toeinj-cxl.c.einj-cxl.cimplements the necessary handling for CXL protocol error injection and exposes an API for the CXL core to use said functionality, while also allowing the EINJ module to be built without CXL support. Because CXL error types targeting CXL 1.0/1.1 ports require special handling, only allow them to be injected through the new cxl debugfs interface (next commit) and return an error when attempting to inject through the legacy interface.Reviewed-by Jonathan Cameron <[email protected]>Signed-off-by Ben Cheatham <[email protected]>--- MAINTAINERS | 1 + drivers/acpi/apei/Kconfig | 12 +++ drivers/acpi/apei/Makefile | 2 + drivers/acpi/apei/apei-internal.h | 18 ++++ drivers/acpi/apei/{einj.c => einj-core.c} | 77 ++++++++++---- drivers/acpi/apei/einj-cxl.c | 116 ++++++++++++++++++++++ include/linux/einj-cxl.h | 44 ++++++++ 7 files changed, 252 insertions(+), 18 deletions(-) rename drivers/acpi/apei/{einj.c => einj-core.c} (93%) create mode 100644 drivers/acpi/apei/einj-cxl.c create mode 100644 include/linux/einj-cxl.hMAINTAINERS +1
-0@@ -5289,6 +5289,7 @@ M: Dan Williams <[email protected]> L: [email protected] S: Maintained F: drivers/cxl/ +F: include/linux/cxl-einj.h F: include/linux/cxl-event.h F: include/uapi/linux/cxl_mem.h F: tools/testing/cxl/drivers/acpi/apei/Kconfig +12
-0@@ -60,6 +60,18 @@ config ACPI_APEI_EINJ mainly used for debugging and testing the other parts of APEI and some other RAS features. +config ACPI_APEI_EINJ_CXL + bool "CXL Error INJection Support" + default ACPI_APEI_EINJ + depends on ACPI_APEI_EINJ && CXL_BUS <= ACPI_APEI_EINJ + help + Support for CXL protocol Error INJection through debugfs/cxl. + Availability and which errors are supported is dependent on + the host platform. Look to ACPI v6.5 section 18.6.4 and kernel + EINJ documentation for more information. + + If unsure say 'n' + config ACPI_APEI_ERST_DEBUG tristate "APEI Error Record Serialization Table (ERST) Debug Support" depends on ACPI_APEIdrivers/acpi/apei/Makefile +2
-0@@ -2,6 +2,8 @@ obj-$(CONFIG_ACPI_APEI) += apei.o obj-$(CONFIG_ACPI_APEI_GHES) += ghes.o obj-$(CONFIG_ACPI_APEI_EINJ) += einj.o +einj-y := einj-core.o +einj-$(CONFIG_ACPI_APEI_EINJ_CXL) += einj-cxl.o obj-$(CONFIG_ACPI_APEI_ERST_DEBUG) += erst-dbg.o apei-y := apei-base.o hest.o erst.o bert.odrivers/acpi/apei/apei-internal.h +18
-0@@ -130,4 +130,22 @@ static inline u32 cper_estatus_len(struct acpi_hest_generic_status *estatus) }int apei_osc_setup (void ); + +int einj_get_available_error_type (u32 *type); +int einj_error_inject (u32 type,u32 flags,u64 param1,u64 param2,u64 param3, +u64 param4); +int einj_cxl_rch_error_inject (u32 type,u32 flags,u64 param1,u64 param2, +u64 param3,u64 param4); +bool einj_is_cxl_error_type (u64 type); +int einj_validate_error_type (u64 type); + +#ifndef ACPI_EINJ_CXL_CACHE_CORRECTABLE +#define ACPI_EINJ_CXL_CACHE_CORRECTABLE BIT(12) +#define ACPI_EINJ_CXL_CACHE_UNCORRECTABLE BIT(13) +#define ACPI_EINJ_CXL_CACHE_FATAL BIT(14) +#define ACPI_EINJ_CXL_MEM_CORRECTABLE BIT(15) +#define ACPI_EINJ_CXL_MEM_UNCORRECTABLE BIT(16) +#define ACPI_EINJ_CXL_MEM_FATAL BIT(17) +#endif +#endif drivers/acpi/apei/einj-core.c renamed from drivers/acpi/apei/einj.c +59
-18@@ -37,6 +37,12 @@#define MEM_ERROR_MASK (ACPI_EINJ_MEMORY_CORRECTABLE | \ ACPI_EINJ_MEMORY_UNCORRECTABLE | \ ACPI_EINJ_MEMORY_FATAL) +#define CXL_ERROR_MASK (ACPI_EINJ_CXL_CACHE_CORRECTABLE | \ + ACPI_EINJ_CXL_CACHE_UNCORRECTABLE | \ + ACPI_EINJ_CXL_CACHE_FATAL | \ + ACPI_EINJ_CXL_MEM_CORRECTABLE | \ + ACPI_EINJ_CXL_MEM_UNCORRECTABLE | \ + ACPI_EINJ_CXL_MEM_FATAL)/* * ACPI version 5 provides a SET_ERROR_TYPE_WITH_ADDRESS action. @@ -141,7 +147,7 @@ static DEFINE_MUTEX(einj_mutex);/* * Exported APIs use this flag to exit early if einj_probe() failed. */ -static bool einj_initialized__ro_after_init ; +bool einj_initialized__ro_after_init ;static void *einj_param;@@ -166,7 +172,7 @@ static int __einj_get_available_error_type(u32 *type) }/* Get error injection capabilities of the platform */ -static int einj_get_available_error_type (u32 *type) +int einj_get_available_error_type (u32 *type) {int rc;@@ -536,8 +542,8 @@ static int __einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2, }/* Inject the specified hardware error */ -static int einj_error_inject (u32 type,u32 flags,u64 param1,u64 param2, -u64 param3,u64 param4) +int einj_error_inject (u32 type,u32 flags,u64 param1,u64 param2,u64 param3, +u64 param4) {int rc;u64 base_addr, size;@@ -560,8 +566,18 @@ static int einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2,if (type &ACPI5_VENDOR_BIT ) {if (vendor_flags !=SETWA_FLAGS_MEM ) goto inject; - }else if (!(type &MEM_ERROR_MASK ) && !(flags &SETWA_FLAGS_MEM )) + }else if (!(type &MEM_ERROR_MASK ) && !(flags &SETWA_FLAGS_MEM )) { goto inject; + } + +/* +* Injections targeting a CXL 1.0/1.1 port have to be injected +* via the einj_cxl_rch_error_inject() path as that does the proper +* validation of the given RCRB base (MMIO) address. +*/ +if (einj_is_cxl_error_type (type) && (flags &SETWA_FLAGS_MEM )) { +return -EINVAL ; + }/* * Disallow crazy address masks that give BIOS leeway to pick @@ -593,6 +609,21 @@ static int einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2,return rc; } +int einj_cxl_rch_error_inject (u32 type,u32 flags,u64 param1,u64 param2, +u64 param3,u64 param4) +{ +int rc; + +if (!(einj_is_cxl_error_type (type) && (flags &SETWA_FLAGS_MEM ))) +return -EINVAL ; + +mutex_lock (&einj_mutex); + rc =__einj_error_inject (type, flags, param1, param2, param3, param4); +mutex_unlock (&einj_mutex); + +return rc; +} +static u32 error_type;static u32 error_flags;static u64 error_param1;@@ -613,12 +644,6 @@ static struct { u32 mask; const char *str; } const einj_error_type_string[] = { { BIT(9), "Platform Correctable" }, { BIT(10), "Platform Uncorrectable non-fatal" }, { BIT(11), "Platform Uncorrectable fatal"}, - { BIT(12), "CXL.cache Protocol Correctable" }, - { BIT(13), "CXL.cache Protocol Uncorrectable non-fatal" }, - { BIT(14), "CXL.cache Protocol Uncorrectable fatal" }, - { BIT(15), "CXL.mem Protocol Correctable" }, - { BIT(16), "CXL.mem Protocol Uncorrectable non-fatal" }, - { BIT(17), "CXL.mem Protocol Uncorrectable fatal" }, { BIT(31), "Vendor Defined Error Types" }, };@@ -647,22 +672,26 @@ static int error_type_get(void *data, u64 *val)return 0 ; } -static int error_type_set (void *data,u64 val) +bool einj_is_cxl_error_type (u64 type) +{ +return (type &CXL_ERROR_MASK ) && (!(type &ACPI5_VENDOR_BIT )); +} + +int einj_validate_error_type (u64 type) { +u32 tval, vendor, available_error_type =0 ;int rc; -u32 available_error_type =0 ; -u32 tval, vendor;/* Only low 32 bits for error type are valid */ -if (val &GENMASK_ULL (63 ,32 )) +if (type &GENMASK_ULL (63 ,32 ))return -EINVAL ;/* * Vendor defined types have 0x80000000 bit set, and * are not enumerated by ACPI_EINJ_GET_ERROR_TYPE */ - vendor = val &ACPI5_VENDOR_BIT ; - tval = val &0x7fffffff ; + vendor = type &ACPI5_VENDOR_BIT ; + tval = type &GENMASK (30 ,0 );/* Only one error type can be specified */ if (tval & (tval -1 ))@@ -671,9 +700,21 @@ static int error_type_set(void *data, u64 val) rc =einj_get_available_error_type (&available_error_type);if (rc)return rc; -if (!(val & available_error_type)) +if (!(type & available_error_type))return -EINVAL ; } + +return 0 ; +} + +static int error_type_set (void *data,u64 val) +{ +int rc; + + rc =einj_validate_error_type (val); +if (rc) +return rc; + error_type = val;return 0 ;drivers/acpi/apei/einj-cxl.c new file +29
-0@@ -0,0 +1,116 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* CXL Error INJection support. Used by CXL core to inject +* protocol errors into CXL ports. +* +* Copyright (C) 2023 Advanced Micro Devices, Inc. +* +* Author: Ben Cheatham <[email protected]> +*/ +#include <linux/einj-cxl.h> +#include <linux/seq_file.h> +#include <linux/pci.h> + +#include "apei-internal.h" + +/* Defined in einj-core.c */ +extern bool einj_initialized; + +static struct {u32 mask;const char *str; }const einj_cxl_error_type_string[] = { + {ACPI_EINJ_CXL_CACHE_CORRECTABLE ,"CXL.cache Protocol Correctable" }, + {ACPI_EINJ_CXL_CACHE_UNCORRECTABLE ,"CXL.cache Protocol Uncorrectable non-fatal" }, + {ACPI_EINJ_CXL_CACHE_FATAL ,"CXL.cache Protocol Uncorrectable fatal" }, + {ACPI_EINJ_CXL_MEM_CORRECTABLE ,"CXL.mem Protocol Correctable" }, + {ACPI_EINJ_CXL_MEM_UNCORRECTABLE ,"CXL.mem Protocol Uncorrectable non-fatal" }, + {ACPI_EINJ_CXL_MEM_FATAL ,"CXL.mem Protocol Uncorrectable fatal" }, +}; + +int einj_cxl_available_error_type_show (struct seq_file *m,void *v) +{
Quoted 8 lines
drivers/acpi/apei/einj-cxl.c line 34
Quoted 5 lines
drivers/acpi/apei/einj-cxl.c new file +5
-0+int cxl_err, rc; +u32 available_error_type =0 ; + +if (!einj_initialized) +return -ENXIO ;One of the unnecessary
einj_initializedchecks leaked through... removed it on applying.
Sorry about that, no clue how I didn't see that one.
Re: [PATCH v15 2/4] EINJ: Add CXL error type support
In reply to Ben CheathamQuoted 106 lines · Ben Cheatham
Move CXL protocol error types from
einj.c(noweinj-core.c) toeinj-cxl.c.einj-cxl.cimplements the necessary handling for CXL protocol error injection and exposes an API for the CXL core to use said functionality, while also allowing the EINJ module to be built without CXL support. Because CXL error types targeting CXL 1.0/1.1 ports require special handling, only allow them to be injected through the new cxl debugfs interface (next commit) and return an error when attempting to inject through the legacy interface.Reviewed-by Jonathan Cameron <[email protected]>Signed-off-by Ben Cheatham <[email protected]>--- MAINTAINERS | 1 + drivers/acpi/apei/Kconfig | 12 +++ drivers/acpi/apei/Makefile | 2 + drivers/acpi/apei/apei-internal.h | 18 ++++ drivers/acpi/apei/{einj.c => einj-core.c} | 77 ++++++++++---- drivers/acpi/apei/einj-cxl.c | 116 ++++++++++++++++++++++ include/linux/einj-cxl.h | 44 ++++++++ 7 files changed, 252 insertions(+), 18 deletions(-) rename drivers/acpi/apei/{einj.c => einj-core.c} (93%) create mode 100644 drivers/acpi/apei/einj-cxl.c create mode 100644 include/linux/einj-cxl.hMAINTAINERS +1
-0@@ -5289,6 +5289,7 @@ M: Dan Williams <[email protected]> L: [email protected] S: Maintained F: drivers/cxl/ +F: include/linux/cxl-einj.h F: include/linux/cxl-event.h F: include/uapi/linux/cxl_mem.h F: tools/testing/cxl/drivers/acpi/apei/Kconfig +12
-0@@ -60,6 +60,18 @@ config ACPI_APEI_EINJ mainly used for debugging and testing the other parts of APEI and some other RAS features. +config ACPI_APEI_EINJ_CXL + bool "CXL Error INJection Support" + default ACPI_APEI_EINJ + depends on ACPI_APEI_EINJ && CXL_BUS <= ACPI_APEI_EINJ + help + Support for CXL protocol Error INJection through debugfs/cxl. + Availability and which errors are supported is dependent on + the host platform. Look to ACPI v6.5 section 18.6.4 and kernel + EINJ documentation for more information. + + If unsure say 'n' + config ACPI_APEI_ERST_DEBUG tristate "APEI Error Record Serialization Table (ERST) Debug Support" depends on ACPI_APEIdrivers/acpi/apei/Makefile +2
-0@@ -2,6 +2,8 @@ obj-$(CONFIG_ACPI_APEI) += apei.o obj-$(CONFIG_ACPI_APEI_GHES) += ghes.o obj-$(CONFIG_ACPI_APEI_EINJ) += einj.o +einj-y := einj-core.o +einj-$(CONFIG_ACPI_APEI_EINJ_CXL) += einj-cxl.o obj-$(CONFIG_ACPI_APEI_ERST_DEBUG) += erst-dbg.o apei-y := apei-base.o hest.o erst.o bert.odrivers/acpi/apei/apei-internal.h +18
-0@@ -130,4 +130,22 @@ static inline u32 cper_estatus_len(struct acpi_hest_generic_status *estatus) }int apei_osc_setup (void ); + +int einj_get_available_error_type (u32 *type); +int einj_error_inject (u32 type,u32 flags,u64 param1,u64 param2,u64 param3, +u64 param4); +int einj_cxl_rch_error_inject (u32 type,u32 flags,u64 param1,u64 param2, +u64 param3,u64 param4); +bool einj_is_cxl_error_type (u64 type); +int einj_validate_error_type (u64 type); + +#ifndef ACPI_EINJ_CXL_CACHE_CORRECTABLE +#define ACPI_EINJ_CXL_CACHE_CORRECTABLE BIT(12) +#define ACPI_EINJ_CXL_CACHE_UNCORRECTABLE BIT(13) +#define ACPI_EINJ_CXL_CACHE_FATAL BIT(14) +#define ACPI_EINJ_CXL_MEM_CORRECTABLE BIT(15) +#define ACPI_EINJ_CXL_MEM_UNCORRECTABLE BIT(16) +#define ACPI_EINJ_CXL_MEM_FATAL BIT(17) +#endif +#endif drivers/acpi/apei/einj-core.c renamed from drivers/acpi/apei/einj.c +0
-0
[..]
drivers/acpi/apei/einj-core.c static int einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2, · line 580
Quoted 8 lines
drivers/acpi/apei/einj-core.c renamed from drivers/acpi/apei/einj.c +8
-0+/* +* Injections targeting a CXL 1.0/1.1 port have to be injected +* via the einj_cxl_rch_error_inject() path as that does the proper +* validation of the given RCRB base (MMIO) address. +*/ +if (einj_is_cxl_error_type (type) && (flags &SETWA_FLAGS_MEM )) { +return -EINVAL ; + }
Checkpatch says:
WARNING: braces {} are not necessary for single statement blocks #170: FILE: drivers/acpi/apei/einj-core.c:578:
+ if (einj_is_cxl_error_type(type) && (flags & SETWA_FLAGS_MEM)) {
+ return -EINVAL;
+ }
Fixed.
Re: [PATCH v15 2/4] EINJ: Add CXL error type support
Quoted 126 lines · Dan Williams
Quoted 106 lines · Ben Cheatham
Move CXL protocol error types from
einj.c(noweinj-core.c) toeinj-cxl.c.einj-cxl.cimplements the necessary handling for CXL protocol error injection and exposes an API for the CXL core to use said functionality, while also allowing the EINJ module to be built without CXL support. Because CXL error types targeting CXL 1.0/1.1 ports require special handling, only allow them to be injected through the new cxl debugfs interface (next commit) and return an error when attempting to inject through the legacy interface.Reviewed-by Jonathan Cameron <[email protected]>Signed-off-by Ben Cheatham <[email protected]>--- MAINTAINERS | 1 + drivers/acpi/apei/Kconfig | 12 +++ drivers/acpi/apei/Makefile | 2 + drivers/acpi/apei/apei-internal.h | 18 ++++ drivers/acpi/apei/{einj.c => einj-core.c} | 77 ++++++++++---- drivers/acpi/apei/einj-cxl.c | 116 ++++++++++++++++++++++ include/linux/einj-cxl.h | 44 ++++++++ 7 files changed, 252 insertions(+), 18 deletions(-) rename drivers/acpi/apei/{einj.c => einj-core.c} (93%) create mode 100644 drivers/acpi/apei/einj-cxl.c create mode 100644 include/linux/einj-cxl.hMAINTAINERS +1
-0@@ -5289,6 +5289,7 @@ M: Dan Williams <[email protected]> L: [email protected] S: Maintained F: drivers/cxl/ +F: include/linux/cxl-einj.h F: include/linux/cxl-event.h F: include/uapi/linux/cxl_mem.h F: tools/testing/cxl/drivers/acpi/apei/Kconfig +12
-0@@ -60,6 +60,18 @@ config ACPI_APEI_EINJ mainly used for debugging and testing the other parts of APEI and some other RAS features. +config ACPI_APEI_EINJ_CXL + bool "CXL Error INJection Support" + default ACPI_APEI_EINJ + depends on ACPI_APEI_EINJ && CXL_BUS <= ACPI_APEI_EINJ + help + Support for CXL protocol Error INJection through debugfs/cxl. + Availability and which errors are supported is dependent on + the host platform. Look to ACPI v6.5 section 18.6.4 and kernel + EINJ documentation for more information. + + If unsure say 'n' + config ACPI_APEI_ERST_DEBUG tristate "APEI Error Record Serialization Table (ERST) Debug Support" depends on ACPI_APEIdrivers/acpi/apei/Makefile +2
-0@@ -2,6 +2,8 @@ obj-$(CONFIG_ACPI_APEI) += apei.o obj-$(CONFIG_ACPI_APEI_GHES) += ghes.o obj-$(CONFIG_ACPI_APEI_EINJ) += einj.o +einj-y := einj-core.o +einj-$(CONFIG_ACPI_APEI_EINJ_CXL) += einj-cxl.o obj-$(CONFIG_ACPI_APEI_ERST_DEBUG) += erst-dbg.o apei-y := apei-base.o hest.o erst.o bert.odrivers/acpi/apei/apei-internal.h +18
-0@@ -130,4 +130,22 @@ static inline u32 cper_estatus_len(struct acpi_hest_generic_status *estatus) }int apei_osc_setup (void ); + +int einj_get_available_error_type (u32 *type); +int einj_error_inject (u32 type,u32 flags,u64 param1,u64 param2,u64 param3, +u64 param4); +int einj_cxl_rch_error_inject (u32 type,u32 flags,u64 param1,u64 param2, +u64 param3,u64 param4); +bool einj_is_cxl_error_type (u64 type); +int einj_validate_error_type (u64 type); + +#ifndef ACPI_EINJ_CXL_CACHE_CORRECTABLE +#define ACPI_EINJ_CXL_CACHE_CORRECTABLE BIT(12) +#define ACPI_EINJ_CXL_CACHE_UNCORRECTABLE BIT(13) +#define ACPI_EINJ_CXL_CACHE_FATAL BIT(14) +#define ACPI_EINJ_CXL_MEM_CORRECTABLE BIT(15) +#define ACPI_EINJ_CXL_MEM_UNCORRECTABLE BIT(16) +#define ACPI_EINJ_CXL_MEM_FATAL BIT(17) +#endif +#endif drivers/acpi/apei/einj-core.c renamed from drivers/acpi/apei/einj.c +0
-0[..]
drivers/acpi/apei/einj-core.c static int einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2, · line 580
Quoted 8 lines
drivers/acpi/apei/einj-core.c renamed from drivers/acpi/apei/einj.c +8
-0+/* +* Injections targeting a CXL 1.0/1.1 port have to be injected +* via the einj_cxl_rch_error_inject() path as that does the proper +* validation of the given RCRB base (MMIO) address. +*/ +if (einj_is_cxl_error_type (type) && (flags &SETWA_FLAGS_MEM )) { +return -EINVAL ; + }Checkpatch says:
WARNING: braces {} are not necessary for single statement blocks #170: FILE:
drivers/acpi/apei/einj-core.c:578:drivers/acpi/apei/einj-core.c renamed from drivers/acpi/apei/einj.c +3
-0+if (einj_is_cxl_error_type (type) && (flags &SETWA_FLAGS_MEM )) { +return -EINVAL ; + }
Quoted 1 line
Fixed.
That's interesting, I have checkpatch set to run on git commit so I should've seen that. I'll need to take another look at my setup.
PATCH v15 3/4 cxl/core: Add CXL EINJ debugfs files
In reply to Ben CheathamExport CXL helper functions in einj-cxl.c for getting/injecting available CXL protocol error types to sysfs under kernel/debug/cxl.
The kernel/debug/cxl/einj_types file will print the available CXL protocol errors in the same format as the available_error_types file provided by the einj module. The kernel/debug/cxl/$dport_dev/einj_inject file is functionally the same as the error_type and error_inject files provided by the EINJ module, i.e.: writing an error type into $dport_dev/einj_inject will inject said error type into the CXL dport represented by $dport_dev.
--- Documentation/ABI/testing/debugfs-cxl | 30 +++++++++++++++++++ drivers/cxl/core/port.c | 42 +++++++++++++++++++++++++++ 2 files changed, 72 insertions(+)
Documentation/ABI/testing/debugfs-cxl +30 -0
@@ -33,3 +33,33 @@ Description: device cannot clear poison from the address, -ENXIO is returned. The clear_poison attribute is only visible for devices supporting the capability. + +What: /sys/kernel/debug/cxl/einj_types +Date: January, 2024 +KernelVersion: v6.9 +Contact: [email protected] +Description: + (RO) Prints the CXL protocol error types made available by + the platform in the format "0x<error number> <error type>". + The possible error types are (as of ACPI v6.5): + 0x1000 CXL.cache Protocol Correctable + 0x2000 CXL.cache Protocol Uncorrectable non-fatal + 0x4000 CXL.cache Protocol Uncorrectable fatal + 0x8000 CXL.mem Protocol Correctable + 0x10000 CXL.mem Protocol Uncorrectable non-fatal + 0x20000 CXL.mem Protocol Uncorrectable fatal + + The <error number> can be written to einj_inject to inject + <error type> into a chosen dport. + +What: /sys/kernel/debug/cxl/$dport_dev/einj_inject +Date: January, 2024 +KernelVersion: v6.9 +Contact: [email protected] +Description: + (WO) Writing an integer to this file injects the corresponding + CXL protocol error into $dport_dev ($dport_dev will be a device + name from /sys/bus/pci/devices). The integer to type mapping for + injection can be found by reading from einj_types. If the dport + was enumerated in RCH mode, a CXL 1.1 error is injected, otherwise + a CXL 2.0 error is injected.
drivers/cxl/core/port.c +42 -0
66 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH v15 3/4] cxl/core: Add CXL EINJ debugfs files
Quoted 13 lines · Ben Cheatham
Export CXL helper functions in
einj-cxl.cfor getting/injecting available CXL protocol error types to sysfs underkernel/debug/cxl.The
kernel/debug/cxl/einj_typesfile will print the available CXL protocol errors in the same format as theavailable_error_typesfile provided by the einj module. Thekernel/debug/cxl/$dport_dev/einj_injectfile is functionally the same as theerror_typeanderror_injectfiles provided by the EINJ module, i.e.: writing an error type into $dport_dev/einj_inject will inject said error type into the CXL dport represented by $dport_dev.Reviewed-by Jonathan Cameron <[email protected]>Signed-off-by Ben Cheatham <[email protected]>
[..]
Quoted 4 lines
drivers/cxl/core/port.c +0
-0
[..]
drivers/cxl/core/port.c static __init int cxl_core_init(void) · line 2264
Quoted 8 lines
drivers/cxl/core/port.c +4
-0@@ -2221,6 +2258,11 @@ static __init int cxl_core_init(void) cxl_debugfs =debugfs_create_dir ("cxl" ,NULL ); +if (einj_cxl_is_initialized ()) { +debugfs_create_file ("einj_types" ,0400 , cxl_debugfs,NULL , + &einj_cxl_available_error_type_fops); + }
Checkpatch was ok with this, but went ahead and cleaned up these unnecessary braces as well.
Re: [PATCH v15 3/4] cxl/core: Add CXL EINJ debugfs files
Quoted 24 lines · Dan Williams
Quoted 13 lines · Ben Cheatham
Export CXL helper functions in
einj-cxl.cfor getting/injecting available CXL protocol error types to sysfs underkernel/debug/cxl.The
kernel/debug/cxl/einj_typesfile will print the available CXL protocol errors in the same format as theavailable_error_typesfile provided by the einj module. Thekernel/debug/cxl/$dport_dev/einj_injectfile is functionally the same as theerror_typeanderror_injectfiles provided by the EINJ module, i.e.: writing an error type into $dport_dev/einj_inject will inject said error type into the CXL dport represented by $dport_dev.Reviewed-by Jonathan Cameron <[email protected]>Signed-off-by Ben Cheatham <[email protected]>[..]
Quoted 4 lines
drivers/cxl/core/port.c +0
-0[..]
Quoted 4 lines
drivers/cxl/core/port.c +0
-0@@ -2221,6 +2258,11 @@ static __init int cxl_core_init(void) cxl_debugfs =debugfs_create_dir ("cxl" ,NULL );
Quoted 7 lines
drivers/cxl/core/port.c static __init int cxl_core_init(void) · line 2264
Quoted 4 lines
drivers/cxl/core/port.c +4
-0+if (einj_cxl_is_initialized ()) { +debugfs_create_file ("einj_types" ,0400 , cxl_debugfs,NULL , + &einj_cxl_available_error_type_fops); + }Checkpatch was ok with this, but went ahead and cleaned up these unnecessary braces as well.
Probably a remnant of debugging, sounds good to me.
Thanks,
Ben
PATCH v15 4/4 EINJ, Documentation: Update EINJ kernel doc
In reply to Ben CheathamUpdate EINJ kernel document to include how to inject CXL protocol error types, build the kernel to include CXL error types, and give an example injection.
--- .../firmware-guide/acpi/apei/einj.rst | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+)
Documentation/firmware-guide/acpi/apei/einj.rst +34 -0
@@ -32,6 +32,10 @@ configuration:: CONFIG_ACPI_APEI CONFIG_ACPI_APEI_EINJ +...and to (optionally) enable CXL protocol error injection set:: + + CONFIG_ACPI_APEI_EINJ_CXL + The EINJ user interface is in <debugfs mount point>/apei/einj. The following files belong to it:
@@ -118,6 +122,24 @@ The following files belong to it: this actually works depends on what operations the BIOS actually includes in the trigger phase. +CXL error types are supported from ACPI 6.5 onwards (given a CXL port +is present). The EINJ user interface for CXL error types is at +<debugfs mount point>/cxl. The following files belong to it: + +- einj_types: + + Provides the same functionality as available_error_types above, but + for CXL error types + +- $dport_dev/einj_inject: + + Injects a CXL error type into the CXL port represented by $dport_dev, + where $dport_dev is the name of the CXL port (usually a PCIe device name). + Error injections targeting a CXL 2.0+ port can use the legacy interface + under <debugfs mount point>/apei/einj, while CXL 1.1/1.0 port injections + must use this file. + + BIOS versions based on the ACPI 4.0 specification have limited options in controlling where the errors are injected. Your BIOS may support an extension (enabled with the param_extension=1 module parameter, or boot
@@ -181,6 +203,18 @@ You should see something like this in dmesg:: [22715.834759] EDAC sbridge MC3: PROCESSOR 0:306e7 TIME 1422553404 SOCKET 0 APIC 0 [22716.616173] EDAC MC3: 1 CE memory read error on CPU_SrcID#0_Channel#0_DIMM#0 (channel:0 slot:0 page:0x12345 offset:0x0 grain:32 syndrome:0x0 - area:DRAM err_code:0001:0090 socket:0 channel_mask:1 rank:0) +A CXL error injection example with $dport_dev=0000:e0:01.1:: + + # cd /sys/kernel/debug/cxl/ + # ls + 0000:e0:01.1 0000:0c:00.0 + # cat einj_types # See which errors can be injected + 0x00008000 CXL.mem Protocol Correctable + 0x00010000 CXL.mem Protocol Uncorrectable non-fatal + 0x00020000 CXL.mem Protocol Uncorrectable fatal + # cd 0000:e0:01.1 # Navigate to dport to inject into + # echo 0x8000 > einj_inject # Inject error + Special notes for injection into SGX enclaves: There may be a separate BIOS setup option to enable SGX injection.
Signature · 1 line
2.34.1