arm/virt: CXL support via pxb_cxl
v16 cover arm/virt: CXL support via pxb_cxl
v16:
- Mostly additional documentation and descriptive text in patch titles.
- Update test to reflect changes to other tests.
- Update physmem_max in virt to include the CXL memory.
Updated cover letter
Back in 2022, this series stalled on the absence of a solution to device tree support for PCI Expander Bridges (PXB) and we ended up only having x86 support upstream. I've been carrying the arm64 support out of tree since then, with occasional nasty surprises (e.g. UNIMP + DT issue seen a few weeks ago) and a fair number of fiddly rebases. gitlab.com/jic23/qemu cxl-<latest date>. Will update shortly with this series.
A recent discussion with Peter Maydell indicated that there are various other ACPI only features now, so in general he might be more relaxed about DT support being necessary. The upcoming vSMMUv3 support would run into this problem as well.
I presented the background to the PXB issue at Linaro connect 2022. In short the issue is that PXBs steal MMIO space from the main PCI root bridge. The challenge is knowing how much to steal.
On ACPI platforms, we can rely on EDK2 to perform an enumeration and configuration of the PCI topology and QEMU can update the ACPI tables after EDK2 has done this when it can simply read the space used by the root ports. On device tree, there is no entity to figure out that enumeration so we don't know how to size the stolen region.
Three approaches were discussed:
1) Enumerating in QEMU. Horribly complex and the last thing we want is a 3rd enumeration implementation that ends up out of sync with EDK2 and the kernel (there are frequent issues because of how those existing implementations differ.
2) Figure out how to enumerate in kernel. I never put a huge amount of work into this, but it seemed likely to involve a nasty dance with similar very specific code to that EDK2 is carrying and would very challenging to upstream (given the lack of clarity on real use cases for PXBs and DT).
3) Hack it based on the control we have which is bus numbers. No one liked this but it worked :)
The other little wrinkle would be the need to define full bindings for CXL on DT + implement a fairly complex kernel stack as equivalent in ACPI involves a static table, CEDT, new runtime queries via _DSM and a description of various components. Doable, but so far there is no interest on physical platforms. Worth noting that for now, the QEMU CXL emulation is all about testing and developing the OS stack, not about virtualization (performance is terrible except in some very contrived situations!)
There is only a very simple test in here, because my intent is not to duplicate what we have on x86, but just to do a smoke test that everything is hooked up. In general we need much more comprehensive end to end CXL tests but that requires a reaonsably stable guest software stack. A few people have expressed interest in working on that, but we aren't there yet.
Note that this series has a very different use case to that in the proposed SBSA-ref support:
https://lore.kernel.org/qemu-devel/[email protected]/
SBSA-ref is a good choice if you want a relatively simple mostly fixed configuration. That works well with the limited host system discoverability etc as EDK2 can be build against a known configuration.
My interest with this support in arm/virt is support host software stack development (we have a wide range of contributors, most of whom are working on emulation + the kernel support). I care about the weird corners. As such I need to be able to bring up variable numbers of host bridges, multiple CXL Fixed Memory Windows with varying characteristics (interleave etc), complex NUMA topologies with wierd performance characteristics etc. We can do that on x86 upstream today, or my gitlab tree. Note that we need arm support for some arch specific features in the near future (cache flushing). Doing kernel development with this need for flexibility on SBSA-ref is not currently practical. SBSA-ref CXL support is an excellent thing, just not much use to me for this work.
Also, we are kicking off some work on DCD virtualization, particularly to support inter-host shared memory being presented up into a VM. That will need upstream support on arm64 as it is built on top of the existing CXL emulation to avoid the need for a separate guest software stack.
Note this is TCG only - it is possible to support limited use with KVM but that needs additional patches not yet ready for upstream. The challenge is interleave - and the solution is don't interleave if you want to run with KVM.
Jonathan Cameron (5):
hw/cxl-host: Add an index field to CXLFixedMemoryWindow hw/cxl: Make the CXL fixed memory windows devices. hw/arm/virt: Basic CXL enablement on pci_expander_bridge instances
pxb-cxl
docs/cxl: Add an arm/virt example.
qtest/cxl: Add aarch64 virt test for CXL
docs/system/arm/virt.rst | 9 ++ docs/system/devices/cxl.rst | 10 +++ include/hw/arm/virt.h | 4 + include/hw/cxl/cxl.h | 5 +- include/hw/cxl/cxl_host.h | 5 +- hw/acpi/cxl.c | 76 ++++++++-------- hw/arm/virt-acpi-build.c | 34 +++++++ hw/arm/virt.c | 29 ++++++ hw/cxl/cxl-host-stubs.c | 7 +- hw/cxl/cxl-host.c | 174 +++++++++++++++++++++++++++++------- hw/i386/pc.c | 50 +++++------ tests/qtest/cxl-test.c | 58 +++++++++--- tests/qtest/meson.build | 1 + 13 files changed, 352 insertions(+), 110 deletions(-)
Signature · 1 line
2.48.1
PATCH v16 1/5 hw/cxl-host: Add an index field to CXLFixedMemoryWindow
To enable these to be found in a fixed order, that order needs to be known. This will later be used to sort a list of these structures so that address map and ACPI table entries are predictable.
---
v16: Tested tag
--- include/hw/cxl/cxl.h | 1 + hw/cxl/cxl-host.c | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-)
include/hw/cxl/cxl.h +1 -0
@@ -27,6 +27,7 @@typedef struct PXBCXLDev PXBCXLDev ; typedef struct CXLFixedWindow { + int index; uint64_t size; char **targets; PXBCXLDev *target_hbs[16];
hw/cxl/cxl-host.c +6 -3
@@ -24,13 +24,15 @@static void cxl_fixed_memory_window_config (CXLState *cxl_state,CXLFixedMemoryWindowOptions *object, -Error **errp) +int index,Error **errp) {ERRP_GUARD (); g_autofree CXLFixedWindow *fw = g_malloc0(sizeof(*fw));strList *target;int i; + fw->index = index; +for (target = object->targets; target; target = target->next) { fw->num_targets++; }
@@ -325,14 +327,15 @@ static void machine_set_cfmw(Object *obj, Visitor *v, const char *name,CXLState *state = opaque;CXLFixedMemoryWindowOptionsList *cfmw_list =NULL ;CXLFixedMemoryWindowOptionsList *it; +int index;visit_type_CXLFixedMemoryWindowOptionsList (v, name, &cfmw_list, errp);if (!cfmw_list) {return ; } -for (it = cfmw_list; it; it = it->next) { -cxl_fixed_memory_window_config (state, it->value, errp); +for (it = cfmw_list, index =0 ; it; it = it->next, index++) { +cxl_fixed_memory_window_config (state, it->value, index, errp); } state->cfmw_list = cfmw_list; }
Signature · 1 line
2.48.1
Re: [PATCH qemu v16 1/5] hw/cxl-host: Add an index field to CXLFixedMemoryWindow
Quoted 8 lines · Jonathan Cameron via
To enable these to be found in a fixed order, that order needs to be known. This will later be used to sort a list of these structures so that address map and ACPI table entries are predictable.
Tested-by Li Zhijian <[email protected]>Reviewed-by Li Zhijian <[email protected]>Reviewed-by Fan Ni <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>
Eric
Quoted 59 lines
---
v16: Tested tag--- include/hw/cxl/cxl.h | 1 + hw/cxl/cxl-host.c | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-)include/hw/cxl/cxl.h +1
-0@@ -27,6 +27,7 @@typedef struct PXBCXLDev PXBCXLDev ; typedef struct CXLFixedWindow { + int index; uint64_t size; char **targets; PXBCXLDev *target_hbs[16];hw/cxl/cxl-host.c +6
-3@@ -24,13 +24,15 @@static void cxl_fixed_memory_window_config (CXLState *cxl_state,CXLFixedMemoryWindowOptions *object, -Error **errp) +int index,Error **errp) {ERRP_GUARD (); g_autofree CXLFixedWindow *fw = g_malloc0(sizeof(*fw));strList *target;int i; + fw->index = index; +for (target = object->targets; target; target = target->next) { fw->num_targets++; }@@ -325,14 +327,15 @@ static void machine_set_cfmw(Object *obj, Visitor *v, const char *name,CXLState *state = opaque;CXLFixedMemoryWindowOptionsList *cfmw_list =NULL ;CXLFixedMemoryWindowOptionsList *it; +int index;visit_type_CXLFixedMemoryWindowOptionsList (v, name, &cfmw_list, errp);if (!cfmw_list) {return ; } -for (it = cfmw_list; it; it = it->next) { -cxl_fixed_memory_window_config (state, it->value, errp); +for (it = cfmw_list, index =0 ; it; it = it->next, index++) { +cxl_fixed_memory_window_config (state, it->value, index, errp); } state->cfmw_list = cfmw_list; }
PATCH v16 2/5 hw/cxl: Make the CXL fixed memory windows devices.
In reply to Jonathan CameronPreviously these somewhat device like structures were tracked using a list in the CXLState in each machine. This is proving restrictive in a few cases where we need to iterate through these without being aware of the machine type. Just make them sysbus devices.
Restrict them to not user created as they need to be visible to early stages of machine init given effects on the memory map.
This change both simplifies state tracking and enables features needed for performance optimization and hotness tracking by making it possible to retrieve the fixed memory window on actions elsewhere in the topology.
In some cases the ordering of the Fixed Memory Windows matters. For those utility functions provide a GSList sorted by the window index. This ensures that we get consistency across:
- ordering in the command line
- ordering of the host PA ranges
- ordering of ACPI CEDT structures describing the CFMWS.
Other aspects don't have this constraint. For those direct iteration of the underlying hash structures is fine.
In the setup path for the memory map in pc_memory_init() split the operations into two calls. The first, cxl_fmws_set_mmemap(), loops over fixed memory windows in order and assigns their addresses. The second, cxl_fmws_update_mmio() actually sets up the mmio for each window. This is obviously less efficient than a single loop but this split design is needed to put the logic in two different places in the arm64 support and it is not a hot enough path to justify an x86 only implementation.
---
v16: Add a comment about there being no dynamic state so no reset
or migration support is needed. (Peter Maydell)
--- include/hw/cxl/cxl.h | 4 +- include/hw/cxl/cxl_host.h | 5 +- hw/acpi/cxl.c | 76 +++++++++-------- hw/cxl/cxl-host-stubs.c | 7 +- hw/cxl/cxl-host.c | 167 +++++++++++++++++++++++++++++++------- hw/i386/pc.c | 50 +++++------- 6 files changed, 214 insertions(+), 95 deletions(-)
include/hw/cxl/cxl.h +3 -1
@@ -27,6 +27,7 @@typedef struct PXBCXLDev PXBCXLDev ; typedef struct CXLFixedWindow { + SysBusDevice parent_obj; int index; uint64_t size; char **targets;
@@ -38,12 +39,13 @@ typedef struct CXLFixedWindow {MemoryRegion mr;hwaddr base; } CXLFixedWindow; +#define TYPE_CXL_FMW "cxl-fmw" +OBJECT_DECLARE_SIMPLE_TYPE(CXLFixedWindow, CXL_FMW)typedef struct CXLState {bool is_enabled;MemoryRegion host_mr;unsigned int next_mr_idx; -GList *fixed_windows;CXLFixedMemoryWindowOptionsList *cfmw_list; }CXLState ;
include/hw/cxl/cxl_host.h +4 -1
@@ -14,8 +14,11 @@#define CXL_HOST_H void cxl_machine_init (Object *obj,CXLState *state); -void cxl_fmws_link_targets (CXLState *stat,Error **errp); +void cxl_fmws_link_targets (Error **errp);void cxl_hook_up_pxb_registers (PCIBus *bus,CXLState *state,Error **errp); +hwaddr cxl_fmws_set_memmap (hwaddr base,hwaddr max_addr); +void cxl_fmws_update_mmio (void ); +GSList *cxl_fmws_get_all_sorted (void );extern const MemoryRegionOps cfmws_ops;
hw/acpi/cxl.c +40 -36
114 lines not on this page · raw message
hw/cxl/cxl-host-stubs.c +6 -1
@@ -8,8 +8,13 @@#include "hw/cxl/cxl.h" #include "hw/cxl/cxl_host.h" -void cxl_fmws_link_targets (CXLState *stat,Error **errp) {}; +void cxl_fmws_link_targets (Error **errp) {};void cxl_machine_init (Object *obj,CXLState *state) {};void cxl_hook_up_pxb_registers (PCIBus *bus,CXLState *state,Error **errp) {}; +hwaddr cxl_fmws_set_memmap (hwaddr base,hwaddr max_addr) +{ +return base; +}; +void cxl_fmws_update_mmio (void ) {};const MemoryRegionOps cfmws_ops;
hw/cxl/cxl-host.c +139 -28
196 lines not on this page · raw message
hw/i386/pc.c +22 -28
72 lines not on this page · raw message
Signature · 1 line
2.48.1
PATCH v16 3/5 hw/arm/virt: Basic CXL enablement on pci_expander_bridge instances pxb-cxl
In reply to Jonathan CameronCode based on i386/pc enablement.
The memory layout places space for 16 host bridge register regions after the GIC_REDIST2 in the extended memmap. This is a hole in the current map so adding them here has no impact on placement of other memory regions (tested with enough CPUs for GIC_REDIST2 to be in use.)
The CFMWs are placed above the extended memmap. Note the confusing existing variable highest_gpa is the highest_gpa that has been allocated at a particular point in setting up the memory map.
The cxl_devices_state.host_mr is provides a small space in which to place the individual host bridge register regions for whatever host bridges are allocated via -device pxb-cxl on the command line. The existing dynamic sysbus infrastructure is not reused because pxb-cxl is a PCI device not a sysbus one but these registers are directly in the main memory map, not the PCI address space.
Only create the CEDT table if cxl=on set for the machine. Default to off.
---
v16: Some additional comments on the memory map in the patch description.
Added an 'off by default' statement to he patch description. Update highest_gpa to include CXL Fixed Memory Windows. It is not used after this point but cleaner to set it anyway.
Perhaps unresolved feedback. Peter raised a concern about the direct initialization of vms->cxl_devices_state.host_mr. I've added more commentary about that to the patch description. Whilst it seems unnecessary I could wrap the relevant 3 lines of code up in a utility function rather than open coding them here and in i386/pc.
--- docs/system/arm/virt.rst | 9 +++++++++ include/hw/arm/virt.h | 4 ++++ hw/arm/virt-acpi-build.c | 34 ++++++++++++++++++++++++++++++++++ hw/arm/virt.c | 29 +++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+)
docs/system/arm/virt.rst +9 -0
@@ -31,6 +31,7 @@ Supported devices The virt board supports: - PCI/PCIe devices +- CXL Fixed memory windows, root bridges and devices. - Flash memory - Either one or two PL011 UARTs for the NonSecure World - An RTC
@@ -189,6 +190,14 @@ ras acpi Set ``on``/``off``/``auto`` to enable/disable ACPI. +cxl + Set ``on``/``off`` to enable/disable CXL. More details in + :doc:`../devices/cxl`. The default is off. + +cxl-fmw + Array of CXL fixed memory windows describing fixed address routing to + target CXL host bridges. See :doc:`../devices/cxl`. + dtb-randomness Set ``on``/``off`` to pass random seeds via the guest DTB rng-seed and kaslr-seed nodes (in both "/chosen" and
include/hw/arm/virt.h +4 -0
@@ -36,6 +36,7 @@#include "hw/arm/boot.h" #include "hw/arm/bsa.h" #include "hw/block/flash.h" +#include "hw/cxl/cxl.h" #include "system/kvm.h" #include "hw/intc/arm_gicv3_common.h" #include "qom/object.h"
@@ -85,6 +86,7 @@ enum {/* indices of IO regions located after the RAM */ enum {VIRT_HIGH_GIC_REDIST2 =VIRT_LOWMEMMAP_LAST , +VIRT_CXL_HOST ,VIRT_HIGH_PCIE_ECAM ,VIRT_HIGH_PCIE_MMIO , };
@@ -140,6 +142,7 @@ struct VirtMachineState {bool secure;bool highmem;bool highmem_compact; +bool highmem_cxl;bool highmem_ecam;bool highmem_mmio;bool highmem_redists;
@@ -174,6 +177,7 @@ struct VirtMachineState {char *oem_id;char *oem_table_id;bool ns_el2_virt_timer_irq; +CXLState cxl_devices_state; };#define VIRT_ECAM_ID (high) (high ? VIRT_HIGH_PCIE_ECAM : VIRT_PCIE_ECAM)
hw/arm/virt-acpi-build.c +34 -0
@@ -39,10 +39,12 @@#include "hw/acpi/aml-build.h" #include "hw/acpi/utils.h" #include "hw/acpi/pci.h" +#include "hw/acpi/cxl.h" #include "hw/acpi/memory_hotplug.h" #include "hw/acpi/generic_event_device.h" #include "hw/acpi/tpm.h" #include "hw/acpi/hmat.h" +#include "hw/cxl/cxl.h" #include "hw/pci/pcie_host.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h"
@@ -119,10 +121,29 @@ static void acpi_dsdt_add_flash(Aml *scope, const MemMapEntry *flash_memmap)aml_append (scope, dev); } +static void build_acpi0017 (Aml *table) +{ +Aml *dev, *scope, *method; + + scope =aml_scope ("_SB" ); + dev =aml_device ("CXLM" ); +aml_append (dev,aml_name_decl ("_HID" ,aml_string ("ACPI0017" ))); + + method =aml_method ("_STA" ,0 ,AML_NOTSERIALIZED ); +aml_append (method,aml_return (aml_int (0x0B ))); +aml_append (dev, method); +build_cxl_dsm_method (dev); + +aml_append (scope, dev); +aml_append (table, scope); +} +static void acpi_dsdt_add_pci (Aml *scope,const MemMapEntry *memmap,uint32_t irq,VirtMachineState *vms) {int ecam_id =VIRT_ECAM_ID (vms->highmem_ecam); +bool cxl_present = false; +PCIBus *bus = vms->bus;struct GPEXConfig cfg = { .mmio32 = memmap[VIRT_PCIE_MMIO ], .pio = memmap[VIRT_PCIE_PIO ],
@@ -136,6 +157,14 @@ static void acpi_dsdt_add_pci(Aml *scope, const MemMapEntry *memmap, }acpi_dsdt_add_gpex (scope, &cfg); + QLIST_FOREACH(bus, &vms->bus->child, sibling) { +if (pci_bus_is_cxl (bus)) { + cxl_present = true; + } + } +if (cxl_present) { +build_acpi0017 (scope); + } } static void acpi_dsdt_add_gpio(Aml *scope, const MemMapEntry *gpio_memmap,
@@ -963,6 +992,11 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) } } +if (vms->cxl_devices_state.is_enabled) { +cxl_build_cedt (table_offsets, tables_blob, tables->linker, + vms->oem_id, vms->oem_table_id, &vms->cxl_devices_state); + } +if (ms->nvdimms_state->is_enabled) { nvdimm_build_acpi(table_offsets, tables_blob, tables->linker, ms->nvdimms_state, ms->ram_slots, vms->oem_id,
hw/arm/virt.c +29 -0
@@ -57,6 +57,7 @@#include "qemu/error-report.h" #include "qemu/module.h" #include "hw/pci-host/gpex.h" +#include "hw/pci-bridge/pci_expander_bridge.h" #include "hw/virtio/virtio-pci.h" #include "hw/core/sysbus-fdt.h" #include "hw/platform-bus.h"
@@ -86,6 +87,8 @@#include "hw/virtio/virtio-md-pci.h" #include "hw/virtio/virtio-iommu.h" #include "hw/char/pl011.h" +#include "hw/cxl/cxl.h" +#include "hw/cxl/cxl_host.h" #include "qemu/guest-random.h" static GlobalProperty arm_virt_compat[] = {
@@ -220,6 +223,7 @@ static const MemMapEntry base_memmap[] = {static MemMapEntry extended_memmap[] = {/* Additional 64 MB redist region (can contain up to 512 redistributors) */ [VIRT_HIGH_GIC_REDIST2 ] = {0x0 ,64 * MiB }, + [VIRT_CXL_HOST ] = {0x0 ,64 * KiB *16 },/* 16 UID */ [VIRT_HIGH_PCIE_ECAM ] = {0x0 ,256 * MiB },/* Second PCIe window */ [VIRT_HIGH_PCIE_MMIO ] = {0x0 ,DEFAULT_HIGH_PCIE_MMIO_SIZE },
@@ -1626,6 +1630,17 @@ static void create_pcie(VirtMachineState *vms) } } +static void create_cxl_host_reg_region (VirtMachineState *vms) +{ +MemoryRegion *sysmem =get_system_memory (); +MemoryRegion *mr = &vms->cxl_devices_state.host_mr; + +memory_region_init (mr,OBJECT (vms),"cxl_host_reg" , + vms->memmap[VIRT_CXL_HOST ].size); +memory_region_add_subregion (sysmem, vms->memmap[VIRT_CXL_HOST ].base, mr); + vms->highmem_cxl = true; +} +static void create_platform_bus (VirtMachineState *vms) {DeviceState *dev;
@@ -1742,6 +1757,12 @@ void virt_machine_done(Notifier *notifier, void *data)struct arm_boot_info *info = &vms->bootinfo;AddressSpace *as =arm_boot_address_space (cpu, info); +cxl_hook_up_pxb_registers (vms->bus, &vms->cxl_devices_state, + &error_fatal); + +if (vms->cxl_devices_state.is_enabled) { +cxl_fmws_link_targets (&error_fatal); + }/* * If the user provided a dtb, we assume the dynamic sysbus nodes * already are integrated there. This corresponds to a use case where
@@ -1788,6 +1809,7 @@ static inline bool *virt_get_high_memmap_enabled(VirtMachineState *vms, {bool *enabled_array[] = { &vms->highmem_redists, + &vms->highmem_cxl, &vms->highmem_ecam, &vms->highmem_mmio, };
@@ -1895,6 +1917,9 @@ static void virt_set_memmap(VirtMachineState *vms, int pa_bits)if (device_memory_size >0 ) {machine_memory_devices_init (ms, device_memory_base, device_memory_size); } + vms->highest_gpa =cxl_fmws_set_memmap (ROUND_UP (vms->highest_gpa +1 , +256 * MiB), +BIT_ULL (pa_bits)) -1 ; } static VirtGICType finalize_gic_version_do(const char *accel_name,
@@ -2345,6 +2370,8 @@ static void machvirt_init(MachineState *machine)memory_region_add_subregion (sysmem, vms->memmap[VIRT_MEM ].base, machine->ram); +cxl_fmws_update_mmio (); +virt_flash_fdt (vms, sysmem, secure_sysmem ?: sysmem);create_gic (vms, sysmem);
@@ -2400,6 +2427,7 @@ static void machvirt_init(MachineState *machine)create_rtc (vms);create_pcie (vms); +create_cxl_host_reg_region (vms);if (has_ged && aarch64 && firmware_loaded &&virt_is_acpi_enabled (vms)) { vms->acpi_dev =create_acpi_ged (vms);
@@ -3370,6 +3398,7 @@ static void virt_instance_init(Object *obj) vms->oem_id =g_strndup (ACPI_BUILD_APPNAME6 ,6 ); vms->oem_table_id =g_strndup (ACPI_BUILD_APPNAME8 ,8 ); +cxl_machine_init (obj, &vms->cxl_devices_state); }static const TypeInfo virt_machine_info = {
Signature · 1 line
2.48.1
Re: [PATCH qemu v16 3/5] hw/arm/virt: Basic CXL enablement on pci_expander_bridge instances pxb-cxl
Hi Jonathan,
Quoted 5 lines · Jonathan Cameron via
Code based on i386/pc enablement.
The memory layout places space for 16 host bridge register regions after theGIC_REDIST2in the extended memmap. This is a hole in the current map so adding them here has no impact on placement of other memory regions (tested with enough CPUs forGIC_REDIST2to be in use.)
Doesn't it depend on the init RAM size setting.
if the init RAM top + REDIST2 aligns to a 256MB boundary (size of the PCI ECAM) aren't you likely to have no hole?
Quoted 4 lines
The CFMWs are placed above the extended memmap. Note the confusing existing variable
highest_gpais thehighest_gpathat has been allocated at a particular point in setting up the memory map.
what kind of improvement would you foresee wrt highest_gpa?
Thanks
Eric
Quoted 269 lines
The cxl_devices_state.host_mr is provides a small space in which to place the individual host bridge register regions for whatever host bridges are allocated via -device pxb-cxl on the command line. The existing dynamic sysbus infrastructure is not reused because pxb-cxl is a PCI device not a sysbus one but these registers are directly in the main memory map, not the PCI address space.
Only create the CEDT table if cxl=on set for the machine. Default to off.
Signed-off-by Jonathan Cameron <[email protected]>---
v16: Some additional comments on the memory map in the patch description.
Added an 'off by default' statement to he patch description. Updatehighest_gpato include CXL Fixed Memory Windows. It is not used after this point but cleaner to set it anyway.Perhaps unresolved feedback. Peter raised a concern about the direct initialization of
vms->cxl_devices_state.host_mr. I've added more commentary about that to the patch description. Whilst it seems unnecessary I could wrap the relevant 3 lines of code up in a utility function rather than open coding them here and in i386/pc.--- docs/system/arm/virt.rst | 9 +++++++++ include/hw/arm/virt.h | 4 ++++ hw/arm/virt-acpi-build.c | 34 ++++++++++++++++++++++++++++++++++ hw/arm/virt.c | 29 +++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+)docs/system/arm/virt.rst +9
-0@@ -31,6 +31,7 @@ Supported devices The virt board supports: - PCI/PCIe devices +- CXL Fixed memory windows, root bridges and devices. - Flash memory - Either one or two PL011 UARTs for the NonSecure World - An RTC@@ -189,6 +190,14 @@ ras acpi Set ``on``/``off``/``auto`` to enable/disable ACPI. +cxl + Set ``on``/``off`` to enable/disable CXL. More details in + :doc:`../devices/cxl`. The default is off. + +cxl-fmw + Array of CXL fixed memory windows describing fixed address routing to + target CXL host bridges. See :doc:`../devices/cxl`. + dtb-randomness Set ``on``/``off`` to pass random seeds via the guest DTB rng-seed and kaslr-seed nodes (in both "/chosen" andinclude/hw/arm/virt.h +4
-0@@ -36,6 +36,7 @@#include "hw/arm/boot.h" #include "hw/arm/bsa.h" #include "hw/block/flash.h" +#include "hw/cxl/cxl.h" #include "system/kvm.h" #include "hw/intc/arm_gicv3_common.h" #include "qom/object.h" @@ -85,6 +86,7 @@ enum {/* indices of IO regions located after the RAM */ enum {VIRT_HIGH_GIC_REDIST2 =VIRT_LOWMEMMAP_LAST , +VIRT_CXL_HOST ,VIRT_HIGH_PCIE_ECAM ,VIRT_HIGH_PCIE_MMIO , };@@ -140,6 +142,7 @@ struct VirtMachineState {bool secure;bool highmem;bool highmem_compact; +bool highmem_cxl;bool highmem_ecam;bool highmem_mmio;bool highmem_redists;@@ -174,6 +177,7 @@ struct VirtMachineState {char *oem_id;char *oem_table_id;bool ns_el2_virt_timer_irq; +CXLState cxl_devices_state; };#define VIRT_ECAM_ID (high) (high ? VIRT_HIGH_PCIE_ECAM : VIRT_PCIE_ECAM)hw/arm/virt-acpi-build.c +34
-0@@ -39,10 +39,12 @@#include "hw/acpi/aml-build.h" #include "hw/acpi/utils.h" #include "hw/acpi/pci.h" +#include "hw/acpi/cxl.h" #include "hw/acpi/memory_hotplug.h" #include "hw/acpi/generic_event_device.h" #include "hw/acpi/tpm.h" #include "hw/acpi/hmat.h" +#include "hw/cxl/cxl.h" #include "hw/pci/pcie_host.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" @@ -119,10 +121,29 @@ static void acpi_dsdt_add_flash(Aml *scope, const MemMapEntry *flash_memmap)aml_append (scope, dev); } +static void build_acpi0017 (Aml *table) +{ +Aml *dev, *scope, *method; + + scope =aml_scope ("_SB" ); + dev =aml_device ("CXLM" ); +aml_append (dev,aml_name_decl ("_HID" ,aml_string ("ACPI0017" ))); + + method =aml_method ("_STA" ,0 ,AML_NOTSERIALIZED ); +aml_append (method,aml_return (aml_int (0x0B ))); +aml_append (dev, method); +build_cxl_dsm_method (dev); + +aml_append (scope, dev); +aml_append (table, scope); +} +static void acpi_dsdt_add_pci (Aml *scope,const MemMapEntry *memmap,uint32_t irq,VirtMachineState *vms) {int ecam_id =VIRT_ECAM_ID (vms->highmem_ecam); +bool cxl_present = false; +PCIBus *bus = vms->bus;struct GPEXConfig cfg = { .mmio32 = memmap[VIRT_PCIE_MMIO ], .pio = memmap[VIRT_PCIE_PIO ],@@ -136,6 +157,14 @@ static void acpi_dsdt_add_pci(Aml *scope, const MemMapEntry *memmap, }acpi_dsdt_add_gpex (scope, &cfg); + QLIST_FOREACH(bus, &vms->bus->child, sibling) { +if (pci_bus_is_cxl (bus)) { + cxl_present = true; + } + } +if (cxl_present) { +build_acpi0017 (scope); + } } static void acpi_dsdt_add_gpio(Aml *scope, const MemMapEntry *gpio_memmap,@@ -963,6 +992,11 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) } } +if (vms->cxl_devices_state.is_enabled) { +cxl_build_cedt (table_offsets, tables_blob, tables->linker, + vms->oem_id, vms->oem_table_id, &vms->cxl_devices_state); + } +if (ms->nvdimms_state->is_enabled) { nvdimm_build_acpi(table_offsets, tables_blob, tables->linker, ms->nvdimms_state, ms->ram_slots, vms->oem_id,hw/arm/virt.c +29
-0@@ -57,6 +57,7 @@#include "qemu/error-report.h" #include "qemu/module.h" #include "hw/pci-host/gpex.h" +#include "hw/pci-bridge/pci_expander_bridge.h" #include "hw/virtio/virtio-pci.h" #include "hw/core/sysbus-fdt.h" #include "hw/platform-bus.h" @@ -86,6 +87,8 @@#include "hw/virtio/virtio-md-pci.h" #include "hw/virtio/virtio-iommu.h" #include "hw/char/pl011.h" +#include "hw/cxl/cxl.h" +#include "hw/cxl/cxl_host.h" #include "qemu/guest-random.h" static GlobalProperty arm_virt_compat[] = {@@ -220,6 +223,7 @@ static const MemMapEntry base_memmap[] = {static MemMapEntry extended_memmap[] = {/* Additional 64 MB redist region (can contain up to 512 redistributors) */ [VIRT_HIGH_GIC_REDIST2 ] = {0x0 ,64 * MiB }, + [VIRT_CXL_HOST ] = {0x0 ,64 * KiB *16 },/* 16 UID */ [VIRT_HIGH_PCIE_ECAM ] = {0x0 ,256 * MiB },/* Second PCIe window */ [VIRT_HIGH_PCIE_MMIO ] = {0x0 ,DEFAULT_HIGH_PCIE_MMIO_SIZE },@@ -1626,6 +1630,17 @@ static void create_pcie(VirtMachineState *vms) } } +static void create_cxl_host_reg_region (VirtMachineState *vms) +{ +MemoryRegion *sysmem =get_system_memory (); +MemoryRegion *mr = &vms->cxl_devices_state.host_mr; + +memory_region_init (mr,OBJECT (vms),"cxl_host_reg" , + vms->memmap[VIRT_CXL_HOST ].size); +memory_region_add_subregion (sysmem, vms->memmap[VIRT_CXL_HOST ].base, mr); + vms->highmem_cxl = true; +} +static void create_platform_bus (VirtMachineState *vms) {DeviceState *dev;@@ -1742,6 +1757,12 @@ void virt_machine_done(Notifier *notifier, void *data)struct arm_boot_info *info = &vms->bootinfo;AddressSpace *as =arm_boot_address_space (cpu, info); +cxl_hook_up_pxb_registers (vms->bus, &vms->cxl_devices_state, + &error_fatal); + +if (vms->cxl_devices_state.is_enabled) { +cxl_fmws_link_targets (&error_fatal); + }/* * If the user provided a dtb, we assume the dynamic sysbus nodes * already are integrated there. This corresponds to a use case where @@ -1788,6 +1809,7 @@ static inline bool *virt_get_high_memmap_enabled(VirtMachineState *vms, {bool *enabled_array[] = { &vms->highmem_redists, + &vms->highmem_cxl, &vms->highmem_ecam, &vms->highmem_mmio, };@@ -1895,6 +1917,9 @@ static void virt_set_memmap(VirtMachineState *vms, int pa_bits)if (device_memory_size >0 ) {machine_memory_devices_init (ms, device_memory_base, device_memory_size); } + vms->highest_gpa =cxl_fmws_set_memmap (ROUND_UP (vms->highest_gpa +1 , +256 * MiB), +BIT_ULL (pa_bits)) -1 ; } static VirtGICType finalize_gic_version_do(const char *accel_name,@@ -2345,6 +2370,8 @@ static void machvirt_init(MachineState *machine)memory_region_add_subregion (sysmem, vms->memmap[VIRT_MEM ].base, machine->ram); +cxl_fmws_update_mmio (); +virt_flash_fdt (vms, sysmem, secure_sysmem ?: sysmem);create_gic (vms, sysmem);@@ -2400,6 +2427,7 @@ static void machvirt_init(MachineState *machine)create_rtc (vms);create_pcie (vms); +create_cxl_host_reg_region (vms);if (has_ged && aarch64 && firmware_loaded &&virt_is_acpi_enabled (vms)) { vms->acpi_dev =create_acpi_ged (vms);@@ -3370,6 +3398,7 @@ static void virt_instance_init(Object *obj) vms->oem_id =g_strndup (ACPI_BUILD_APPNAME6 ,6 ); vms->oem_table_id =g_strndup (ACPI_BUILD_APPNAME8 ,8 ); +cxl_machine_init (obj, &vms->cxl_devices_state); }static const TypeInfo virt_machine_info = {
Re: [PATCH qemu v16 3/5] hw/arm/virt: Basic CXL enablement on pci_expander_bridge instances pxb-cxl
Quoted 9 lines · On Tue, 1 Jul 2025 15:26:26 +0200 Eric Auger <[email protected]> wrote:
Hi Jonathan,
Quoted 5 lines · Jonathan Cameron via
Code based on i386/pc enablement.
The memory layout places space for 16 host bridge register regions after theGIC_REDIST2in the extended memmap. This is a hole in the current map so adding them here has no impact on placement of other memory regions (tested with enough CPUs forGIC_REDIST2to be in use.)
Quoted 3 lines
Doesn't it depend on the init RAM size setting.
if the init RAM top + REDIST2 aligns to a 256MB boundary (size of the PCI ECAM) aren't you likely to have no hole?
Hi Eric,
Is that possible? I think the device_memory_base being force to align to a 1 GiB means that never happens. That seems to occur even if there is no device_memory.
device_memory_base =
ROUND_UP(vms->memmap[VIRT_MEM].base + ms->ram_size, GiB);
device_memory_size = ms->maxram_size - ms->ram_size + ms->ram_slots * GiB;
/* Base address of the high IO region */
memtop = base = device_memory_base + ROUND_UP(device_memory_size, GiB);//So here we are GiB aligned.
...
if (base < vms->memmap[VIRT_MEM].base + LEGACY_RAMLIMIT_BYTES) {
base = vms->memmap[VIRT_MEM].base + LEGACY_RAMLIMIT_BYTES;
}//That's 256 GiB in or leave it alone as more than that but GiB aligned.
/* We know for sure that at least the memory fits in the PA space */
vms->highest_gpa = memtop - 1;
virt_set_high_memmap(vms, base, pa_bits);So I think I'm fine. I should call out that REDIST2 is GiB aligned though in this patch description.
Quoted 7 lines
Quoted 6 lines
The CFMWs are placed above the extended memmap. Note the confusing existing variable
highest_gpais thehighest_gpathat has been allocated at a particular point in setting up the memory map.what kind of improvement would you foresee wrt
highest_gpa?
This was mostly a response to Peter expressed that he was expecting highest_gpa to reflect the limit, not the highest yet seen.
I'm not sure how to resolve that without having awkward naming like highest_gpa_sofar. There are existing comments where it is updated so I'm not thinking we need to change anything for this.
Thanks for taking a look,
Jonathan
Re: [PATCH qemu v16 3/5] hw/arm/virt: Basic CXL enablement on pci_expander_bridge instances pxb-cxl
Hi Jonathan,
Quoted 20 lines · Jonathan Cameron
Quoted 11 lines · On Tue, 1 Jul 2025 15:26:26 +0200 Eric Auger <[email protected]> wrote:
Hi Jonathan,
Quoted 5 lines · Jonathan Cameron via
Code based on i386/pc enablement.
The memory layout places space for 16 host bridge register regions after theGIC_REDIST2in the extended memmap. This is a hole in the current map so adding them here has no impact on placement of other memory regions (tested with enough CPUs forGIC_REDIST2to be in use.)Doesn't it depend on the init RAM size setting.
if the init RAM top + REDIST2 aligns to a 256MB boundary (size of the PCI ECAM) aren't you likely to have no hole?Hi Eric,
Is that possible? I think the
device_memory_basebeing force to align to a 1 GiB means that never happens. That seems to occur even if there is nodevice_memory.
Quoted 7 lines
device_memory_base = ROUND_UP(vms->memmap[VIRT_MEM].base + ms->ram_size, GiB); device_memory_size = ms->maxram_size - ms->ram_size + ms->ram_slots * GiB; /* Base address of the high IO region */ memtop = base = device_memory_base + ROUND_UP(device_memory_size, GiB);//So here we are GiB aligned.
Yes you are totally right, even without device memory, base is 1GiB aligned when entering virt_set_high_memmap. I forgot this alignment enforcement.
So we are good. Sorry for the noise
Quoted 20 lines
...
if (base < vms->memmap[VIRT_MEM].base + LEGACY_RAMLIMIT_BYTES) { base = vms->memmap[VIRT_MEM].base + LEGACY_RAMLIMIT_BYTES; }//That's 256 GiB in or leave it alone as more than that but GiB aligned.
/* We know for sure that at least the memory fits in the PA space */ vms->highest_gpa = memtop - 1; virt_set_high_memmap(vms, base, pa_bits);So I think I'm fine. I should call out that REDIST2 is GiB aligned though in this patch description.
Quoted 4 lines
Quoted 4 lines
The CFMWs are placed above the extended memmap. Note the confusing existing variable
highest_gpais thehighest_gpathat has been allocated at a particular point in setting up the memory map.
Quoted 7 lines
Quoted 1 line
what kind of improvement would you foresee wrt
highest_gpa?This was mostly a response to Peter expressed that he was expecting
highest_gpato reflect the limit, not the highest yet seen.I'm not sure how to resolve that without having awkward naming like
highest_gpa_sofar. There are existing comments where it is updated so I'm not thinking we need to change anything for this.
OK I understand now.
Eric
Quoted 6 lines
Thanks for taking a look,
Jonathan
Re: [PATCH qemu v16 3/5] hw/arm/virt: Basic CXL enablement on pci_expander_bridge instances pxb-cxl
In reply to Jonathan CameronHi Jonathan,
Quoted 11 lines · Jonathan Cameron via
Code based on i386/pc enablement.
The memory layout places space for 16 host bridge register regions after theGIC_REDIST2in the extended memmap. This is a hole in the current map so adding them here has no impact on placement of other memory regions (tested with enough CPUs forGIC_REDIST2to be in use.)The CFMWs are placed above the extended memmap. Note the confusing existing variable
highest_gpais thehighest_gpathat has been allocated at a particular point in setting up the memory map.The cxl_devices_state.host_mr is provides a small space in which to place
s/is//
Quoted 233 lines
the individual host bridge register regions for whatever host bridges are allocated via -device pxb-cxl on the command line. The existing dynamic sysbus infrastructure is not reused because pxb-cxl is a PCI device not a sysbus one but these registers are directly in the main memory map, not the PCI address space.
Only create the CEDT table if cxl=on set for the machine. Default to off.
Signed-off-by Jonathan Cameron <[email protected]>---
v16: Some additional comments on the memory map in the patch description.
Added an 'off by default' statement to he patch description. Updatehighest_gpato include CXL Fixed Memory Windows. It is not used after this point but cleaner to set it anyway.Perhaps unresolved feedback. Peter raised a concern about the direct initialization of
vms->cxl_devices_state.host_mr. I've added more commentary about that to the patch description. Whilst it seems unnecessary I could wrap the relevant 3 lines of code up in a utility function rather than open coding them here and in i386/pc.--- docs/system/arm/virt.rst | 9 +++++++++ include/hw/arm/virt.h | 4 ++++ hw/arm/virt-acpi-build.c | 34 ++++++++++++++++++++++++++++++++++ hw/arm/virt.c | 29 +++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+)docs/system/arm/virt.rst +9
-0@@ -31,6 +31,7 @@ Supported devices The virt board supports: - PCI/PCIe devices +- CXL Fixed memory windows, root bridges and devices. - Flash memory - Either one or two PL011 UARTs for the NonSecure World - An RTC@@ -189,6 +190,14 @@ ras acpi Set ``on``/``off``/``auto`` to enable/disable ACPI. +cxl + Set ``on``/``off`` to enable/disable CXL. More details in + :doc:`../devices/cxl`. The default is off. + +cxl-fmw + Array of CXL fixed memory windows describing fixed address routing to + target CXL host bridges. See :doc:`../devices/cxl`. + dtb-randomness Set ``on``/``off`` to pass random seeds via the guest DTB rng-seed and kaslr-seed nodes (in both "/chosen" andinclude/hw/arm/virt.h +4
-0@@ -36,6 +36,7 @@#include "hw/arm/boot.h" #include "hw/arm/bsa.h" #include "hw/block/flash.h" +#include "hw/cxl/cxl.h" #include "system/kvm.h" #include "hw/intc/arm_gicv3_common.h" #include "qom/object.h" @@ -85,6 +86,7 @@ enum {/* indices of IO regions located after the RAM */ enum {VIRT_HIGH_GIC_REDIST2 =VIRT_LOWMEMMAP_LAST , +VIRT_CXL_HOST ,VIRT_HIGH_PCIE_ECAM ,VIRT_HIGH_PCIE_MMIO , };@@ -140,6 +142,7 @@ struct VirtMachineState {bool secure;bool highmem;bool highmem_compact; +bool highmem_cxl;bool highmem_ecam;bool highmem_mmio;bool highmem_redists;@@ -174,6 +177,7 @@ struct VirtMachineState {char *oem_id;char *oem_table_id;bool ns_el2_virt_timer_irq; +CXLState cxl_devices_state; };#define VIRT_ECAM_ID (high) (high ? VIRT_HIGH_PCIE_ECAM : VIRT_PCIE_ECAM)hw/arm/virt-acpi-build.c +34
-0@@ -39,10 +39,12 @@#include "hw/acpi/aml-build.h" #include "hw/acpi/utils.h" #include "hw/acpi/pci.h" +#include "hw/acpi/cxl.h" #include "hw/acpi/memory_hotplug.h" #include "hw/acpi/generic_event_device.h" #include "hw/acpi/tpm.h" #include "hw/acpi/hmat.h" +#include "hw/cxl/cxl.h" #include "hw/pci/pcie_host.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" @@ -119,10 +121,29 @@ static void acpi_dsdt_add_flash(Aml *scope, const MemMapEntry *flash_memmap)aml_append (scope, dev); } +static void build_acpi0017 (Aml *table) +{ +Aml *dev, *scope, *method; + + scope =aml_scope ("_SB" ); + dev =aml_device ("CXLM" ); +aml_append (dev,aml_name_decl ("_HID" ,aml_string ("ACPI0017" ))); + + method =aml_method ("_STA" ,0 ,AML_NOTSERIALIZED ); +aml_append (method,aml_return (aml_int (0x0B ))); +aml_append (dev, method); +build_cxl_dsm_method (dev); + +aml_append (scope, dev); +aml_append (table, scope); +} +static void acpi_dsdt_add_pci (Aml *scope,const MemMapEntry *memmap,uint32_t irq,VirtMachineState *vms) {int ecam_id =VIRT_ECAM_ID (vms->highmem_ecam); +bool cxl_present = false; +PCIBus *bus = vms->bus;struct GPEXConfig cfg = { .mmio32 = memmap[VIRT_PCIE_MMIO ], .pio = memmap[VIRT_PCIE_PIO ],@@ -136,6 +157,14 @@ static void acpi_dsdt_add_pci(Aml *scope, const MemMapEntry *memmap, }acpi_dsdt_add_gpex (scope, &cfg); + QLIST_FOREACH(bus, &vms->bus->child, sibling) { +if (pci_bus_is_cxl (bus)) { + cxl_present = true; + } + } +if (cxl_present) { +build_acpi0017 (scope); + } } static void acpi_dsdt_add_gpio(Aml *scope, const MemMapEntry *gpio_memmap,@@ -963,6 +992,11 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) } } +if (vms->cxl_devices_state.is_enabled) { +cxl_build_cedt (table_offsets, tables_blob, tables->linker, + vms->oem_id, vms->oem_table_id, &vms->cxl_devices_state); + } +if (ms->nvdimms_state->is_enabled) { nvdimm_build_acpi(table_offsets, tables_blob, tables->linker, ms->nvdimms_state, ms->ram_slots, vms->oem_id,hw/arm/virt.c +22
-0@@ -57,6 +57,7 @@#include "qemu/error-report.h" #include "qemu/module.h" #include "hw/pci-host/gpex.h" +#include "hw/pci-bridge/pci_expander_bridge.h" #include "hw/virtio/virtio-pci.h" #include "hw/core/sysbus-fdt.h" #include "hw/platform-bus.h" @@ -86,6 +87,8 @@#include "hw/virtio/virtio-md-pci.h" #include "hw/virtio/virtio-iommu.h" #include "hw/char/pl011.h" +#include "hw/cxl/cxl.h" +#include "hw/cxl/cxl_host.h" #include "qemu/guest-random.h" static GlobalProperty arm_virt_compat[] = {@@ -220,6 +223,7 @@ static const MemMapEntry base_memmap[] = {static MemMapEntry extended_memmap[] = {/* Additional 64 MB redist region (can contain up to 512 redistributors) */ [VIRT_HIGH_GIC_REDIST2 ] = {0x0 ,64 * MiB }, + [VIRT_CXL_HOST ] = {0x0 ,64 * KiB *16 },/* 16 UID */ [VIRT_HIGH_PCIE_ECAM ] = {0x0 ,256 * MiB },/* Second PCIe window */ [VIRT_HIGH_PCIE_MMIO ] = {0x0 ,DEFAULT_HIGH_PCIE_MMIO_SIZE },@@ -1626,6 +1630,17 @@ static void create_pcie(VirtMachineState *vms) } } +static void create_cxl_host_reg_region (VirtMachineState *vms) +{ +MemoryRegion *sysmem =get_system_memory (); +MemoryRegion *mr = &vms->cxl_devices_state.host_mr; + +memory_region_init (mr,OBJECT (vms),"cxl_host_reg" , + vms->memmap[VIRT_CXL_HOST ].size); +memory_region_add_subregion (sysmem, vms->memmap[VIRT_CXL_HOST ].base, mr); + vms->highmem_cxl = true; +} +static void create_platform_bus (VirtMachineState *vms) {DeviceState *dev;@@ -1742,6 +1757,12 @@ void virt_machine_done(Notifier *notifier, void *data)struct arm_boot_info *info = &vms->bootinfo;AddressSpace *as =arm_boot_address_space (cpu, info); +cxl_hook_up_pxb_registers (vms->bus, &vms->cxl_devices_state, + &error_fatal); + +if (vms->cxl_devices_state.is_enabled) { +cxl_fmws_link_targets (&error_fatal); + }/* * If the user provided a dtb, we assume the dynamic sysbus nodes * already are integrated there. This corresponds to a use case where @@ -1788,6 +1809,7 @@ static inline bool *virt_get_high_memmap_enabled(VirtMachineState *vms, {bool *enabled_array[] = { &vms->highmem_redists, + &vms->highmem_cxl, &vms->highmem_ecam, &vms->highmem_mmio, };
hw/arm/virt.c static void virt_set_memmap(VirtMachineState *vms, int pa_bits) · line 1922
Quoted 6 lines
hw/arm/virt.c +3
-0@@ -1895,6 +1917,9 @@ static void virt_set_memmap(VirtMachineState *vms, int pa_bits)if (device_memory_size >0 ) {machine_memory_devices_init (ms, device_memory_base, device_memory_size); } + vms->highest_gpa =cxl_fmws_set_memmap (ROUND_UP (vms->highest_gpa +1 , +256 * MiB), +BIT_ULL (pa_bits)) -1 ;
in hw/cxl/cxl-host.c, there seems to be a loop on fw windows? I guess those windows only exist if cxl option is set. In the positive, highest_gpa will be changed only if the option is set, which is fine. Indeed we have requested_ipa_size = 64 - clz64(vms->highest_gpa). So we shall not modify this if cxl is not set.
What I am a bit concerned with is that it"consumes" some high memory without making it explicit in extended_memmap. Shouldn't we book some dedicated space there? Sorry I am jumping very late in the review, maybe turning things worse & noisy :-( Eric
Quoted 28 lines
hw/arm/virt.c +4
-0} static VirtGICType finalize_gic_version_do(const char *accel_name,@@ -2345,6 +2370,8 @@ static void machvirt_init(MachineState *machine)memory_region_add_subregion (sysmem, vms->memmap[VIRT_MEM ].base, machine->ram); +cxl_fmws_update_mmio (); +virt_flash_fdt (vms, sysmem, secure_sysmem ?: sysmem);create_gic (vms, sysmem);@@ -2400,6 +2427,7 @@ static void machvirt_init(MachineState *machine)create_rtc (vms);create_pcie (vms); +create_cxl_host_reg_region (vms);if (has_ged && aarch64 && firmware_loaded &&virt_is_acpi_enabled (vms)) { vms->acpi_dev =create_acpi_ged (vms);@@ -3370,6 +3398,7 @@ static void virt_instance_init(Object *obj) vms->oem_id =g_strndup (ACPI_BUILD_APPNAME6 ,6 ); vms->oem_table_id =g_strndup (ACPI_BUILD_APPNAME8 ,8 ); +cxl_machine_init (obj, &vms->cxl_devices_state); }static const TypeInfo virt_machine_info = {
Re: [PATCH qemu v16 3/5] hw/arm/virt: Basic CXL enablement on pci_expander_bridge instances pxb-cxl
Quoted 9 lines · On Tue, 1 Jul 2025 17:34:36 +0200 Eric Auger <[email protected]> wrote:
Hi Jonathan,
Quoted 6 lines · Jonathan Cameron via
Code based on i386/pc enablement.
The memory layout places space for 16 host bridge register regions after theGIC_REDIST2in the extended memmap. This is a hole in the current map so adding them here has no impact on placement of other memory regions (tested with enough CPUs forGIC_REDIST2to be in use.)
Quoted 6 lines
Quoted 5 lines
The CFMWs are placed above the extended memmap. Note the confusing existing variable
highest_gpais thehighest_gpathat has been allocated at a particular point in setting up the memory map.The cxl_devices_state.host_mr is provides a small space in which to place
s/is//
Fixed. Thanks.
Quoted 24 lines
Quoted 12 lines
the individual host bridge register regions for whatever host bridges are allocated via -device pxb-cxl on the command line. The existing dynamic sysbus infrastructure is not reused because pxb-cxl is a PCI device not a sysbus one but these registers are directly in the main memory map, not the PCI address space.
Only create the CEDT table if cxl=on set for the machine. Default to off.
Signed-off-by Jonathan Cameron <[email protected]>---
hw/arm/virt.c static void virt_set_memmap(VirtMachineState *vms, int pa_bits) · line 1922
Quoted 6 lines
hw/arm/virt.c +3
-0@@ -1895,6 +1917,9 @@ static void virt_set_memmap(VirtMachineState *vms, int pa_bits)if (device_memory_size >0 ) {machine_memory_devices_init (ms, device_memory_base, device_memory_size); } + vms->highest_gpa =cxl_fmws_set_memmap (ROUND_UP (vms->highest_gpa +1 , +256 * MiB), +BIT_ULL (pa_bits)) -1 ;in
hw/cxl/cxl-host.c, there seems to be a loop on fw windows? I guess those windows only exist if cxl option is set. In the positive,highest_gpawill be changed only if the option is set, which is fine. Indeed we haverequested_ipa_size= 64 -clz64(vms->highest_gpa). So we shall not modify this if cxl is not set.
Quoted 4 lines
What I am a bit concerned with is that it"consumes" some high memory without making it explicit in
extended_memmap. Shouldn't we book some dedicated space there? Sorry I am jumping very late in the review, maybe turning things worse & noisy :-( Eric
No problem with late review - whilst it looks late we had a several year gap at one point in updating this series!
How much to book? It's effectively infinite much like device memory. Would be odd to book the minimum which is 256MiB given any useful system is going to have a lot more than that (they are usually a few TiB but may be much larger than that).
Would a comment after
[VIRT_HIGH_PCIE_MMIO] = { 0x0, DEFAULT_HIGH_PCIE_MMIO_SIZE },
such as
/* Any CXL Fixed memory windows come here */
be enough?
Re: [PATCH qemu v16 3/5] hw/arm/virt: Basic CXL enablement on pci_expander_bridge instances pxb-cxl
Hi Jonathan,
Quoted 12 lines · Jonathan Cameron
Quoted 9 lines · On Tue, 1 Jul 2025 17:34:36 +0200 Eric Auger <[email protected]> wrote:
Hi Jonathan,
Quoted 6 lines · Jonathan Cameron via
Code based on i386/pc enablement.
The memory layout places space for 16 host bridge register regions after theGIC_REDIST2in the extended memmap. This is a hole in the current map so adding them here has no impact on placement of other memory regions (tested with enough CPUs forGIC_REDIST2to be in use.)
Quoted 29 lines
Quoted 6 lines
Quoted 5 lines
The CFMWs are placed above the extended memmap. Note the confusing existing variable
highest_gpais thehighest_gpathat has been allocated at a particular point in setting up the memory map.The cxl_devices_state.host_mr is provides a small space in which to place
s/is//
Fixed. Thanks.
Quoted 22 lines
Quoted 11 lines
the individual host bridge register regions for whatever host bridges are allocated via -device pxb-cxl on the command line. The existing dynamic sysbus infrastructure is not reused because pxb-cxl is a PCI device not a sysbus one but these registers are directly in the main memory map, not the PCI address space.
Only create the CEDT table if cxl=on set for the machine. Default to off.
Signed-off-by Jonathan Cameron <[email protected]>---
hw/arm/virt.c static void virt_set_memmap(VirtMachineState *vms, int pa_bits) · line 1922
Quoted 6 lines
hw/arm/virt.c +3
-0@@ -1895,6 +1917,9 @@ static void virt_set_memmap(VirtMachineState *vms, int pa_bits)if (device_memory_size >0 ) {machine_memory_devices_init (ms, device_memory_base, device_memory_size); } + vms->highest_gpa =cxl_fmws_set_memmap (ROUND_UP (vms->highest_gpa +1 , +256 * MiB), +BIT_ULL (pa_bits)) -1 ;in
hw/cxl/cxl-host.c, there seems to be a loop on fw windows? I guess those windows only exist if cxl option is set. In the positive,highest_gpawill be changed only if the option is set, which is fine. Indeed we haverequested_ipa_size= 64 -clz64(vms->highest_gpa). So we shall not modify this if cxl is not set.
so do you confirm highest_gpa is unchanged in case cxl/fmw option is not set ?
Quoted 13 lines
Quoted 5 lines
What I am a bit concerned with is that it"consumes" some high memory without making it explicit in
extended_memmap. Shouldn't we book some dedicated space there? Sorry I am jumping very late in the review, maybe turning things worse & noisy :-( EricNo problem with late review - whilst it looks late we had a several year gap at one point in updating this series!
How much to book? It's effectively infinite much like device memory. Would be odd to book the minimum which is 256MiB given any useful system is going to have a lot more than that (they are usually a few TiB but may be much larger than that).
Quoted 5 lines
Would a comment after
[VIRT_HIGH_PCIE_MMIO] = {0x0,DEFAULT_HIGH_PCIE_MMIO_SIZE},
such as
/* Any CXL Fixed memory windows come here */
be enough?
yes at least it deserves a comment I think. Then it must be understood that it may prevent new regions from being added in the high mem range. I am definitively not the most knowledgeable guy to decide whether it is critical. I have not checked CCA impact on the layout for instance.
Thanks
Eric
Quoted 3 lines
Re: [PATCH qemu v16 3/5] hw/arm/virt: Basic CXL enablement on pci_expander_bridge instances pxb-cxl
Quoted 63 lines · On Tue, 1 Jul 2025 18:12:39 +0200 Eric Auger <[email protected]> wrote:
Hi Jonathan,
Quoted 12 lines · Jonathan Cameron
Quoted 9 lines · On Tue, 1 Jul 2025 17:34:36 +0200 Eric Auger <[email protected]> wrote:
Hi Jonathan,
Quoted 6 lines · Jonathan Cameron via
Code based on i386/pc enablement.
The memory layout places space for 16 host bridge register regions after theGIC_REDIST2in the extended memmap. This is a hole in the current map so adding them here has no impact on placement of other memory regions (tested with enough CPUs forGIC_REDIST2to be in use.)Quoted 29 lines
Quoted 6 lines
Quoted 5 lines
The CFMWs are placed above the extended memmap. Note the confusing existing variable
highest_gpais thehighest_gpathat has been allocated at a particular point in setting up the memory map.The cxl_devices_state.host_mr is provides a small space in which to place
s/is//
Fixed. Thanks.
Quoted 22 lines
Quoted 11 lines
the individual host bridge register regions for whatever host bridges are allocated via -device pxb-cxl on the command line. The existing dynamic sysbus infrastructure is not reused because pxb-cxl is a PCI device not a sysbus one but these registers are directly in the main memory map, not the PCI address space.
Only create the CEDT table if cxl=on set for the machine. Default to off.
Signed-off-by Jonathan Cameron <[email protected]>---
hw/arm/virt.c static void virt_set_memmap(VirtMachineState *vms, int pa_bits) · line 1922
Quoted 6 lines
hw/arm/virt.c +3
-0@@ -1895,6 +1917,9 @@ static void virt_set_memmap(VirtMachineState *vms, int pa_bits)if (device_memory_size >0 ) {machine_memory_devices_init (ms, device_memory_base, device_memory_size); } + vms->highest_gpa =cxl_fmws_set_memmap (ROUND_UP (vms->highest_gpa +1 , +256 * MiB), +BIT_ULL (pa_bits)) -1 ;in
hw/cxl/cxl-host.c, there seems to be a loop on fw windows? I guess those windows only exist if cxl option is set. In the positive,highest_gpawill be changed only if the option is set, which is fine. Indeed we haverequested_ipa_size= 64 -clz64(vms->highest_gpa). So we shall not modify this if cxl is not set.so do you confirm
highest_gpais unchanged in case cxl/fmw option is not set ?Quoted 13 lines
Quoted 5 lines
What I am a bit concerned with is that it"consumes" some high memory without making it explicit in
extended_memmap. Shouldn't we book some dedicated space there? Sorry I am jumping very late in the review, maybe turning things worse & noisy :-( EricNo problem with late review - whilst it looks late we had a several year gap at one point in updating this series!
How much to book? It's effectively infinite much like device memory. Would be odd to book the minimum which is 256MiB given any useful system is going to have a lot more than that (they are usually a few TiB but may be much larger than that).
Quoted 5 lines
Would a comment after
[VIRT_HIGH_PCIE_MMIO] = {0x0,DEFAULT_HIGH_PCIE_MMIO_SIZE},
such as
/* Any CXL Fixed memory windows come here */
be enough?
Quoted 4 lines
yes at least it deserves a comment I think. Then it must be understood that it may prevent new regions from being added in the high mem range. I am definitively not the most knowledgeable guy to decide whether it is critical. I have not checked CCA impact on the layout for instance.
Current CXL isn't migratable but when we fix that I guess this will mean that we need to version any new features that need space in the high memory map to only be enabled on newer machines if CXL is also enabled. For now migration isn't relevant to CXL/qemu usecases but it soon will be.
Jonathan
Quoted 9 lines
Thanks
Eric
Quoted 3 lines
PATCH v16 4/5 docs/cxl: Add an arm/virt example.
In reply to Jonathan CameronOnly add one very simple example as all the i386/pc examples will work for arm/virt with a change to appropriate executable and appropriate standard launch line for arm/virt. Note that max cpu is used to ensure we have plenty of physical address space.
--- docs/system/devices/cxl.rst | 10 ++++++++++ 1 file changed, 10 insertions(+)
docs/system/devices/cxl.rst +10 -0
@@ -384,6 +384,16 @@ An example of 4 devices below a switch suitable for 1, 2 or 4 way interleave:: -device cxl-type3,bus=swport3,persistent-memdev=cxl-mem3,lsa=cxl-lsa3,id=cxl-pmem3,sn=0x4 \ -M cxl-fmw.0.targets.0=cxl.1,cxl-fmw.0.size=4G,cxl-fmw.0.interleave-granularity=4k +A simple arm/virt example:: + + qemu-system-aarch64 -M virt,gic-version=3,cxl=on -m 4g,maxmem=8g,slots=4 -cpu max -smp 4 \ + ... + -object memory-backend-ram,id=vmem0,share=on,size=256M \ + -device pxb-cxl,bus_nr=12,bus=pcie.0,id=cxl.1 \ + -device cxl-rp,port=0,bus=cxl.1,id=root_port13,chassis=0,slot=2 \ + -device cxl-type3,bus=root_port13,volatile-memdev=vmem0,id=cxl-vmem0 \ + -M cxl-fmw.0.targets.0=cxl.1,cxl-fmw.0.size=4G + Deprecations ------------
Signature · 1 line
2.48.1
Re: [PATCH qemu v16 4/5] docs/cxl: Add an arm/virt example.
Hi Jonathan,
Quoted 18 lines · Jonathan Cameron via
Only add one very simple example as all the i386/pc examples will work for arm/virt with a change to appropriate executable and appropriate standard launch line for arm/virt. Note that max cpu is used to ensure we have plenty of physical address space.
Suggested-by Peter Maydell <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>--- docs/system/devices/cxl.rst | 10 ++++++++++ 1 file changed, 10 insertions(+)docs/system/devices/cxl.rst +0
-0@@ -384,6 +384,16 @@ An example of 4 devices below a switch suitable for 1, 2 or 4 way interleave:: -device cxl-type3,bus=swport3,persistent-memdev=cxl-mem3,lsa=cxl-lsa3,id=cxl-pmem3,sn=0x4 \ -M cxl-fmw.0.targets.0=cxl.1,cxl-fmw.0.size=4G,cxl-fmw.0.interleave-granularity=4k
docs/system/devices/cxl.rst An example of 4 devices below a switch suitable for 1, 2 or 4 way interleave:: · line 395
Quoted 10 lines
docs/system/devices/cxl.rst +9
-0+A simple arm/virt example:: + + qemu-system-aarch64 -M virt,gic-version=3,cxl=on -m 4g,maxmem=8g,slots=4 -cpu max -smp 4 \ + ... + -object memory-backend-ram,id=vmem0,share=on,size=256M \ + -device pxb-cxl,bus_nr=12,bus=pcie.0,id=cxl.1 \ + -device cxl-rp,port=0,bus=cxl.1,id=root_port13,chassis=0,slot=2 \ + -device cxl-type3,bus=root_port13,volatile-memdev=vmem0,id=cxl-vmem0 \ + -M cxl-fmw.0.targets.0=cxl.1,cxl-fmw.0.size=4G
Matches the x86 identifical example entitled "A very simple setup with just one directly attached CXL Type 3 Volatile Memory device"
nit: in case you need to respin you can add something like "featuring a CXL Type 3 Volatile Memory device"
Eric
Quoted 4 lines
docs/system/devices/cxl.rst +1
-0+ Deprecations ------------
PATCH v16 5/5 qtest/cxl: Add aarch64 virt test for CXL
In reply to Jonathan CameronAdd a single complex case for aarch64 virt machine. Given existing much more comprehensive tests for x86 cover the common functionality, a single test should be enough to verify that the aarch64 part continue to work.
---
v16: Update to bring improvements made to other tests (Peter Maydell).
I'd failed to notice when rebasing this over time that the other tests had undergone various improvment and I should have updated this one as well.
--- tests/qtest/cxl-test.c | 58 ++++++++++++++++++++++++++++++++--------- tests/qtest/meson.build | 1 + 2 files changed, 46 insertions(+), 13 deletions(-)
tests/qtest/cxl-test.c +45 -13
@@ -19,6 +19,12 @@"-device pxb-cxl,id=cxl.1,bus=pcie.0,bus_nr=53 " \ "-M cxl-fmw.0.targets.0=cxl.0,cxl-fmw.0.targets.1=cxl.1,cxl-fmw.0.size=4G " +#define QEMU_VIRT_2PXB_CMD \ + "-machine virt,cxl=on -cpu max " \ + "-device pxb-cxl,id=cxl.0,bus=pcie.0,bus_nr=52 " \ + "-device pxb-cxl,id=cxl.1,bus=pcie.0,bus_nr=53 " \ + "-M cxl-fmw.0.targets.0=cxl.0,cxl-fmw.0.targets.1=cxl.1,cxl-fmw.0.size=4G " +#define QEMU_RP \ "-device cxl-rp,id=rp0,bus=cxl.0,chassis=0,slot=0 "
@@ -197,25 +203,51 @@ static void cxl_2pxb_4rp_4t3d(void)qtest_end ();rmdir (tmpfs); } + +static void cxl_virt_2pxb_4rp_4t3d (void ) +{ +g_autoptr (GString) cmdline =g_string_new (NULL ); + g_autofree const char *tmpfs = NULL; + + tmpfs =g_dir_make_tmp ("cxl-test-XXXXXX" ,NULL ); + + g_string_printf(cmdline, QEMU_VIRT_2PXB_CMD QEMU_4RP QEMU_4T3D, + tmpfs, tmpfs, tmpfs, tmpfs, tmpfs, tmpfs, + tmpfs, tmpfs); + +qtest_start (cmdline->str); +qtest_end (); +rmdir (tmpfs); +}#endif /* CONFIG_POSIX */ int main (int argc,char **argv) { -g_test_init (&argc, &argv,NULL ); +const char *arch =qtest_get_arch (); -qtest_add_func ("/pci/cxl/basic_hostbridge" , cxl_basic_hb); -qtest_add_func ("/pci/cxl/basic_pxb" , cxl_basic_pxb); -qtest_add_func ("/pci/cxl/pxb_with_window" , cxl_pxb_with_window); -qtest_add_func ("/pci/cxl/pxb_x2_with_window" , cxl_2pxb_with_window); -qtest_add_func ("/pci/cxl/rp" , cxl_root_port); -qtest_add_func ("/pci/cxl/rp_x2" , cxl_2root_port); +g_test_init (&argc, &argv,NULL ); +if (strcmp (arch,"i386" ) ==0 ||strcmp (arch,"x86_64" ) ==0 ) { +qtest_add_func ("/pci/cxl/basic_hostbridge" , cxl_basic_hb); +qtest_add_func ("/pci/cxl/basic_pxb" , cxl_basic_pxb); +qtest_add_func ("/pci/cxl/pxb_with_window" , cxl_pxb_with_window); +qtest_add_func ("/pci/cxl/pxb_x2_with_window" , cxl_2pxb_with_window); +qtest_add_func ("/pci/cxl/rp" , cxl_root_port); +qtest_add_func ("/pci/cxl/rp_x2" , cxl_2root_port);#ifdef CONFIG_POSIX -qtest_add_func ("/pci/cxl/type3_device" , cxl_t3d_deprecated); -qtest_add_func ("/pci/cxl/type3_device_pmem" , cxl_t3d_persistent); -qtest_add_func ("/pci/cxl/type3_device_vmem" , cxl_t3d_volatile); -qtest_add_func ("/pci/cxl/type3_device_vmem_lsa" , cxl_t3d_volatile_lsa); -qtest_add_func ("/pci/cxl/rp_x2_type3_x2" , cxl_1pxb_2rp_2t3d); -qtest_add_func ("/pci/cxl/pxb_x2_root_port_x4_type3_x4" , cxl_2pxb_4rp_4t3d); +qtest_add_func ("/pci/cxl/type3_device" , cxl_t3d_deprecated); +qtest_add_func ("/pci/cxl/type3_device_pmem" , cxl_t3d_persistent); +qtest_add_func ("/pci/cxl/type3_device_vmem" , cxl_t3d_volatile); +qtest_add_func ("/pci/cxl/type3_device_vmem_lsa" , cxl_t3d_volatile_lsa); +qtest_add_func ("/pci/cxl/rp_x2_type3_x2" , cxl_1pxb_2rp_2t3d); +qtest_add_func ("/pci/cxl/pxb_x2_root_port_x4_type3_x4" , + cxl_2pxb_4rp_4t3d);#endif + }else if (strcmp (arch,"aarch64" ) ==0 ) { +#ifdef CONFIG_POSIX +qtest_add_func ("/pci/cxl/virt/pxb_x2_root_port_x4_type3_x4" , + cxl_virt_2pxb_4rp_4t3d); +#endif + } +return g_test_run (); }
tests/qtest/meson.build +1 -0
@@ -261,6 +261,7 @@ qtests_aarch64 = \ config_all_devices.has_key('CONFIG_TPM_TIS_I2C') ? ['tpm-tis-i2c-test'] : []) + \ (config_all_devices.has_key('CONFIG_ASPEED_SOC') ? qtests_aspeed64 : []) + \ (config_all_devices.has_key('CONFIG_NPCM8XX') ? qtests_npcm8xx : []) + \ + qtests_cxl + \ ['arm-cpu-features', 'numa-test', 'boot-serial-test',
Signature · 1 line
2.48.1
Re: [PATCH qemu v16 5/5] qtest/cxl: Add aarch64 virt test for CXL
Quoted 105 lines · Jonathan Cameron
Add a single complex case for aarch64 virt machine. Given existing much more comprehensive tests for x86 cover the common functionality, a single test should be enough to verify that the aarch64 part continue to work.
Tested-by Itaru Kitayama <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>---
v16: Update to bring improvements made to other tests (Peter Maydell).
I'd failed to notice when rebasing this over time that the other tests had undergone various improvment and I should have updated this one as well.--- tests/qtest/cxl-test.c | 58 ++++++++++++++++++++++++++++++++--------- tests/qtest/meson.build | 1 + 2 files changed, 46 insertions(+), 13 deletions(-)tests/qtest/cxl-test.c +45
-13@@ -19,6 +19,12 @@"-device pxb-cxl,id=cxl.1,bus=pcie.0,bus_nr=53 " \ "-M cxl-fmw.0.targets.0=cxl.0,cxl-fmw.0.targets.1=cxl.1,cxl-fmw.0.size=4G " +#define QEMU_VIRT_2PXB_CMD \ + "-machine virt,cxl=on -cpu max " \ + "-device pxb-cxl,id=cxl.0,bus=pcie.0,bus_nr=52 " \ + "-device pxb-cxl,id=cxl.1,bus=pcie.0,bus_nr=53 " \ + "-M cxl-fmw.0.targets.0=cxl.0,cxl-fmw.0.targets.1=cxl.1,cxl-fmw.0.size=4G " +#define QEMU_RP \ "-device cxl-rp,id=rp0,bus=cxl.0,chassis=0,slot=0 "@@ -197,25 +203,51 @@ static void cxl_2pxb_4rp_4t3d(void)qtest_end ();rmdir (tmpfs); } + +static void cxl_virt_2pxb_4rp_4t3d (void ) +{ +g_autoptr (GString) cmdline =g_string_new (NULL ); + g_autofree const char *tmpfs = NULL; + + tmpfs =g_dir_make_tmp ("cxl-test-XXXXXX" ,NULL ); + + g_string_printf(cmdline, QEMU_VIRT_2PXB_CMD QEMU_4RP QEMU_4T3D, + tmpfs, tmpfs, tmpfs, tmpfs, tmpfs, tmpfs, + tmpfs, tmpfs); + +qtest_start (cmdline->str); +qtest_end (); +rmdir (tmpfs); +}#endif /* CONFIG_POSIX */ int main (int argc,char **argv) { -g_test_init (&argc, &argv,NULL ); +const char *arch =qtest_get_arch (); -qtest_add_func ("/pci/cxl/basic_hostbridge" , cxl_basic_hb); -qtest_add_func ("/pci/cxl/basic_pxb" , cxl_basic_pxb); -qtest_add_func ("/pci/cxl/pxb_with_window" , cxl_pxb_with_window); -qtest_add_func ("/pci/cxl/pxb_x2_with_window" , cxl_2pxb_with_window); -qtest_add_func ("/pci/cxl/rp" , cxl_root_port); -qtest_add_func ("/pci/cxl/rp_x2" , cxl_2root_port); +g_test_init (&argc, &argv,NULL ); +if (strcmp (arch,"i386" ) ==0 ||strcmp (arch,"x86_64" ) ==0 ) { +qtest_add_func ("/pci/cxl/basic_hostbridge" , cxl_basic_hb); +qtest_add_func ("/pci/cxl/basic_pxb" , cxl_basic_pxb); +qtest_add_func ("/pci/cxl/pxb_with_window" , cxl_pxb_with_window); +qtest_add_func ("/pci/cxl/pxb_x2_with_window" , cxl_2pxb_with_window); +qtest_add_func ("/pci/cxl/rp" , cxl_root_port); +qtest_add_func ("/pci/cxl/rp_x2" , cxl_2root_port);#ifdef CONFIG_POSIX -qtest_add_func ("/pci/cxl/type3_device" , cxl_t3d_deprecated); -qtest_add_func ("/pci/cxl/type3_device_pmem" , cxl_t3d_persistent); -qtest_add_func ("/pci/cxl/type3_device_vmem" , cxl_t3d_volatile); -qtest_add_func ("/pci/cxl/type3_device_vmem_lsa" , cxl_t3d_volatile_lsa); -qtest_add_func ("/pci/cxl/rp_x2_type3_x2" , cxl_1pxb_2rp_2t3d); -qtest_add_func ("/pci/cxl/pxb_x2_root_port_x4_type3_x4" , cxl_2pxb_4rp_4t3d); +qtest_add_func ("/pci/cxl/type3_device" , cxl_t3d_deprecated); +qtest_add_func ("/pci/cxl/type3_device_pmem" , cxl_t3d_persistent); +qtest_add_func ("/pci/cxl/type3_device_vmem" , cxl_t3d_volatile); +qtest_add_func ("/pci/cxl/type3_device_vmem_lsa" , cxl_t3d_volatile_lsa); +qtest_add_func ("/pci/cxl/rp_x2_type3_x2" , cxl_1pxb_2rp_2t3d); +qtest_add_func ("/pci/cxl/pxb_x2_root_port_x4_type3_x4" , + cxl_2pxb_4rp_4t3d);#endif + }else if (strcmp (arch,"aarch64" ) ==0 ) { +#ifdef CONFIG_POSIX +qtest_add_func ("/pci/cxl/virt/pxb_x2_root_port_x4_type3_x4" , + cxl_virt_2pxb_4rp_4t3d); +#endif + } +return g_test_run (); }tests/qtest/meson.build +0
-0
tests/qtest/meson.build qtests_aarch64 = \ · line 267
Quoted 7 lines
tests/qtest/meson.build +1
-0@@ -261,6 +261,7 @@ qtests_aarch64 = \ config_all_devices.has_key('CONFIG_TPM_TIS_I2C') ? ['tpm-tis-i2c-test'] : []) + \ (config_all_devices.has_key('CONFIG_ASPEED_SOC') ? qtests_aspeed64 : []) + \ (config_all_devices.has_key('CONFIG_NPCM8XX') ? qtests_npcm8xx : []) + \ + qtests_cxl + \ ['arm-cpu-features', 'numa-test', 'boot-serial-test',
The v16 series was applied cleanly against the master today and did meson test qtest-aarch64/cxl-test it went ok.
Thanks,
Itaru.
Quoted 3 lines
Signature · 1 line
2.48.1
Re: [PATCH qemu v16 5/5] qtest/cxl: Add aarch64 virt test for CXL
In reply to Jonathan CameronQuoted 4 lines · Jonathan Cameron via
Add a single complex case for aarch64 virt machine. Given existing much more comprehensive tests for x86 cover the common functionality, a single test should be enough to verify that the aarch64 part continue to work.
nit: continues
Quoted 3 lines
Tested-by Itaru Kitayama <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>
Eric
Quoted 105 lines
---
v16: Update to bring improvements made to other tests (Peter Maydell).
I'd failed to notice when rebasing this over time that the other tests had undergone various improvment and I should have updated this one as well.--- tests/qtest/cxl-test.c | 58 ++++++++++++++++++++++++++++++++--------- tests/qtest/meson.build | 1 + 2 files changed, 46 insertions(+), 13 deletions(-)tests/qtest/cxl-test.c +45
-13@@ -19,6 +19,12 @@"-device pxb-cxl,id=cxl.1,bus=pcie.0,bus_nr=53 " \ "-M cxl-fmw.0.targets.0=cxl.0,cxl-fmw.0.targets.1=cxl.1,cxl-fmw.0.size=4G " +#define QEMU_VIRT_2PXB_CMD \ + "-machine virt,cxl=on -cpu max " \ + "-device pxb-cxl,id=cxl.0,bus=pcie.0,bus_nr=52 " \ + "-device pxb-cxl,id=cxl.1,bus=pcie.0,bus_nr=53 " \ + "-M cxl-fmw.0.targets.0=cxl.0,cxl-fmw.0.targets.1=cxl.1,cxl-fmw.0.size=4G " +#define QEMU_RP \ "-device cxl-rp,id=rp0,bus=cxl.0,chassis=0,slot=0 "@@ -197,25 +203,51 @@ static void cxl_2pxb_4rp_4t3d(void)qtest_end ();rmdir (tmpfs); } + +static void cxl_virt_2pxb_4rp_4t3d (void ) +{ +g_autoptr (GString) cmdline =g_string_new (NULL ); + g_autofree const char *tmpfs = NULL; + + tmpfs =g_dir_make_tmp ("cxl-test-XXXXXX" ,NULL ); + + g_string_printf(cmdline, QEMU_VIRT_2PXB_CMD QEMU_4RP QEMU_4T3D, + tmpfs, tmpfs, tmpfs, tmpfs, tmpfs, tmpfs, + tmpfs, tmpfs); + +qtest_start (cmdline->str); +qtest_end (); +rmdir (tmpfs); +}#endif /* CONFIG_POSIX */ int main (int argc,char **argv) { -g_test_init (&argc, &argv,NULL ); +const char *arch =qtest_get_arch (); -qtest_add_func ("/pci/cxl/basic_hostbridge" , cxl_basic_hb); -qtest_add_func ("/pci/cxl/basic_pxb" , cxl_basic_pxb); -qtest_add_func ("/pci/cxl/pxb_with_window" , cxl_pxb_with_window); -qtest_add_func ("/pci/cxl/pxb_x2_with_window" , cxl_2pxb_with_window); -qtest_add_func ("/pci/cxl/rp" , cxl_root_port); -qtest_add_func ("/pci/cxl/rp_x2" , cxl_2root_port); +g_test_init (&argc, &argv,NULL ); +if (strcmp (arch,"i386" ) ==0 ||strcmp (arch,"x86_64" ) ==0 ) { +qtest_add_func ("/pci/cxl/basic_hostbridge" , cxl_basic_hb); +qtest_add_func ("/pci/cxl/basic_pxb" , cxl_basic_pxb); +qtest_add_func ("/pci/cxl/pxb_with_window" , cxl_pxb_with_window); +qtest_add_func ("/pci/cxl/pxb_x2_with_window" , cxl_2pxb_with_window); +qtest_add_func ("/pci/cxl/rp" , cxl_root_port); +qtest_add_func ("/pci/cxl/rp_x2" , cxl_2root_port);#ifdef CONFIG_POSIX -qtest_add_func ("/pci/cxl/type3_device" , cxl_t3d_deprecated); -qtest_add_func ("/pci/cxl/type3_device_pmem" , cxl_t3d_persistent); -qtest_add_func ("/pci/cxl/type3_device_vmem" , cxl_t3d_volatile); -qtest_add_func ("/pci/cxl/type3_device_vmem_lsa" , cxl_t3d_volatile_lsa); -qtest_add_func ("/pci/cxl/rp_x2_type3_x2" , cxl_1pxb_2rp_2t3d); -qtest_add_func ("/pci/cxl/pxb_x2_root_port_x4_type3_x4" , cxl_2pxb_4rp_4t3d); +qtest_add_func ("/pci/cxl/type3_device" , cxl_t3d_deprecated); +qtest_add_func ("/pci/cxl/type3_device_pmem" , cxl_t3d_persistent); +qtest_add_func ("/pci/cxl/type3_device_vmem" , cxl_t3d_volatile); +qtest_add_func ("/pci/cxl/type3_device_vmem_lsa" , cxl_t3d_volatile_lsa); +qtest_add_func ("/pci/cxl/rp_x2_type3_x2" , cxl_1pxb_2rp_2t3d); +qtest_add_func ("/pci/cxl/pxb_x2_root_port_x4_type3_x4" , + cxl_2pxb_4rp_4t3d);#endif + }else if (strcmp (arch,"aarch64" ) ==0 ) { +#ifdef CONFIG_POSIX +qtest_add_func ("/pci/cxl/virt/pxb_x2_root_port_x4_type3_x4" , + cxl_virt_2pxb_4rp_4t3d); +#endif + } +return g_test_run (); }tests/qtest/meson.build +1
-0@@ -261,6 +261,7 @@ qtests_aarch64 = \ config_all_devices.has_key('CONFIG_TPM_TIS_I2C') ? ['tpm-tis-i2c-test'] : []) + \ (config_all_devices.has_key('CONFIG_ASPEED_SOC') ? qtests_aspeed64 : []) + \ (config_all_devices.has_key('CONFIG_NPCM8XX') ? qtests_npcm8xx : []) + \ + qtests_cxl + \ ['arm-cpu-features', 'numa-test', 'boot-serial-test',