Bjorn, thanks for your detailed review. On 12.04.23 17:02:33, Bjorn Helgaas wrote: > On Tue, Apr 11, 2023 at 01:03:01PM -0500, Terry Bowman wrote: > > From: Robert Richter <rrichter@xxxxxxx> > > > > In Restricted CXL Device (RCD) mode a CXL device is exposed as an > > RCiEP, but CXL downstream and upstream ports are not enumerated and > > not visible in the PCIe hierarchy. Protocol and link errors are sent > > to an RCEC. > > > > Restricted CXL host (RCH) downstream port-detected errors are signaled > > as internal AER errors, either Uncorrectable Internal Error (UIE) or > > Corrected Internal Errors (CIE). The error source is the id of the > > RCEC. A CXL handler must then inspect the error status in various CXL > > registers residing in the dport's component register space (CXL RAS > > cap) or the dport's RCRB (AER ext cap). [1] > > > > Errors showing up in the RCEC's error handler must be handled and > > connected to the CXL subsystem. Implement this by forwarding the error > > to all CXL devices below the RCEC. Since the entire CXL device is > > controlled only using PCIe Configuration Space of device 0, Function > > 0, > > Capitalize "device" and "Function" the same way (also appears in > comment below). Changed that. > > > only pass it there [2]. These devices have the Memory Device class > > code set (PCI_CLASS_MEMORY_CXL, 502h) and the existing cxl_pci driver > > can implement the handler. In addition to errors directed to the CXL > > endpoint device, the handler must also inspect the CXL downstream > > port's CXL RAS and PCIe AER external capabilities that is connected to > > "AER external capabilities" -- is that referring to the "AER > *Extended* capability"? If so, we usually don't bother including the > "extended" part because it's usually not relevant. But if you intended > "external", I don't know what it means. Right, "extended" is meant here, but I will drop it to also fit with the 'CXL RAS capability'. > > > the device. > > > > Since CXL downstream port errors are signaled using internal errors, > > the handler requires those errors to be unmasked. This is subject of a > > follow-on patch. > > > > The reason for choosing this implementation is that a CXL RCEC device > > is bound to the AER port driver, but the driver does not allow it to > > register a custom specific handler to support CXL. Connecting the RCEC > > hard-wired with a CXL handler does not work, as the CXL subsystem > > might not be present all the time. The alternative to add an > > implementation to the portdrv to allow the registration of a custom > > RCEC error handler isn't worth doing it as CXL would be its only user. > > Instead, just check for an CXL RCEC and pass it down to the connected > > CXL device's error handler. With this approach the code can entirely > > be implemented in the PCIe AER driver and is independent of the CXL > > subsystem. The CXL driver only provides the handler. > > Can you make this more concrete with an example topology so we can > work through how this all works? Correct me when I go off the rails > here: Let's assume just a simple CXL RCH topology: PCI hierarchy: ----------------- | ACPI0016 |---------------- Host bridge (CXL host) | - CEDT | | -------------| - RCRB base | | | ----------------- : | | | | | ------------------- --------- | | RCiEP |.....| RCEC | Endpoint (CXL dev) | --------| - BDF | | - BDF | | | | - PCIe AER | --------- | | | - CXL dvsec | | | | (v2: reg loc) | | | | - Comp regs | | | | - CXL RAS | | | ------------------- : : CXL hierarchy: : : : ------------------ | | | CXL root port |<-------------- | | | |----------->| - dport RCRB |<-------------- | | - PCIe AER | | | | - Comp regs | | | | - CXL RAS | | | ------------------ | | : | | | ------------------ | | ------->| CXL endpoint |--------------- | | (v1: RCRB) | ------------>| - uport RCRB | | - Comp regs | | - CXL RAS | ------------------ Dport detected errors are reported using PCIe AER and CXL RAS caps in the dports RCRB. Uport detected errors are reported using RCiEP's PCIe AER cap and either the uport's RCRB RAS cap or the RAS cap of the comp regs located using CXL DVSEC register locator. In all cases the RCEC is used with either the RCEC (dport errors) or the RCiEP (uport errors) error source id (BDF: bus, dev, func). > > The current code uses pcie_walk_rcec() in this path, which basically > searches below a Root Port or RCEC for devices that have an AER error > status bit set, add them to the e_info[] list, and call > handle_error_source() for each one: For reference, this series adds support to handle RCH downstream port-detected errors as described in CXL 3.0, 12.2.1.1. This flow looks correct to me, see comments inline. > > aer_isr_one_error > # get e_src from aer_fifo > find_source_device(e_src) e_src is the RCEC. > pcie_walk_rcec(find_device_iter) > find_device_iter > is_error_source > # read PCI_ERR_COR_STATUS or PCI_ERR_UNCOR_STATUS It is an internal error (CIE or UIE). > if (error-source) An early version of the spec did not require the RCEC as an error source. But this case is not handled with this series. > add_error_device > # add device to e_info[] list > # now call handle_error_source for everything in e_info[] > aer_process_err_devices > for (i = 0; i < e_info->err_dev_num; i++) > handle_error_source handle_error_source() is called with the RCEC as pci_dev. > > IIUC, this patch basically says that an RCEC should have an AER error > status bit (UIE or CIE) set, but the devices "below" the RCEC will > not, so they won't get added to e_info[]. An internal error of the RCEC indicates a CXL dport error. > > So we insert cxl_handle_error() in handle_error_source(), where it > gets called for the RCEC, and then it uses pcie_walk_rcec() again to > forcibly call handle_error_source() for *every* device "below" the > RCEC (even though they don't have AER error status bits set). The CXL device contains the links to the dport's caps. Also, there can be multiple RCs with CXL devs connected to it. So we must search for all CXL devices now, determine the corresponding dport and inspect both, PCIe AER and CXL RAS caps. > > Then handle_error_source() ultimately calls the CXL driver err_handler > entry points (.cor_error_detected(), .error_detected(), etc), which > can look at the CXL-specific error status in the CXL RAS or RCRB or > whatever. The AER driver (portdrv) does not have the knowledge of CXL internals. Thus the approach is to pass dport errors to the cxl_mem driver to handle it there in addition to cxl mem dev errors. > > So this basically looks like a workaround for the fact that the AER > code only calls handle_error_source() when it finds AER error status, > and CXL doesn't *set* that AER error status. There's not that much > code here, but it seems like a quite a bit of complexity in an area > that is already pretty complicated. > > Here's another idea: the ACPI GHES code (ghes_handle_aer()) basically > receives a packet of error status from firmware and queues it for > recovery via pcie_do_recovery(). What if you had a CXL module that > knew how to look for the CXL error status, package it up similarly, > and queue it via aer_recover_queue()? The CXL module knows how and where to look for errors, but it does not receive interrupts (for dport errors). The interrupts land in the portdrv (the RCEC's pci driver) and the CXL module must be notified by the portdrv. But the portdrv (AER driver) does not know the CXL module nor it is always present (e.g. CXL bus must be enumerated first etc.). aer_recover_queue() is interesting to report AER errors that has been retrieved outside the PCIe hierarchy, in particular the dport AER cap in the RCRB (see patch #4). We could collect all the data and just send it to aer_recover_queue(). I think aer_recover_work_func() must be extended to also handle corrected errors, otherwise the function is already almost the same as handle_error_source(). But first, RCEC error notifications (RCEC AER interrupts) must be sent to the CXL driver to look into the dport's RCRB. -Robert > > > [1] CXL 3.0 spec, 12.2.1.1 RCH Downstream Port-detected Errors > > [2] CXL 3.0 spec, 8.1.3 PCIe DVSEC for CXL Devices > > > > Co-developed-by: Terry Bowman <terry.bowman@xxxxxxx> > > Signed-off-by: Robert Richter <rrichter@xxxxxxx> > > Signed-off-by: Terry Bowman <terry.bowman@xxxxxxx> > > Cc: "Oliver O'Halloran" <oohall@xxxxxxxxx> > > Cc: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> > > Cc: Mahesh J Salgaonkar <mahesh@xxxxxxxxxxxxx> > > Cc: linuxppc-dev@xxxxxxxxxxxxxxxx > > Cc: linux-pci@xxxxxxxxxxxxxxx > > --- > > drivers/pci/pcie/Kconfig | 8 ++++++ > > drivers/pci/pcie/aer.c | 61 ++++++++++++++++++++++++++++++++++++++++ > > 2 files changed, 69 insertions(+) > > > > diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig > > index 228652a59f27..b0dbd864d3a3 100644 > > --- a/drivers/pci/pcie/Kconfig > > +++ b/drivers/pci/pcie/Kconfig > > @@ -49,6 +49,14 @@ config PCIEAER_INJECT > > gotten from: > > https://git.kernel.org/cgit/linux/kernel/git/gong.chen/aer-inject.git/ > > > > +config PCIEAER_CXL > > + bool "PCI Express CXL RAS support" > > + default y > > + depends on PCIEAER && CXL_PCI > > + help > > + This enables CXL error handling for Restricted CXL Hosts > > + (RCHs). > > + > > # > > # PCI Express ECRC > > # > > diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c > > index 7a25b62d9e01..171a08fd8ebd 100644 > > --- a/drivers/pci/pcie/aer.c > > +++ b/drivers/pci/pcie/aer.c > > @@ -946,6 +946,65 @@ static bool find_source_device(struct pci_dev *parent, > > return true; > > } > > > > +#ifdef CONFIG_PCIEAER_CXL > > + > > +static bool is_cxl_mem_dev(struct pci_dev *dev) > > +{ > > + /* > > + * A CXL device is controlled only using PCIe Configuration > > + * Space of device 0, Function 0. > > + */ > > + if (dev->devfn != PCI_DEVFN(0, 0)) > > + return false; > > + > > + /* Right now there is only a CXL.mem driver */ > > + if ((dev->class >> 8) != PCI_CLASS_MEMORY_CXL) > > + return false; > > + > > + return true; > > +} > > + > > +static bool is_internal_error(struct aer_err_info *info) > > +{ > > + if (info->severity == AER_CORRECTABLE) > > + return info->status & PCI_ERR_COR_INTERNAL; > > + > > + return info->status & PCI_ERR_UNC_INTN; > > +} > > + > > +static void handle_error_source(struct pci_dev *dev, struct aer_err_info *info); > > + > > +static int cxl_handle_error_iter(struct pci_dev *dev, void *data) > > +{ > > + struct aer_err_info *e_info = (struct aer_err_info *)data; > > + > > + if (!is_cxl_mem_dev(dev)) > > + return 0; > > + > > + /* pci_dev_put() in handle_error_source() */ > > + dev = pci_dev_get(dev); > > + if (dev) > > + handle_error_source(dev, e_info); > > + > > + return 0; > > +} > > + > > +static void cxl_handle_error(struct pci_dev *dev, struct aer_err_info *info) > > +{ > > + /* > > + * CXL downstream port errors are signaled as RCEC internal > > + * errors. Forward them to all CXL devices below the RCEC. > > + */ > > + if (pci_pcie_type(dev) == PCI_EXP_TYPE_RC_EC && > > + is_internal_error(info)) > > + pcie_walk_rcec(dev, cxl_handle_error_iter, info); > > +} > > + > > +#else > > +static inline void cxl_handle_error(struct pci_dev *dev, > > + struct aer_err_info *info) { } > > +#endif > > + > > /** > > * handle_error_source - handle logging error into an event log > > * @dev: pointer to pci_dev data structure of error source device > > @@ -957,6 +1016,8 @@ static void handle_error_source(struct pci_dev *dev, struct aer_err_info *info) > > { > > int aer = dev->aer_cap; > > > > + cxl_handle_error(dev, info); > > + > > if (info->severity == AER_CORRECTABLE) { > > /* > > * Correctable error does not need software intervention. > > -- > > 2.34.1 > >
