CXL Poison List Retrieval & Tracing
[email protected]
maintainerv11 cover CXL Poison List Retrieval & Tracing
From: Alison Schofield <[email protected]>
Changes in v11:
- Introduce the hpa field in TP_printk in Patch5, not Patch2. (0-day)
- cxl_trigger_poison_list() make rc ssize_t
- trace naming: s/LIST/List, s/type/trace_type
Link to v10:
https://lore.kernel.org/linux-cxl/[email protected]/
Add support for retrieving device poison lists and store the returned error records as kernel trace events.
The handling of the poison list is guided by the CXL 3.0 Specification Section 8.2.9.8.4.1. [1]
Example trigger:
$ echo 1 > /sys/bus/cxl/devices/mem0/trigger_poison_list
Example Trace Events:
Poison found in a PMEM Region:cxl_poison: memdev=mem0 host=cxl_mem.0 serial=0 trace_type=List region=region11 region_uuid=d96e67ec-76b0-406f-8c35-5b52630dcad1 hpa=0xf100000000 dpa=0x70000000 dpa_length=0x40 source=Injected flags= overflow_time=0
Poison found in RAM Region:cxl_poison: memdev=mem0 host=cxl_mem.0 serial=0 trace_type=List region=region2 region_uuid=00000000-0000-0000-0000-000000000000 hpa=0xf010000000 dpa=0x0 dpa_length=0x40 source=Injected flags= overflow_time=0
Poison found in an unmapped DPA resource:cxl_poison: memdev=mem3 host=cxl_mem.3 serial=3 trace_type=List region= region_uuid=00000000-0000-0000-0000-000000000000 hpa=0xffffffffffffffff dpa=0x40000000 dpa_length=0x40 source=Injected flags= overflow_time=0
[1]: https://www.computeexpresslink.org/download-the-specification
Alison Schofield (6):
cxl/mbox: Add GET_POISON_LIST mailbox command cxl/trace: Add TRACE support for CXL media-error records cxl/memdev: Add trigger_poison_list sysfs attribute cxl/region: Provide region info to the cxl_poison trace event cxl/trace: Add an HPA to cxl_poison trace events tools/testing/cxl: Mock support for Get Poison List
Documentation/ABI/testing/sysfs-bus-cxl | 14 +++ drivers/cxl/core/core.h | 15 ++++ drivers/cxl/core/mbox.c | 75 ++++++++++++++++ drivers/cxl/core/memdev.c | 108 ++++++++++++++++++++++++ drivers/cxl/core/region.c | 63 ++++++++++++++ drivers/cxl/core/trace.c | 94 +++++++++++++++++++++ drivers/cxl/core/trace.h | 101 ++++++++++++++++++++++ drivers/cxl/cxlmem.h | 72 +++++++++++++++- drivers/cxl/mem.c | 36 ++++++++ drivers/cxl/pci.c | 4 + tools/testing/cxl/test/mem.c | 42 +++++++++ 11 files changed, 623 insertions(+), 1 deletion(-)
base-commit: e686c32590f40bffc45f105c04c836ffad3e531a
Signature · 1 line
2.37.3
[email protected]
maintainerPATCH v11 1/6 cxl/mbox: Add GET_POISON_LIST mailbox command
From: Alison Schofield <[email protected]>
CXL devices maintain a list of locations that are poisoned or result in poison if the addresses are accessed by the host.
Per the spec (CXL 3.0 8.2.9.8.4.1), the device returns this Poison list as a set of Media Error Records that include the source of the error, the starting device physical address and length. The length is the number of adjacent DPAs in the record and is in units of 64 bytes.
Retrieve the poison list.
--- drivers/cxl/core/mbox.c | 72 +++++++++++++++++++++++++++++++++++++++++ drivers/cxl/cxlmem.h | 67 ++++++++++++++++++++++++++++++++++++++ drivers/cxl/pci.c | 4 +++ 3 files changed, 143 insertions(+)
drivers/cxl/core/mbox.c +72 -0
@@ -5,6 +5,8 @@#include <linux/debugfs.h> #include <linux/ktime.h> #include <linux/mutex.h> +#include <asm/unaligned.h> +#include <cxlpci.h> #include <cxlmem.h> #include <cxl.h>
@@ -994,6 +996,7 @@ int cxl_dev_state_identify(struct cxl_dev_state *cxlds)/* See CXL 2.0 Table 175 Identify Memory Device Output Payload */ struct cxl_mbox_identify id;struct cxl_mbox_cmd mbox_cmd; +u32 val;int rc; mbox_cmd = (struct cxl_mbox_cmd ) {
@@ -1017,6 +1020,11 @@ int cxl_dev_state_identify(struct cxl_dev_state *cxlds) cxlds->lsa_size =le32_to_cpu (id.lsa_size);memcpy (cxlds->firmware_version, id.fw_revision,sizeof (id.fw_revision)); +if (test_bit (CXL_MEM_COMMAND_ID_GET_POISON , cxlds->enabled_cmds)) { + val =get_unaligned_le24 (id.poison_list_max_mer); + cxlds->poison.max_errors =min_t (u32, val,CXL_POISON_LIST_MAX ); + } +return 0 ; }EXPORT_SYMBOL_NS_GPL (cxl_dev_state_identify,CXL );
@@ -1107,6 +1115,70 @@ int cxl_set_timestamp(struct cxl_dev_state *cxlds) }EXPORT_SYMBOL_NS_GPL (cxl_set_timestamp,CXL ); +int cxl_mem_get_poison (struct cxl_memdev *cxlmd,u64 offset,u64 len, +struct cxl_region *cxlr) +{ +struct cxl_dev_state *cxlds = cxlmd->cxlds; +struct cxl_mbox_poison_payload_out *po; +struct cxl_mbox_poison_payload_in pi; +struct cxl_mbox_cmd mbox_cmd; +int nr_records =0 ; +int rc; + + rc =mutex_lock_interruptible (&cxlds->poison.lock); +if (rc) +return rc; + + po = cxlds->poison.payload_out; + pi.offset =cpu_to_le64 (offset); + pi.length =cpu_to_le64 (len /CXL_POISON_LEN_MULT ); + + mbox_cmd = (struct cxl_mbox_cmd ) { + .opcode =CXL_MBOX_OP_GET_POISON , + .size_in =sizeof (pi), + .payload_in = &pi, + .size_out = cxlds->payload_size, + .payload_out = po, + .min_out =struct_size (po, record,0 ), + }; + +do { + rc =cxl_internal_send_cmd (cxlds, &mbox_cmd); +if (rc) +break ; + +/* TODO TRACE the media error records */ + +/* Protect against an uncleared _FLAG_MORE */ + nr_records = nr_records +le16_to_cpu (po->count); +if (nr_records >= cxlds->poison.max_errors) { +dev_dbg (&cxlmd->dev,"Max Error Records reached: %d\n" , + nr_records); +break ; + } + }while (po->flags &CXL_POISON_FLAG_MORE ); + +mutex_unlock (&cxlds->poison.lock); +return rc; +} +EXPORT_SYMBOL_NS_GPL (cxl_mem_get_poison,CXL ); + +int cxl_poison_state_init (struct cxl_dev_state *cxlds) +{ +if (!test_bit (CXL_MEM_COMMAND_ID_GET_POISON , cxlds->enabled_cmds)) +return 0 ; + + cxlds->poison.payload_out =devm_kzalloc (cxlds->dev, + cxlds->payload_size, +GFP_KERNEL ); +if (!cxlds->poison.payload_out) +return -ENOMEM ; + +mutex_init (&cxlds->poison.lock); +return 0 ; +} +EXPORT_SYMBOL_NS_GPL (cxl_poison_state_init,CXL ); +struct cxl_dev_state *cxl_dev_state_create (struct device *dev) {struct cxl_dev_state *cxlds;
drivers/cxl/cxlmem.h +67 -0
97 lines not on this page · raw message
drivers/cxl/pci.c +4 -0
@@ -769,6 +769,10 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)if (rc)return rc; + rc =cxl_poison_state_init (cxlds); +if (rc) +return rc; + rc =cxl_dev_state_identify (cxlds);if (rc)return rc;
Signature · 1 line
2.37.3
[email protected]
maintainerPATCH v11 2/6 cxl/trace: Add TRACE support for CXL media-error records
In reply to [email protected]From: Alison Schofield <[email protected]>
CXL devices may support the retrieval of a device poison list. Add a new trace event that the CXL subsystem may use to log the media-error records returned in the poison list.
Log each media-error record as a cxl_poison trace event of type 'List'.
--- drivers/cxl/core/core.h | 4 ++ drivers/cxl/core/mbox.c | 5 ++- drivers/cxl/core/trace.h | 94 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+), 1 deletion(-)
drivers/cxl/core/core.h +4 -0
@@ -64,4 +64,8 @@ int cxl_memdev_init(void);void cxl_memdev_exit (void );void cxl_mbox_init (void ); +enum cxl_poison_trace_type { +CXL_POISON_TRACE_LIST , +}; +#endif /* __CXL_CORE_H__ */
drivers/cxl/core/mbox.c +4 -1
@@ -1147,7 +1147,10 @@ int cxl_mem_get_poison(struct cxl_memdev *cxlmd, u64 offset, u64 len,if (rc)break ; -/* TODO TRACE the media error records */ +for (int i =0 ; i <le16_to_cpu (po->count); i++) +trace_cxl_poison (cxlmd, cxlr, &po->record[i], + po->flags, po->overflow_t, +CXL_POISON_TRACE_LIST );/* Protect against an uncleared _FLAG_MORE */ nr_records = nr_records +le16_to_cpu (po->count);
drivers/cxl/core/trace.h +94 -0
110 lines not on this page · raw message
Signature · 1 line
2.37.3
Re: [PATCH v11 2/6] cxl/trace: Add TRACE support for CXL media-error records
Quoted 11 lines · alison.schofield@ wrote:
From: Alison Schofield <[email protected]>
CXL devices may support the retrieval of a device poison list. Add a new trace event that the CXL subsystem may use to log the media-error records returned in the poison list.
Log each media-error record as a
cxl_poisontrace event of type 'List'.Signed-off-by Alison Schofield <[email protected]>Reviewed-by Jonathan Cameron <[email protected]>
[email protected]
maintainerPATCH v11 3/6 cxl/memdev: Add trigger_poison_list sysfs attribute
In reply to [email protected]From: Alison Schofield <[email protected]>
When a boolean 'true' is written to this attribute the memdev driver retrieves the poison list from the device. The list consists of addresses that are poisoned, or would result in poison if accessed, and the source of the poison. This attribute is only visible for devices supporting the capability. The retrieved errors are logged as kernel trace events with the label 'cxl_poison'.
--- Documentation/ABI/testing/sysfs-bus-cxl | 14 ++++++++ drivers/cxl/core/memdev.c | 48 +++++++++++++++++++++++++ drivers/cxl/cxlmem.h | 5 ++- drivers/cxl/mem.c | 36 +++++++++++++++++++ 4 files changed, 102 insertions(+), 1 deletion(-)
Documentation/ABI/testing/sysfs-bus-cxl +14 -0
@@ -415,3 +415,17 @@ Description: 1), and checks that the hardware accepts the commit request. Reading this value indicates whether the region is committed or not. + + +What: /sys/bus/cxl/devices/memX/trigger_poison_list +Date: March, 2023 +KernelVersion: v6.4 +Contact: [email protected] +Description: + (WO) When a boolean 'true' is written to this attribute the + memdev driver retrieves the poison list from the device. The + list consists of addresses that are poisoned, or would result + in poison if accessed, and the source of the poison. This + attribute is only visible for devices supporting the + capability. The retrieved errors are logged as kernel + trace events with the label 'cxl_poison'.
drivers/cxl/core/memdev.c +48 -0
60 lines not on this page · raw message
drivers/cxl/cxlmem.h +4 -1
@@ -145,7 +145,7 @@ struct cxl_mbox_cmd {C (FWROLLBACK , -ENXIO ,"rolled back to the previous active FW" ), \C (FWRESET , -ENXIO ,"FW failed to activate, needs cold reset" ), \C (HANDLE , -ENXIO ,"one or more Event Record Handles were invalid" ), \ -C (PADDR , -ENXIO ,"physical address specified is invalid" ), \ +C (PADDR , -EFAULT ,"physical address specified is invalid" ), \C (POISONLMT , -ENXIO ,"poison injection limit has been reached" ), \C (MEDIAFAILURE , -ENXIO ,"permanent issue with the media" ), \ C(ABORT, -ENXIO, "background cmd was aborted by device"), \
@@ -675,6 +675,9 @@ int cxl_set_timestamp(struct cxl_dev_state *cxlds);int cxl_poison_state_init (struct cxl_dev_state *cxlds);int cxl_mem_get_poison (struct cxl_memdev *cxlmd,u64 offset,u64 len,struct cxl_region *cxlr); +ssize_t cxl_trigger_poison_list (struct device *dev, +struct device_attribute *attr,const char *buf, +size_t len);#ifdef CONFIG_CXL_SUSPEND void cxl_mem_active_inc (void );
drivers/cxl/mem.c +36 -0
@@ -176,10 +176,46 @@ static int cxl_mem_probe(struct device *dev)return devm_add_action_or_reset (dev, enable_suspend,NULL ); } +static ssize_t trigger_poison_list_store (struct device *dev, +struct device_attribute *attr, +const char *buf,size_t len) +{ +return cxl_trigger_poison_list (dev, attr, buf, len); +} + +static DEVICE_ATTR_WO (trigger_poison_list); + +static umode_t cxl_mem_visible (struct kobject *kobj,struct attribute *a,int n) +{ +if (a == &dev_attr_trigger_poison_list.attr) { +struct device *dev =kobj_to_dev (kobj); + +if (!test_bit (CXL_MEM_COMMAND_ID_GET_POISON , +to_cxl_memdev (dev)->cxlds->enabled_cmds)) +return 0 ; + } +return a->mode; +} + +static struct attribute *cxl_mem_attrs[] = { + &dev_attr_trigger_poison_list.attr, +NULL +}; + +static struct attribute_group cxl_mem_group = { + .attrs = cxl_mem_attrs, + .is_visible = cxl_mem_visible, +}; + +__ATTRIBUTE_GROUPS (cxl_mem); +static struct cxl_driver cxl_mem_driver = { .name ="cxl_mem" , .probe = cxl_mem_probe, .id =CXL_DEVICE_MEMORY_EXPANDER , + .drv = { + .dev_groups = cxl_mem_groups, + }, };module_cxl_driver (cxl_mem_driver);
Signature · 1 line
2.37.3
Re: [PATCH v11 3/6] cxl/memdev: Add trigger_poison_list sysfs attribute
Quoted 9 lines · On Sun, 26 Mar 2023 22:02:09 -0700 [email protected] wrote:
From: Alison Schofield <[email protected]>
When a boolean 'true' is written to this attribute the memdev driver retrieves the poison list from the device. The list consists of addresses that are poisoned, or would result in poison if accessed, and the source of the poison. This attribute is only visible for devices supporting the capability. The retrieved errors are logged as kernel trace events with the label '
cxl_poison'.
Quoted 3 lines
Signed-off-by Alison Schofield <[email protected]>Reviewed-by Jonathan Cameron <[email protected]>Reviewed-by Ira Weiny <[email protected]>
A grumpy reviewer comment inline... But meh, if non else minds let it be.
drivers/cxl/core/memdev.c static umode_t cxl_memdev_visible(struct kobject *kobj, struct attribute *a, · line 180
Quoted 8 lines
static struct attribute *cxl_memdev_attributes[] = {
drivers/cxl/core/memdev.c +1
-0&dev_attr_serial.attr, &dev_attr_firmware_version.attr,@@ -130,6 +177,7 @@ static umode_t cxl_memdev_visible(struct kobject *kobj, struct attribute *a, {if (!IS_ENABLED (CONFIG_NUMA ) && a == &dev_attr_numa_node.attr)return 0 ; +
Noise...
Quoted 2 lines
drivers/cxl/core/memdev.c +0
-0return a->mode; }
Alison Schofield
maintainerRe: [PATCH v11 3/6] cxl/memdev: Add trigger_poison_list sysfs attribute
Quoted 12 lines · Jonathan Cameron
Quoted 9 lines · On Sun, 26 Mar 2023 22:02:09 -0700 [email protected] wrote:
From: Alison Schofield <[email protected]>
When a boolean 'true' is written to this attribute the memdev driver retrieves the poison list from the device. The list consists of addresses that are poisoned, or would result in poison if accessed, and the source of the poison. This attribute is only visible for devices supporting the capability. The retrieved errors are logged as kernel trace events with the label '
cxl_poison'.
Quoted 6 lines
Quoted 3 lines
Signed-off-by Alison Schofield <[email protected]>Reviewed-by Jonathan Cameron <[email protected]>Reviewed-by Ira Weiny <[email protected]>A grumpy reviewer comment inline... But meh, if non else minds let it be.
Sigh! I know patch review fatigue is not suppose to apply to the sender...but I clearly have it. Thanks for the review. I'll queue it for v12.
Alison
Quoted 16 lines
drivers/cxl/core/memdev.c static umode_t cxl_memdev_visible(struct kobject *kobj, struct attribute *a, · line 180
Quoted 10 lines
static struct attribute *cxl_memdev_attributes[] = {
drivers/cxl/core/memdev.c +1
-0&dev_attr_serial.attr, &dev_attr_firmware_version.attr,@@ -130,6 +177,7 @@ static umode_t cxl_memdev_visible(struct kobject *kobj, struct attribute *a, {if (!IS_ENABLED (CONFIG_NUMA ) && a == &dev_attr_numa_node.attr)return 0 ; +Noise...
Quoted 2 lines
drivers/cxl/core/memdev.c +0
-0return a->mode; }
[email protected]
maintainerPATCH v11 4/6 cxl/region: Provide region info to the cxl_poison trace event
In reply to [email protected]From: Alison Schofield <[email protected]>
User space may need to know which region, if any, maps the poison address(es) logged in a cxl_poison trace event. Since the mapping of DPAs (device physical addresses) to a region can change, the kernel must provide this information at the time the poison list is read. The event informs user space that at event <timestamp> this <region> mapped to this <DPA>, which is poisoned.
The cxl_poison trace event is already wired up to log the region name and uuid if it receives param 'struct cxl_region'.
In order to provide that cxl_region, add another method for gathering poison - by committed endpoint decoder mappings. This method is only available with CONFIG_CXL_REGION and is only used if a region actually maps the memdev where poison is being read. After the region driver reads the poison list for all the mapped resources, control returns to the memdev driver, where poison is read for any remaining unmapped resources.
Mixed mode decoders are not currently supported in Linux. Add a debug message to the poison request path. That will serve as an alert that poison list retrieval needs to add support for mixed mode.
The default method remains: read the poison by memdev resource.
--- drivers/cxl/core/core.h | 11 +++++++ drivers/cxl/core/memdev.c | 62 +++++++++++++++++++++++++++++++++++++- drivers/cxl/core/region.c | 63 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 135 insertions(+), 1 deletion(-)
drivers/cxl/core/core.h +11 -0
@@ -25,7 +25,12 @@ void cxl_decoder_kill_region(struct cxl_endpoint_decoder *cxled);#define CXL_DAX_REGION_TYPE (x) (&cxl_dax_region_type)int cxl_region_init (void );void cxl_region_exit (void ); +int cxl_get_poison_by_endpoint (struct device *dev,void *data);#else +static inline int cxl_get_poison_by_endpoint (struct device *dev,void *data) +{ +return 0 ; +}static inline void cxl_decoder_kill_region (struct cxl_endpoint_decoder *cxled) { }
@@ -68,4 +73,10 @@ enum cxl_poison_trace_type { CXL_POISON_TRACE_LIST, }; +struct cxl_trigger_poison_context { +struct cxl_port *port; +enum cxl_decoder_mode mode; +u64 offset; +}; +#endif /* __CXL_CORE_H__ */
drivers/cxl/core/memdev.c +61 -1
81 lines not on this page · raw message
drivers/cxl/core/region.c +63 -0
69 lines not on this page · raw message
Signature · 1 line
2.37.3
Re: [PATCH v11 4/6] cxl/region: Provide region info to the cxl_poison trace event
Quoted 24 lines · alison.schofield@ wrote:
From: Alison Schofield <[email protected]>
User space may need to know which region, if any, maps the poison address(es) logged in a
cxl_poisontrace event. Since the mapping of DPAs (device physical addresses) to a region can change, the kernel must provide this information at the time the poison list is read. The event informs user space that at event <timestamp> this <region> mapped to this <DPA>, which is poisoned.The
cxl_poisontrace event is already wired up to log the region name and uuid if it receives param 'structcxl_region'.In order to provide that
cxl_region, add another method for gathering poison - by committed endpoint decoder mappings. This method is only available withCONFIG_CXL_REGIONand is only used if a region actually maps the memdev where poison is being read. After the region driver reads the poison list for all the mapped resources, control returns to the memdev driver, where poison is read for any remaining unmapped resources.Mixed mode decoders are not currently supported in Linux. Add a debug message to the poison request path. That will serve as an alert that poison list retrieval needs to add support for mixed mode.
Quoted 5 lines
The default method remains: read the poison by memdev resource.
Signed-off-by Alison Schofield <[email protected]>Reviewed-by Jonathan Cameron <[email protected]>Tested-by Jonathan Cameron <[email protected]>
I like the way this scans the memdev at the end in this version better.
Quoted 198 lines
--- drivers/cxl/core/core.h | 11 +++++++ drivers/cxl/core/memdev.c | 62 +++++++++++++++++++++++++++++++++++++- drivers/cxl/core/region.c | 63 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 135 insertions(+), 1 deletion(-)drivers/cxl/core/core.h +11
-0@@ -25,7 +25,12 @@ void cxl_decoder_kill_region(struct cxl_endpoint_decoder *cxled);#define CXL_DAX_REGION_TYPE (x) (&cxl_dax_region_type)int cxl_region_init (void );void cxl_region_exit (void ); +int cxl_get_poison_by_endpoint (struct device *dev,void *data);#else +static inline int cxl_get_poison_by_endpoint (struct device *dev,void *data) +{ +return 0 ; +}static inline void cxl_decoder_kill_region (struct cxl_endpoint_decoder *cxled) { }@@ -68,4 +73,10 @@ enum cxl_poison_trace_type { CXL_POISON_TRACE_LIST, }; +struct cxl_trigger_poison_context { +struct cxl_port *port; +enum cxl_decoder_mode mode; +u64 offset; +}; +#endif /* __CXL_CORE_H__ */ drivers/cxl/core/memdev.c +61
-1@@ -106,6 +106,47 @@ static ssize_t numa_node_show(struct device *dev, struct device_attribute *attr, }static DEVICE_ATTR_RO (numa_node); +static int cxl_get_poison_unmapped (struct cxl_memdev *cxlmd, +struct cxl_trigger_poison_context *ctx) +{ +struct cxl_dev_state *cxlds = cxlmd->cxlds; +u64 offset, length; +int rc =0 ; + +/* +* Collect poison for the remaining unmapped resources +* after poison is collected by committed endpoints. +* +* Knowing that PMEM must always follow RAM, get poison +* for unmapped resources based on the last decoder's mode: +* ram: scan remains of ram range, then any pmem range +* pmem: scan remains of pmem range +*/ + +if (ctx->mode ==CXL_DECODER_RAM ) { + offset = ctx->offset; + length =resource_size (&cxlds->ram_res) - offset; + rc =cxl_mem_get_poison (cxlmd, offset, length,NULL ); +if (rc == -EFAULT ) + rc =0 ; +if (rc) +return rc; + } +if (ctx->mode ==CXL_DECODER_PMEM ) { + offset = ctx->offset; + length =resource_size (&cxlds->dpa_res) - offset; +if (!length) +return 0 ; + }else if (resource_size (&cxlds->pmem_res)) { + offset = cxlds->pmem_res.start; + length =resource_size (&cxlds->pmem_res); + }else { +return 0 ; + } + +return cxl_mem_get_poison (cxlmd, offset, length,NULL ); +} +static int cxl_get_poison_by_memdev (struct cxl_memdev *cxlmd) {struct cxl_dev_state *cxlds = cxlmd->cxlds;@@ -139,14 +180,33 @@ ssize_t cxl_trigger_poison_list(struct device *dev, const char *buf, size_t len) {struct cxl_memdev *cxlmd =to_cxl_memdev (dev); +struct cxl_trigger_poison_context ctx; +struct cxl_port *port;bool trigger;ssize_t rc;if (kstrtobool (buf, &trigger) || !trigger)return -EINVAL ; + port =dev_get_drvdata (&cxlmd->dev); +if (!port || !is_cxl_endpoint (port)) +return -EINVAL ; +down_read (&cxl_dpa_rwsem); - rc =cxl_get_poison_by_memdev (cxlmd); +if (port->commit_end ==-1 ) { +/* No regions mapped to this memdev */ + rc =cxl_get_poison_by_memdev (cxlmd); + }else { +/* Regions mapped, collect poison by endpoint */ + ctx = (struct cxl_trigger_poison_context ) { + .port = port, + }; + rc =device_for_each_child (&port->dev, &ctx, + cxl_get_poison_by_endpoint); +if (rc ==1 ) + rc =cxl_get_poison_unmapped (cxlmd, &ctx); + } +up_read (&cxl_dpa_rwsem);return rc ? rc : len;drivers/cxl/core/region.c +63
-0@@ -2213,6 +2213,69 @@ struct cxl_pmem_region *to_cxl_pmem_region(struct device *dev) }EXPORT_SYMBOL_NS_GPL (to_cxl_pmem_region,CXL ); +int cxl_get_poison_by_endpoint (struct device *dev,void *arg) +{ +struct cxl_trigger_poison_context *ctx = arg; +struct cxl_endpoint_decoder *cxled; +struct cxl_port *port = ctx->port; +struct cxl_memdev *cxlmd; +u64 offset, length; +int rc =0 ; + +down_read (&cxl_region_rwsem); + +if (!is_endpoint_decoder (dev)) + goto out; + + cxled =to_cxl_endpoint_decoder (dev); +if (!cxled->dpa_res || !resource_size (cxled->dpa_res)) + goto out; + +/* +* Regions are only created with single mode decoders: pmem or ram. +* Linux does not currently support mixed mode decoders. This means +* that reading poison per endpoint decoder adheres to the spec +* requirement that poison reads of pmem and ram must be separated. +* CXL 3.0 Spec 8.2.9.8.4.1 +* +* Watch for future support of mixed with a dev_dbg() msg. +*/ +if (cxled->mode ==CXL_DECODER_MIXED ) { +dev_dbg (dev,"poison list read unsupported in mixed mode\n" ); + goto out; + } + + cxlmd =cxled_to_memdev (cxled); +if (cxled->skip) { + offset = cxled->dpa_res->start - cxled->skip; + length = cxled->skip; + rc =cxl_mem_get_poison (cxlmd, offset, length,NULL ); +if (rc == -EFAULT && cxled->mode ==CXL_DECODER_RAM ) + rc =0 ; +if (rc) + goto out; + } + + offset = cxled->dpa_res->start; + length = cxled->dpa_res->end - offset +1 ; + rc =cxl_mem_get_poison (cxlmd, offset, length, cxled->cxld.region); +if (rc == -EFAULT && cxled->mode ==CXL_DECODER_RAM ) + rc =0 ; +if (rc) + goto out; + +/* Iterate until commit_end is reached */ +if (cxled->cxld.id == port->commit_end) + rc =1 ; + +/* ctx informs the memdev driver of last read poison */ + ctx->mode = cxled->mode; + ctx->offset = cxled->dpa_res->end +1 ; +out: +up_read (&cxl_region_rwsem); +return rc; +} +static struct lock_class_key cxl_pmem_region_key;static struct cxl_pmem_region *cxl_pmem_region_alloc (struct cxl_region *cxlr)Signature · 1 line
2.37.3
Alison Schofield
maintainerRe: [PATCH v11 4/6] cxl/region: Provide region info to the cxl_poison trace event
Quoted 25 lines · Ira Weiny
Quoted 24 lines · alison.schofield@ wrote:
From: Alison Schofield <[email protected]>
User space may need to know which region, if any, maps the poison address(es) logged in a
cxl_poisontrace event. Since the mapping of DPAs (device physical addresses) to a region can change, the kernel must provide this information at the time the poison list is read. The event informs user space that at event <timestamp> this <region> mapped to this <DPA>, which is poisoned.The
cxl_poisontrace event is already wired up to log the region name and uuid if it receives param 'structcxl_region'.In order to provide that
cxl_region, add another method for gathering poison - by committed endpoint decoder mappings. This method is only available withCONFIG_CXL_REGIONand is only used if a region actually maps the memdev where poison is being read. After the region driver reads the poison list for all the mapped resources, control returns to the memdev driver, where poison is read for any remaining unmapped resources.Mixed mode decoders are not currently supported in Linux. Add a debug message to the poison request path. That will serve as an alert that poison list retrieval needs to add support for mixed mode.
Quoted 7 lines
Quoted 5 lines
The default method remains: read the poison by memdev resource.
Signed-off-by Alison Schofield <[email protected]>Reviewed-by Jonathan Cameron <[email protected]>Tested-by Jonathan Cameron <[email protected]>I like the way this scans the memdev at the end in this version better.
Good! That was based on your suggestion and was changed in v9.
- Move the 'remains' handling to memdev driver (Ira) Previously, after the region driver read poison for the last committed endpoint decoder, it also read poison for remaining unmapped resources. Add a context struct to pass the poison read state between memdev and region drivers, so that memdev driver can complete the poison read of unmapped resources.
Alison
Quoted 203 lines
Reviewed-by Ira Weiny <[email protected]>Quoted 198 lines
--- drivers/cxl/core/core.h | 11 +++++++ drivers/cxl/core/memdev.c | 62 +++++++++++++++++++++++++++++++++++++- drivers/cxl/core/region.c | 63 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 135 insertions(+), 1 deletion(-)drivers/cxl/core/core.h +11
-0@@ -25,7 +25,12 @@ void cxl_decoder_kill_region(struct cxl_endpoint_decoder *cxled);#define CXL_DAX_REGION_TYPE (x) (&cxl_dax_region_type)int cxl_region_init (void );void cxl_region_exit (void ); +int cxl_get_poison_by_endpoint (struct device *dev,void *data);#else +static inline int cxl_get_poison_by_endpoint (struct device *dev,void *data) +{ +return 0 ; +}static inline void cxl_decoder_kill_region (struct cxl_endpoint_decoder *cxled) { }@@ -68,4 +73,10 @@ enum cxl_poison_trace_type { CXL_POISON_TRACE_LIST, }; +struct cxl_trigger_poison_context { +struct cxl_port *port; +enum cxl_decoder_mode mode; +u64 offset; +}; +#endif /* __CXL_CORE_H__ */ drivers/cxl/core/memdev.c +61
-1@@ -106,6 +106,47 @@ static ssize_t numa_node_show(struct device *dev, struct device_attribute *attr, }static DEVICE_ATTR_RO (numa_node); +static int cxl_get_poison_unmapped (struct cxl_memdev *cxlmd, +struct cxl_trigger_poison_context *ctx) +{ +struct cxl_dev_state *cxlds = cxlmd->cxlds; +u64 offset, length; +int rc =0 ; + +/* +* Collect poison for the remaining unmapped resources +* after poison is collected by committed endpoints. +* +* Knowing that PMEM must always follow RAM, get poison +* for unmapped resources based on the last decoder's mode: +* ram: scan remains of ram range, then any pmem range +* pmem: scan remains of pmem range +*/ + +if (ctx->mode ==CXL_DECODER_RAM ) { + offset = ctx->offset; + length =resource_size (&cxlds->ram_res) - offset; + rc =cxl_mem_get_poison (cxlmd, offset, length,NULL ); +if (rc == -EFAULT ) + rc =0 ; +if (rc) +return rc; + } +if (ctx->mode ==CXL_DECODER_PMEM ) { + offset = ctx->offset; + length =resource_size (&cxlds->dpa_res) - offset; +if (!length) +return 0 ; + }else if (resource_size (&cxlds->pmem_res)) { + offset = cxlds->pmem_res.start; + length =resource_size (&cxlds->pmem_res); + }else { +return 0 ; + } + +return cxl_mem_get_poison (cxlmd, offset, length,NULL ); +} +static int cxl_get_poison_by_memdev (struct cxl_memdev *cxlmd) {struct cxl_dev_state *cxlds = cxlmd->cxlds;@@ -139,14 +180,33 @@ ssize_t cxl_trigger_poison_list(struct device *dev, const char *buf, size_t len) {struct cxl_memdev *cxlmd =to_cxl_memdev (dev); +struct cxl_trigger_poison_context ctx; +struct cxl_port *port;bool trigger;ssize_t rc;if (kstrtobool (buf, &trigger) || !trigger)return -EINVAL ; + port =dev_get_drvdata (&cxlmd->dev); +if (!port || !is_cxl_endpoint (port)) +return -EINVAL ; +down_read (&cxl_dpa_rwsem); - rc =cxl_get_poison_by_memdev (cxlmd); +if (port->commit_end ==-1 ) { +/* No regions mapped to this memdev */ + rc =cxl_get_poison_by_memdev (cxlmd); + }else { +/* Regions mapped, collect poison by endpoint */ + ctx = (struct cxl_trigger_poison_context ) { + .port = port, + }; + rc =device_for_each_child (&port->dev, &ctx, + cxl_get_poison_by_endpoint); +if (rc ==1 ) + rc =cxl_get_poison_unmapped (cxlmd, &ctx); + } +up_read (&cxl_dpa_rwsem);return rc ? rc : len;drivers/cxl/core/region.c +63
-0@@ -2213,6 +2213,69 @@ struct cxl_pmem_region *to_cxl_pmem_region(struct device *dev) }EXPORT_SYMBOL_NS_GPL (to_cxl_pmem_region,CXL ); +int cxl_get_poison_by_endpoint (struct device *dev,void *arg) +{ +struct cxl_trigger_poison_context *ctx = arg; +struct cxl_endpoint_decoder *cxled; +struct cxl_port *port = ctx->port; +struct cxl_memdev *cxlmd; +u64 offset, length; +int rc =0 ; + +down_read (&cxl_region_rwsem); + +if (!is_endpoint_decoder (dev)) + goto out; + + cxled =to_cxl_endpoint_decoder (dev); +if (!cxled->dpa_res || !resource_size (cxled->dpa_res)) + goto out; + +/* +* Regions are only created with single mode decoders: pmem or ram. +* Linux does not currently support mixed mode decoders. This means +* that reading poison per endpoint decoder adheres to the spec +* requirement that poison reads of pmem and ram must be separated. +* CXL 3.0 Spec 8.2.9.8.4.1 +* +* Watch for future support of mixed with a dev_dbg() msg. +*/ +if (cxled->mode ==CXL_DECODER_MIXED ) { +dev_dbg (dev,"poison list read unsupported in mixed mode\n" ); + goto out; + } + + cxlmd =cxled_to_memdev (cxled); +if (cxled->skip) { + offset = cxled->dpa_res->start - cxled->skip; + length = cxled->skip; + rc =cxl_mem_get_poison (cxlmd, offset, length,NULL ); +if (rc == -EFAULT && cxled->mode ==CXL_DECODER_RAM ) + rc =0 ; +if (rc) + goto out; + } + + offset = cxled->dpa_res->start; + length = cxled->dpa_res->end - offset +1 ; + rc =cxl_mem_get_poison (cxlmd, offset, length, cxled->cxld.region); +if (rc == -EFAULT && cxled->mode ==CXL_DECODER_RAM ) + rc =0 ; +if (rc) + goto out; + +/* Iterate until commit_end is reached */ +if (cxled->cxld.id == port->commit_end) + rc =1 ; + +/* ctx informs the memdev driver of last read poison */ + ctx->mode = cxled->mode; + ctx->offset = cxled->dpa_res->end +1 ; +out: +up_read (&cxl_region_rwsem); +return rc; +} +static struct lock_class_key cxl_pmem_region_key;static struct cxl_pmem_region *cxl_pmem_region_alloc (struct cxl_region *cxlr)Signature · 1 line
2.37.3
[email protected]
maintainerPATCH v11 5/6 cxl/trace: Add an HPA to cxl_poison trace events
In reply to [email protected]From: Alison Schofield <[email protected]>
When a cxl_poison trace event is reported for a region, the poisoned Device Physical Address (DPA) can be translated to a Host Physical Address (HPA) for consumption by user space.
Translate and add the resulting HPA to the cxl_poison trace event. Follow the device decode logic as defined in the CXL Spec 3.0 Section 8.2.4.19.13.
If no region currently maps the poison, assign ULLONG_MAX to the cxl_poison event hpa field.
--- drivers/cxl/core/trace.c | 94 ++++++++++++++++++++++++++++++++++++++++ drivers/cxl/core/trace.h | 11 ++++- 2 files changed, 103 insertions(+), 2 deletions(-)
drivers/cxl/core/trace.c +94 -0
@@ -1,5 +1,99 @@// SPDX-License-Identifier: GPL-2.0-only /* Copyright(c) 2022 Intel Corporation. All rights reserved. */ +#include <cxl.h> +#include "core.h" +#define CREATE_TRACE_POINTS #include "trace.h" + +static bool cxl_is_hpa_in_range (u64 hpa,struct cxl_region *cxlr,int pos) +{ +struct cxl_region_params *p = &cxlr->params; +int gran = p->interleave_granularity; +int ways = p->interleave_ways; +u64 offset; + +/* Is the hpa within this region at all */ +if (hpa < p->res->start || hpa > p->res->end) { +dev_dbg (&cxlr->dev, +"Addr trans fail: hpa 0x%llx not in region\n" , hpa); +return false; + } + +/* Is the hpa in an expected chunk for its pos(-ition) */ + offset = hpa - p->res->start; + offset =do_div (offset, gran * ways); +if ((offset >= pos * gran) && (offset < (pos +1 ) * gran)) +return true; + +dev_dbg (&cxlr->dev, +"Addr trans fail: hpa 0x%llx not in expected chunk\n" , hpa); + +return false; +} + +static u64 cxl_dpa_to_hpa (u64 dpa,struct cxl_region *cxlr, +struct cxl_endpoint_decoder *cxled) +{ +u64 dpa_offset, hpa_offset, bits_upper, mask_upper, hpa; +struct cxl_region_params *p = &cxlr->params; +int pos = cxled->pos; +u16 eig =0 ; +u8 eiw =0 ; + +ways_to_eiw (p->interleave_ways, &eiw); +granularity_to_eig (p->interleave_granularity, &eig); + +/* +* The device position in the region interleave set was removed +* from the offset at HPA->DPA translation. To reconstruct the +* HPA, place the 'pos' in the offset. +* +* The placement of 'pos' in the HPA is determined by interleave +* ways and granularity and is defined in the CXL Spec 3.0 Section +* 8.2.4.19.13 Implementation Note: Device Decode Logic +*/ + +/* Remove the dpa base */ + dpa_offset = dpa -cxl_dpa_resource_start (cxled); + + mask_upper =GENMASK_ULL (51 , eig +8 ); + +if (eiw <8 ) { + hpa_offset = (dpa_offset & mask_upper) << eiw; + hpa_offset |= pos << (eig +8 ); + }else { + bits_upper = (dpa_offset & mask_upper) >> (eig +8 ); + bits_upper = bits_upper *3 ; + hpa_offset = ((bits_upper << (eiw -8 )) + pos) << (eig +8 ); + } + +/* The lower bits remain unchanged */ + hpa_offset |= dpa_offset &GENMASK_ULL (eig +7 ,0 ); + +/* Apply the hpa_offset to the region base address */ + hpa = hpa_offset + p->res->start; + +if (!cxl_is_hpa_in_range (hpa, cxlr, cxled->pos)) +return ULLONG_MAX ; + +return hpa; +} + +u64 cxl_trace_hpa (struct cxl_region *cxlr,struct cxl_memdev *cxlmd, +u64 dpa) +{ +struct cxl_region_params *p = &cxlr->params; +struct cxl_endpoint_decoder *cxled =NULL ; + +for (int i =0 ; i < p->nr_targets; i++) { + cxled = p->targets[i]; +if (cxlmd ==cxled_to_memdev (cxled)) +break ; + } +if (!cxled || cxlmd !=cxled_to_memdev (cxled)) +return ULLONG_MAX ; + +return cxl_dpa_to_hpa (dpa, cxlr, cxled); +}
drivers/cxl/core/trace.h +9 -2
@@ -636,6 +636,8 @@ TRACE_EVENT(cxl_memory_module,#define cxl_poison_overflow (flags, time) \ (flags & CXL_POISON_FLAG_OVERFLOW ? le64_to_cpu(time) : 0) +u64 cxl_trace_hpa (struct cxl_region *cxlr,struct cxl_memdev *memdev,u64 dpa); + TRACE_EVENT(cxl_poison, TP_PROTO(struct cxl_memdev *cxlmd, struct cxl_region *region,
@@ -651,6 +653,7 @@ TRACE_EVENT(cxl_poison, __field(u8, trace_type) __string(region, region) __field(u64, overflow_t) + __field(u64, hpa) __field(u64, dpa) __field(u32, dpa_length)__array (char, uuid,16 )
@@ -671,21 +674,25 @@ TRACE_EVENT(cxl_poison,if (region) {__assign_str (region,dev_name (®ion->dev));memcpy (__entry->uuid, ®ion->params.uuid,16 ); + __entry->hpa =cxl_trace_hpa (region, cxlmd, + __entry->dpa); }else {__assign_str (region,"" );memset (__entry->uuid,0 ,16 ); + __entry->hpa =ULLONG_MAX ; } ), TP_printk("memdev=%s host=%s serial=%lld trace_type=%s region=%s " \ - "region_uuid=%pU dpa=0x%llx dpa_length=0x%x source=%s " \ - "flags=%s overflow_time=%llu", + "region_uuid=%pU hpa=0x%llx dpa=0x%llx dpa_length=0x%x " \ + "source=%s flags=%s overflow_time=%llu", __get_str(memdev), __get_str(host), __entry->serial, show_poison_trace_type(__entry->trace_type), __get_str(region), __entry->uuid, + __entry->hpa, __entry->dpa, __entry->dpa_length, show_poison_source(__entry->source),
Signature · 1 line
2.37.3
[email protected]
maintainerPATCH v11 6/6 tools/testing/cxl: Mock support for Get Poison List
In reply to [email protected]From: Alison Schofield <[email protected]>
Make mock memdevs support the Get Poison List mailbox command. Return a fake poison error record when the get poison list command is issued.
This supports testing the kernel tracing and cxl list capabilities for media errors.
--- tools/testing/cxl/test/mem.c | 42 ++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+)
tools/testing/cxl/test/mem.c +42 -0
@@ -7,6 +7,7 @@#include <linux/delay.h> #include <linux/sizes.h> #include <linux/bits.h> +#include <asm/unaligned.h> #include <cxlmem.h> #include "trace.h"
@@ -40,6 +41,10 @@ static struct cxl_cel_entry mock_cel[] = { .opcode = cpu_to_le16(CXL_MBOX_OP_GET_HEALTH_INFO), .effect = cpu_to_le16(0), }, + { + .opcode = cpu_to_le16(CXL_MBOX_OP_GET_POISON), + .effect = cpu_to_le16(0), + }, };/* See CXL 2.0 Table 181 Get Health Info Output Payload */
@@ -471,6 +476,8 @@ static int mock_id(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *cmd)cpu_to_le64 (DEV_SIZE /CXL_CAPACITY_MULTIPLIER ), }; +put_unaligned_le24 (CXL_POISON_LIST_MAX , id.poison_list_max_mer); +if (cmd->size_out <sizeof (id))return -EINVAL ;
@@ -888,6 +895,34 @@ static int mock_health_info(struct cxl_dev_state *cxlds,return 0 ; } +static int mock_get_poison (struct cxl_dev_state *cxlds, +struct cxl_mbox_cmd *cmd) +{ +struct cxl_mbox_poison_payload_in *pi = cmd->payload_in; + +/* Mock one poison record at pi.offset for 64 bytes */ +struct { +struct cxl_mbox_poison_payload_out po; +struct cxl_poison_record record; + } __packed mock_plist = { + .po = { + .count =cpu_to_le16 (1 ), + }, + .record = { + .length =cpu_to_le32 (1 ), + .address =cpu_to_le64 (le64_to_cpu (pi->offset) + +CXL_POISON_SOURCE_INJECTED ), + }, + }; + +if (cmd->size_out <sizeof (mock_plist)) +return -EINVAL ; + +memcpy (cmd->payload_out, &mock_plist,sizeof (mock_plist)); + cmd->size_out =sizeof (mock_plist); +return 0 ; +} +static int cxl_mock_mbox_send (struct cxl_dev_state *cxlds,struct cxl_mbox_cmd *cmd) {struct device *dev = cxlds->dev;
@@ -942,6 +977,9 @@ static int cxl_mock_mbox_send(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *case CXL_MBOX_OP_PASSPHRASE_SECURE_ERASE : rc =mock_passphrase_secure_erase (cxlds, cmd);break ; +case CXL_MBOX_OP_GET_POISON : + rc =mock_get_poison (cxlds, cmd); +break ;default :break ; }
@@ -1010,6 +1048,10 @@ static int cxl_mock_mem_probe(struct platform_device *pdev)if (rc)return rc; + rc =cxl_poison_state_init (cxlds); +if (rc) +return rc; + rc =cxl_dev_state_identify (cxlds);if (rc)return rc;
Signature · 1 line
2.37.3
Quoted 1 line · On Sun, 26 Mar 2023 22:02:06 -0700 [email protected] wrote:
From: Alison Schofield <[email protected]>
FYI, I took a glance at the changes since v9 and this looks good to me.
Jonathan
Quoted 54 lines
Changes in v11:
- Introduce the hpa field inTP_printkin Patch5, not Patch2. (0-day)
-cxl_trigger_poison_list()make rcssize_t
- trace naming: s/LIST/List, s/type/trace_typeLink to v10:
https://lore.kernel.org/linux-cxl/[email protected]/Add support for retrieving device poison lists and store the returned error records as kernel trace events.
The handling of the poison list is guided by the CXL 3.0 Specification Section 8.2.9.8.4.1. [1]
Example trigger:
$ echo 1 > /sys/bus/cxl/devices/mem0/trigger_poison_listExample Trace Events:
Poison found in a PMEM Region:
cxl_poison: memdev=mem0 host=cxl_mem.0 serial=0 trace_type=List region=region11 region_uuid=d96e67ec-76b0-406f-8c35-5b52630dcad1 hpa=0xf100000000 dpa=0x70000000 dpa_length=0x40 source=Injected flags= overflow_time=0Poison found in RAM Region:
cxl_poison: memdev=mem0 host=cxl_mem.0 serial=0 trace_type=List region=region2 region_uuid=00000000-0000-0000-0000-000000000000 hpa=0xf010000000 dpa=0x0 dpa_length=0x40 source=Injected flags= overflow_time=0Poison found in an unmapped DPA resource:
cxl_poison: memdev=mem3 host=cxl_mem.3 serial=3 trace_type=List region= region_uuid=00000000-0000-0000-0000-000000000000 hpa=0xffffffffffffffff dpa=0x40000000 dpa_length=0x40 source=Injected flags= overflow_time=0[1]: https://www.computeexpresslink.org/download-the-specification
Alison Schofield (6):
cxl/mbox: AddGET_POISON_LISTmailbox command cxl/trace: Add TRACE support for CXL media-error records cxl/memdev: Addtrigger_poison_listsysfs attribute cxl/region: Provide region info to thecxl_poisontrace event cxl/trace: Add an HPA tocxl_poisontrace eventstools/testing/cxl: Mock support for Get Poison ListDocumentation/ABI/testing/sysfs-bus-cxl | 14 +++ drivers/cxl/core/core.h | 15 ++++ drivers/cxl/core/mbox.c | 75 ++++++++++++++++ drivers/cxl/core/memdev.c | 108 ++++++++++++++++++++++++ drivers/cxl/core/region.c | 63 ++++++++++++++ drivers/cxl/core/trace.c | 94 +++++++++++++++++++++ drivers/cxl/core/trace.h | 101 ++++++++++++++++++++++ drivers/cxl/cxlmem.h | 72 +++++++++++++++- drivers/cxl/mem.c | 36 ++++++++ drivers/cxl/pci.c | 4 + tools/testing/cxl/test/mem.c | 42 +++++++++ 11 files changed, 623 insertions(+), 1 deletion(-)base-commit:
e686c32590f40bffc45f105c04c836ffad3e531a