Resending to expand CC list. Looking in particular for review of the QAPI
part of patch 8.
v6: Thanks to Philippe Mathieu-Daudé
- Added 'Since' entries to qapi docs.
- Added error prints to stubs rather than doing nothing at all.
(these two comments will be applied to the Poison injeciton series as well)
- Picked up tags
Long discussion on whether there was a good way to make the qapi only
exist when CONFIG_CXL* was set. Conclusion (I think) was that
unfortunately there isn't a good way to do this so stubs are currently
the best option. Thanks to Marcus for some great background info on this.
Based on series "[PATCH v4 00/10] hw/cxl: CXL emulation cleanups and minor fixes for upstream"
Based on: Message-Id: 20230206172816.8201-1-Jonathan.Cameron@huawei.com
v3 cover letter.
CXL error reporting is complex. This series only covers the protocol
related errors reported via PCIe AER - Ira Weiny has posted support for
Event log based injection and I will post an update of Poison list injection
shortly. My proposal is to upstream this one first, followed by Ira's Event
Log series, then finally the Poison List handling. That is based on likely
order of Linux kernel support (the support for this type of error reporting
went in during the recent merge window, the others are still under review).
Note we may propose other non error related features in between!
In order to test the kernel support for RAS error handling, I previously
provided this series via gitlab, enabling David Jiang's kernel patches
to be tested.
Now that Linux kernel support is upstream, this series is proposing the
support for upstream inclusion in QEMU. Note that support for Multiple
Header Recording has been added to QEMU the meantime and a kernel
patch to use that feature sent out.
https://lore.kernel.org/linux-cxl/20230113154058.16227-1-Jonathan.Cameron@huawei.com/T/#t
There are two generic PCI AER precursor feature additions.
1) The PCI_ERR_UCOR_MASK register has not been implemented until now
and is necessary for correct emulation.
2) The routing for AER errors, via existing AER error injection, only
covered one of two paths given in the PCIe base specification,
unfortunately not the one used by the Linux kernel CXL support.
The use of MSI for the CXL root ports, both makes sense from the point
of view of how it may well be implemented, and works around the documented
lack of PCI interrupt routing in i386/q35. I have a hack that lets
us correctly route those interrupts but don't currently plan to post it.
The actual CXL error injection uses a new QMP interface as documented
in the final patch description. The existing AER error injection
internals are reused though it's HMP interface is not.
Injection via QMP:
{ "execute": "qmp_capabilities" }
...
{ "execute": "cxl-inject-uncorrectable-errors",
"arguments": {
"path": "/machine/peripheral/cxl-pmem0",
"errors": [
{
"type": "cache-address-parity",
"header": [ 3, 4]
},
{
"type": "cache-data-parity",
"header": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31]
},
{
"type": "internal",
"header": [ 1, 2, 4]
}
]
}}
...
{ "execute": "cxl-inject-correctable-error",
"arguments": {
"path": "/machine/peripheral/cxl-pmem0",
"type": "physical"
} }
Jonathan Cameron (8):
hw/pci/aer: Implement PCI_ERR_UNCOR_MASK register
hw/pci/aer: Add missing routing for AER errors
hw/pci-bridge/cxl_root_port: Wire up AER
hw/pci-bridge/cxl_root_port: Wire up MSI
hw/mem/cxl-type3: Add AER extended capability
hw/cxl: Fix endian issues in CXL RAS capability defaults / masks
hw/pci/aer: Make PCIE AER error injection facility available for other
emulation to use.
hw/mem/cxl_type3: Add CXL RAS Error Injection Support.
hw/cxl/cxl-component-utils.c | 20 ++-
hw/mem/cxl_type3.c | 294 +++++++++++++++++++++++++++++++++
hw/mem/cxl_type3_stubs.c | 17 ++
hw/mem/meson.build | 2 +
hw/pci-bridge/cxl_root_port.c | 64 +++++++
hw/pci/pci-internal.h | 1 -
hw/pci/pcie_aer.c | 14 +-
include/hw/cxl/cxl_component.h | 26 +++
include/hw/cxl/cxl_device.h | 11 ++
include/hw/pci/pcie_aer.h | 1 +
include/hw/pci/pcie_regs.h | 3 +
qapi/cxl.json | 128 ++++++++++++++
qapi/meson.build | 1 +
qapi/qapi-schema.json | 1 +
14 files changed, 572 insertions(+), 11 deletions(-)
create mode 100644 hw/mem/cxl_type3_stubs.c
create mode 100644 qapi/cxl.json
--
2.37.2