| Message ID | 20221021185615.605233-6-terry.bowman@amd.com |
|---|---|
| State | New, archived |
| Headers | show |
| Series | cxl: Log downport PCIe AER and CXL RAS error information | expand |
On Fri, 21 Oct 2022 13:56:15 -0500 Terry Bowman <terry.bowman@amd.com> wrote: > The CXL downport PCIe AER and CXL RAS capability information needs to be > logged during PCIe AER error handling. > > The existing PCIe AER error handler logs native AER errors but does not > log upport/downport AER capability residing in the RCRB. The CXL1.1 > RCRB does not have a BDF and is not enunmerable. The existing error handler > logic does not display CXL RAS details either. So this is doing two things? If so split it into dealing with the non enumerable part, and then a separate patch to deal with the CXL RAS information. However, I'm only spotting the CXL RAS handling part in here. Also, there are numerous drivers that provide additional logging in response to an AER error. With the exception of providing a way to do that for corrected errors (as I mentioned in David Jiang's series on CXL 2.0+ RAS handling) I don't think we should be doing anything down in the PCI layers for this. We should see an internal AER error and then the CXL driver should handle that, adding more logging as needed. > > Add a CXL error handler to the existing PCI error handlers. Add a call > to the CXL error handler within the PCIe AER error handler. Implement the > driver's CXL callback to log downport PCIe AER and CXL RAS capability > information. > > Signed-off-by: Terry Bowman <terry.bowman@amd.com> > --- > drivers/cxl/pci.c | 76 ++++++++++++++++++++++++++++++++++++++++++ > drivers/pci/pcie/aer.c | 45 ++++++++++++++++++++++++- > include/linux/pci.h | 4 +++ > 3 files changed, 124 insertions(+), 1 deletion(-) > > diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c > index 80a01b304efe..dceda9f9fc60 100644 > --- a/drivers/cxl/pci.c > +++ b/drivers/cxl/pci.c > @@ -7,6 +7,7 @@ > #include <linux/sizes.h> > #include <linux/mutex.h> > #include <linux/list.h> > +#include <linux/aer.h> > #include <linux/pci.h> > #include <linux/pci-doe.h> > #include <linux/io.h> > @@ -14,6 +15,9 @@ > #include "cxlpci.h" > #include "cxl.h" > > +extern void cxl_print_aer(struct pci_dev *dev, int aer_severity, > + struct aer_capability_regs *aer); > + > /** > * DOC: cxl pci > * > @@ -744,9 +748,80 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) > if (resource_size(&cxlds->pmem_res) && IS_ENABLED(CONFIG_CXL_PMEM)) > rc = devm_cxl_add_nvdimm(&pdev->dev, cxlmd); > > + dev_set_drvdata(&pdev->dev, cxlmd); > + > return rc; > } > > +struct ras_cap { > + u32 uc_error_status; > + u32 uc_error_mask; > + u32 uc_error_severity; > + u32 c_error_status; > + u32 c_error_mask; > + u32 ctrl; > + u32 log[]; > +}; > + > +/* > + * Log the state of the CXL downport AER and RAS status registers. > + */ > +static void cxl_error_report(struct cxl_memdev *cxlmd) > +{ > + struct pci_dev *pdev = to_pci_dev(cxlmd->cxlds->dev); > + struct aer_capability_regs *aer_cap; > + struct ras_cap *ras_cap; > + > + aer_cap = (struct aer_capability_regs *)cxlmd->cxlds->aer_map.base; > + ras_cap = (struct ras_cap *)cxlmd->cxlds->ras_map.base; > + > + pci_err(pdev, "CXL Error Report\n"); > + pci_err(pdev, "AER Errors:\n"); > + if (aer_cap) { > + cxl_print_aer(pdev, AER_CORRECTABLE, aer_cap); > + cxl_print_aer(pdev, AER_NONFATAL, aer_cap); > + cxl_print_aer(pdev, AER_FATAL, aer_cap); > + } > + > + pci_err(pdev, "RAS Errors:\n"); > + if (ras_cap) { > + pci_err(pdev, "RAS: uc_error_status = %X\n", readl(&ras_cap->uc_error_status)); > + pci_err(pdev, "RAS: uc_error_mask = %X\n", readl(&ras_cap->uc_error_mask)); > + pci_err(pdev, "RAS: uc_error_severity = %X\n", readl(&ras_cap->uc_error_severity)); > + pci_err(pdev, "RAS: c_error_status = %X\n", readl(&ras_cap->c_error_status)); > + pci_err(pdev, "RAS: c_error_mask = %X\n", readl(&ras_cap->c_error_mask)); > + pci_err(pdev, "RAS: ras_caps->ctrl = %X\n", readl(&ras_cap->ctrl)); > + pci_err(pdev, "RAS: log = %X\n", readl(&ras_cap->log)); > + } > +} > + > +static void cxl_error_detected(struct pci_dev *pdev) > +{ > + struct cxl_memdev *cxlmd; > + > + if (!is_cxl_memdev(&pdev->dev)) { > + pci_err(pdev, "CXL memory device is invalid\n"); > + return; > + } > + > + cxlmd = dev_get_drvdata(&pdev->dev); > + if (!cxlmd) { > + pci_err(pdev, "CXL memory device is NULL\n"); > + return; > + } > + > + if (!cxlmd->cxlds) { > + pci_err(pdev, "CXL device state object is NULL\n"); > + return; > + } > + > + cxl_error_report(cxlmd); > +} > + > +static struct pci_error_handlers cxl_error_handlers = { > + .cxl_error_detected = cxl_error_detected, > +}; > + > static const struct pci_device_id cxl_mem_pci_tbl[] = { > /* PCI class code for CXL.mem Type-3 Devices */ > { PCI_DEVICE_CLASS((PCI_CLASS_MEMORY_CXL << 8 | CXL_MEMORY_PROGIF), ~0)}, > @@ -761,6 +836,7 @@ static struct pci_driver cxl_pci_driver = { > .driver = { > .probe_type = PROBE_PREFER_ASYNCHRONOUS, > }, > + .err_handler = &cxl_error_handlers, > }; > > MODULE_LICENSE("GPL v2"); > diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c > index e2d8a74f83c3..dea04d412406 100644 > --- a/drivers/pci/pcie/aer.c > +++ b/drivers/pci/pcie/aer.c > @@ -811,6 +811,13 @@ void cper_print_aer(struct pci_dev *dev, int aer_severity, > } > #endif > > +void cxl_print_aer(struct pci_dev *dev, int aer_severity, > + struct aer_capability_regs *aer) > +{ > + cper_print_aer(dev, aer_severity, aer); > +} > +EXPORT_SYMBOL_GPL(cxl_print_aer); > + > /** > * add_error_device - list device to be handled > * @e_info: pointer to error info > @@ -1169,6 +1176,40 @@ static void aer_isr_one_error(struct aer_rpc *rpc, > } > } > > +static int report_cxl_errors_iter(struct pci_dev *pdev, void *data) > +{ > + struct pci_driver *pdrv = pdev->driver; > + > + if (pdrv && > + pdrv->err_handler && > + pdrv->err_handler->cxl_error_detected) > + pdrv->err_handler->cxl_error_detected(pdev); > + > + return 0; > +} > + > +static void report_cxl_errors(struct aer_rpc *rpc, > + struct aer_err_source *e_src) > +{ > + struct pci_dev *pdev = rpc->rpd; > + struct aer_err_info e_info; > + u32 uncor_status, cor_status; > + > + pci_read_config_dword(pdev, pdev->aer_cap + PCI_ERR_UNCOR_STATUS, &uncor_status); > + pci_read_config_dword(pdev, pdev->aer_cap + PCI_ERR_COR_STATUS, &cor_status); > + > + if (!uncor_status && !cor_status) > + return; > + > + if (pci_pcie_type(pdev) == PCI_EXP_TYPE_RC_EC) > + pcie_walk_rcec(pdev, report_cxl_errors_iter, &e_info); > + else > + pci_walk_bus(pdev->subordinate, report_cxl_errors_iter, &e_info); > + > + pci_write_config_dword(pdev, pdev->aer_cap + PCI_ERR_UNCOR_STATUS, uncor_status); > + pci_write_config_dword(pdev, pdev->aer_cap + PCI_ERR_COR_STATUS, cor_status); > +} > + > /** > * aer_isr - consume errors detected by root port > * @irq: IRQ assigned to Root Port > @@ -1185,8 +1226,10 @@ static irqreturn_t aer_isr(int irq, void *context) > if (kfifo_is_empty(&rpc->aer_fifo)) > return IRQ_NONE; > > - while (kfifo_get(&rpc->aer_fifo, &e_src)) > + while (kfifo_get(&rpc->aer_fifo, &e_src)) { > + report_cxl_errors(rpc, &e_src); > aer_isr_one_error(rpc, &e_src); > + } > return IRQ_HANDLED; > } > > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 2bda4a4e47e8..4f4b3a8f5454 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -827,6 +827,10 @@ enum pci_ers_result { > > /* PCI bus error event callbacks */ > struct pci_error_handlers { > + > + /* CXL error detected on this device */ > + void (*cxl_error_detected)(struct pci_dev *dev); > + > /* PCI bus error detected on this device */ > pci_ers_result_t (*error_detected)(struct pci_dev *dev, > pci_channel_state_t error);
On Fri, Oct 21, 2022 at 01:56:15PM -0500, Terry Bowman wrote: > The CXL downport PCIe AER and CXL RAS capability information needs to be > logged during PCIe AER error handling. > > The existing PCIe AER error handler logs native AER errors but does not > log upport/downport AER capability residing in the RCRB. The CXL1.1 > RCRB does not have a BDF and is not enunmerable. The existing error handler > logic does not display CXL RAS details either. s/enunmerable/enumerable/ The patch itself doesn't seem to reference RCRB. What's the connection? Is this specific to CXL? The base PCIe spec also documents an RCRB, though I don't think Linux does anything with it. I guess at least the RCRB discovery must be CXL-specific, since I have no idea how to find a generic PCIe RCRB. > +static void cxl_error_report(struct cxl_memdev *cxlmd) > +{ > + struct pci_dev *pdev = to_pci_dev(cxlmd->cxlds->dev); > + struct aer_capability_regs *aer_cap; > + struct ras_cap *ras_cap; > + > + aer_cap = (struct aer_capability_regs *)cxlmd->cxlds->aer_map.base; > + ras_cap = (struct ras_cap *)cxlmd->cxlds->ras_map.base; I don't think you need casts since .base is void *. > + pci_err(pdev, "CXL Error Report\n"); > + pci_err(pdev, "AER Errors:\n"); > + if (aer_cap) { > + cxl_print_aer(pdev, AER_CORRECTABLE, aer_cap); > + cxl_print_aer(pdev, AER_NONFATAL, aer_cap); > + cxl_print_aer(pdev, AER_FATAL, aer_cap); > + } > + > + pci_err(pdev, "RAS Errors:\n"); > + if (ras_cap) { > + pci_err(pdev, "RAS: uc_error_status = %X\n", readl(&ras_cap->uc_error_status)); "%X" will look a lot different than what cper_print_aer() logged above. No "0x", upper-case vs lower-case, "=" vs ":", etc. Maybe there should be a hint to connect RAS with CXL (maybe there's already a dev_fmt somewhere that I missed)? > +static void cxl_error_detected(struct pci_dev *pdev) > +{ > + struct cxl_memdev *cxlmd; > + > + if (!is_cxl_memdev(&pdev->dev)) { > + pci_err(pdev, "CXL memory device is invalid\n"); > + return; > + } > + > + cxlmd = dev_get_drvdata(&pdev->dev); > + if (!cxlmd) { > + pci_err(pdev, "CXL memory device is NULL\n"); > + return; > + } > + > + if (!cxlmd->cxlds) { > + pci_err(pdev, "CXL device state object is NULL\n"); > + return; > + } Would these NULL pointers indicate a programming error, or do they indicate lack of an optional feature? If the former, I generally prefer to just take the NULL pointer dereference oops instead of just printing an easily-missed message. But maybe the CXL style is to be more defensive. > +void cxl_print_aer(struct pci_dev *dev, int aer_severity, > + struct aer_capability_regs *aer) > +{ > + cper_print_aer(dev, aer_severity, aer); What is the purpose of this wrapper? I guess you need an exported symbol for some reason? > +} > +EXPORT_SYMBOL_GPL(cxl_print_aer); > +static void report_cxl_errors(struct aer_rpc *rpc, > + struct aer_err_source *e_src) > +{ > + struct pci_dev *pdev = rpc->rpd; > + struct aer_err_info e_info; > + u32 uncor_status, cor_status; > + > + pci_read_config_dword(pdev, pdev->aer_cap + PCI_ERR_UNCOR_STATUS, &uncor_status); > + pci_read_config_dword(pdev, pdev->aer_cap + PCI_ERR_COR_STATUS, &cor_status); I think it's kind of an existing defect that we don't have a single place to read these registers. I think they should be read either in firmware (for firmware-first error handling, where Linux basically gets a package of these register contents) or in Linux (for native handling). Ideally I think these paths would converge right after Linux reads them. Anyway, I don't think we should read these registers *again* for CXL. And I assume firmware-first error handling should work for CXL as well as for base PCIe? That would imply that we wouldn't read them at all here for the firmware-first case. > + if (!uncor_status && !cor_status) > + return; > + > + if (pci_pcie_type(pdev) == PCI_EXP_TYPE_RC_EC) > + pcie_walk_rcec(pdev, report_cxl_errors_iter, &e_info); > + else > + pci_walk_bus(pdev->subordinate, report_cxl_errors_iter, &e_info); > + > + pci_write_config_dword(pdev, pdev->aer_cap + PCI_ERR_UNCOR_STATUS, uncor_status); > + pci_write_config_dword(pdev, pdev->aer_cap + PCI_ERR_COR_STATUS, cor_status); Shouldn't this clearing be somehow contingent on pcie_aer_is_native()? > +++ b/include/linux/pci.h > @@ -827,6 +827,10 @@ enum pci_ers_result { > > /* PCI bus error event callbacks */ > struct pci_error_handlers { > + > + /* CXL error detected on this device */ Nit on the comment: calling this function doesn't imply that a CXL error was detected; we *always* call it. Apparently it's just an opportunity to log any CXL-specific errors that may have occurred? I think we need a comment about why this couldn't be done in the existing .error_detected() callback. I gather it might be related to AER_CORRECTABLE errors, for which we don't call .error_detected()? If the purpose is only to learn about correctable errors, maybe the callback doesn't need to be CXL-specific and could be called at the point where we test for AER_CORRECTABLE? > + void (*cxl_error_detected)(struct pci_dev *dev); > + > /* PCI bus error detected on this device */ > pci_ers_result_t (*error_detected)(struct pci_dev *dev, > pci_channel_state_t error); > -- > 2.34.1 >
diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c index 80a01b304efe..dceda9f9fc60 100644 --- a/drivers/cxl/pci.c +++ b/drivers/cxl/pci.c @@ -7,6 +7,7 @@ #include <linux/sizes.h> #include <linux/mutex.h> #include <linux/list.h> +#include <linux/aer.h> #include <linux/pci.h> #include <linux/pci-doe.h> #include <linux/io.h> @@ -14,6 +15,9 @@ #include "cxlpci.h" #include "cxl.h" +extern void cxl_print_aer(struct pci_dev *dev, int aer_severity, + struct aer_capability_regs *aer); + /** * DOC: cxl pci * @@ -744,9 +748,80 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) if (resource_size(&cxlds->pmem_res) && IS_ENABLED(CONFIG_CXL_PMEM)) rc = devm_cxl_add_nvdimm(&pdev->dev, cxlmd); + dev_set_drvdata(&pdev->dev, cxlmd); + return rc; } +struct ras_cap { + u32 uc_error_status; + u32 uc_error_mask; + u32 uc_error_severity; + u32 c_error_status; + u32 c_error_mask; + u32 ctrl; + u32 log[]; +}; + +/* + * Log the state of the CXL downport AER and RAS status registers. + */ +static void cxl_error_report(struct cxl_memdev *cxlmd) +{ + struct pci_dev *pdev = to_pci_dev(cxlmd->cxlds->dev); + struct aer_capability_regs *aer_cap; + struct ras_cap *ras_cap; + + aer_cap = (struct aer_capability_regs *)cxlmd->cxlds->aer_map.base; + ras_cap = (struct ras_cap *)cxlmd->cxlds->ras_map.base; + + pci_err(pdev, "CXL Error Report\n"); + pci_err(pdev, "AER Errors:\n"); + if (aer_cap) { + cxl_print_aer(pdev, AER_CORRECTABLE, aer_cap); + cxl_print_aer(pdev, AER_NONFATAL, aer_cap); + cxl_print_aer(pdev, AER_FATAL, aer_cap); + } + + pci_err(pdev, "RAS Errors:\n"); + if (ras_cap) { + pci_err(pdev, "RAS: uc_error_status = %X\n", readl(&ras_cap->uc_error_status)); + pci_err(pdev, "RAS: uc_error_mask = %X\n", readl(&ras_cap->uc_error_mask)); + pci_err(pdev, "RAS: uc_error_severity = %X\n", readl(&ras_cap->uc_error_severity)); + pci_err(pdev, "RAS: c_error_status = %X\n", readl(&ras_cap->c_error_status)); + pci_err(pdev, "RAS: c_error_mask = %X\n", readl(&ras_cap->c_error_mask)); + pci_err(pdev, "RAS: ras_caps->ctrl = %X\n", readl(&ras_cap->ctrl)); + pci_err(pdev, "RAS: log = %X\n", readl(&ras_cap->log)); + } +} + +static void cxl_error_detected(struct pci_dev *pdev) +{ + struct cxl_memdev *cxlmd; + + if (!is_cxl_memdev(&pdev->dev)) { + pci_err(pdev, "CXL memory device is invalid\n"); + return; + } + + cxlmd = dev_get_drvdata(&pdev->dev); + if (!cxlmd) { + pci_err(pdev, "CXL memory device is NULL\n"); + return; + } + + if (!cxlmd->cxlds) { + pci_err(pdev, "CXL device state object is NULL\n"); + return; + } + + cxl_error_report(cxlmd); +} + +static struct pci_error_handlers cxl_error_handlers = { + .cxl_error_detected = cxl_error_detected, +}; + static const struct pci_device_id cxl_mem_pci_tbl[] = { /* PCI class code for CXL.mem Type-3 Devices */ { PCI_DEVICE_CLASS((PCI_CLASS_MEMORY_CXL << 8 | CXL_MEMORY_PROGIF), ~0)}, @@ -761,6 +836,7 @@ static struct pci_driver cxl_pci_driver = { .driver = { .probe_type = PROBE_PREFER_ASYNCHRONOUS, }, + .err_handler = &cxl_error_handlers, }; MODULE_LICENSE("GPL v2"); diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index e2d8a74f83c3..dea04d412406 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -811,6 +811,13 @@ void cper_print_aer(struct pci_dev *dev, int aer_severity, } #endif +void cxl_print_aer(struct pci_dev *dev, int aer_severity, + struct aer_capability_regs *aer) +{ + cper_print_aer(dev, aer_severity, aer); +} +EXPORT_SYMBOL_GPL(cxl_print_aer); + /** * add_error_device - list device to be handled * @e_info: pointer to error info @@ -1169,6 +1176,40 @@ static void aer_isr_one_error(struct aer_rpc *rpc, } } +static int report_cxl_errors_iter(struct pci_dev *pdev, void *data) +{ + struct pci_driver *pdrv = pdev->driver; + + if (pdrv && + pdrv->err_handler && + pdrv->err_handler->cxl_error_detected) + pdrv->err_handler->cxl_error_detected(pdev); + + return 0; +} + +static void report_cxl_errors(struct aer_rpc *rpc, + struct aer_err_source *e_src) +{ + struct pci_dev *pdev = rpc->rpd; + struct aer_err_info e_info; + u32 uncor_status, cor_status; + + pci_read_config_dword(pdev, pdev->aer_cap + PCI_ERR_UNCOR_STATUS, &uncor_status); + pci_read_config_dword(pdev, pdev->aer_cap + PCI_ERR_COR_STATUS, &cor_status); + + if (!uncor_status && !cor_status) + return; + + if (pci_pcie_type(pdev) == PCI_EXP_TYPE_RC_EC) + pcie_walk_rcec(pdev, report_cxl_errors_iter, &e_info); + else + pci_walk_bus(pdev->subordinate, report_cxl_errors_iter, &e_info); + + pci_write_config_dword(pdev, pdev->aer_cap + PCI_ERR_UNCOR_STATUS, uncor_status); + pci_write_config_dword(pdev, pdev->aer_cap + PCI_ERR_COR_STATUS, cor_status); +} + /** * aer_isr - consume errors detected by root port * @irq: IRQ assigned to Root Port @@ -1185,8 +1226,10 @@ static irqreturn_t aer_isr(int irq, void *context) if (kfifo_is_empty(&rpc->aer_fifo)) return IRQ_NONE; - while (kfifo_get(&rpc->aer_fifo, &e_src)) + while (kfifo_get(&rpc->aer_fifo, &e_src)) { + report_cxl_errors(rpc, &e_src); aer_isr_one_error(rpc, &e_src); + } return IRQ_HANDLED; } diff --git a/include/linux/pci.h b/include/linux/pci.h index 2bda4a4e47e8..4f4b3a8f5454 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -827,6 +827,10 @@ enum pci_ers_result { /* PCI bus error event callbacks */ struct pci_error_handlers { + + /* CXL error detected on this device */ + void (*cxl_error_detected)(struct pci_dev *dev); + /* PCI bus error detected on this device */ pci_ers_result_t (*error_detected)(struct pci_dev *dev, pci_channel_state_t error);
The CXL downport PCIe AER and CXL RAS capability information needs to be logged during PCIe AER error handling. The existing PCIe AER error handler logs native AER errors but does not log upport/downport AER capability residing in the RCRB. The CXL1.1 RCRB does not have a BDF and is not enunmerable. The existing error handler logic does not display CXL RAS details either. Add a CXL error handler to the existing PCI error handlers. Add a call to the CXL error handler within the PCIe AER error handler. Implement the driver's CXL callback to log downport PCIe AER and CXL RAS capability information. Signed-off-by: Terry Bowman <terry.bowman@amd.com> --- drivers/cxl/pci.c | 76 ++++++++++++++++++++++++++++++++++++++++++ drivers/pci/pcie/aer.c | 45 ++++++++++++++++++++++++- include/linux/pci.h | 4 +++ 3 files changed, 124 insertions(+), 1 deletion(-)