CXL emulation fixes and minor cleanup.
v2 cover CXL emulation fixes and minor cleanup.
v2:
- Patch description fixes to correctly refer to g_malloc() either with or instead of g_malloc0() depending on the patch.
- Add missing brackets for QEMU style as reported by checkpatch.
- Gathered some tags from Fan (thanks!)
This set includes the majority of fixes I currently have queued up for the CXL emulation. Most have been posted and reviewed before so this is just rebases of those.
I've included the _STA fix as that's fairly trivial
and didn't seem worth a separate posting. Also included dropping some pointless g_malloc0() failure handling that came up in review of Ira's "cxl/cdat: Handle cdat table build errors".
Note the [... qemu] marking above is because we currently use the [email protected] list to ensure CXL people notice the patches and difficulty of distinguishing QEMU vs Kernel patches was causing some grief for tracking in patchwork. Hopefully this is unobtrusive enough to not annoy QEMU reviewers!
Davidlohr Bueso (1):
hw/cxl/mbox: Remove dead code
Hyeonggon Yoo (1):
hw/cxl/device: read from register values in mdev_reg_read()
Ira Weiny (2):
cxl/cdat: Handle cdat table build errors
cxl/cdat: Fix header sum value in CDAT checksum
Jonathan Cameron (6):
hw/mem/cxl_type3: Drop handling of failure of g_malloc0() and
g_malloc()
hw/pci-bridge/cxl_upstream: Drop g_malloc() failure handling hw/mem/cxl_type3: Fix potential divide by zero reported by coverity tests/acpi: Allow update of DSDT.cxl
hw/i386: Fix _STA return value for ACPI0017
tests/acpi: Update DSDT.cxl to reflect change _STA return value.
Li Zhijian (2):
hw/cxl: Pass CXLComponentState to cache_mem_ops
hw/cxl: Pass NULL for a NULL MemoryRegionOps
include/hw/cxl/cxl_device.h | 9 ++++-- hw/cxl/cxl-cdat.c | 11 +++++-- hw/cxl/cxl-component-utils.c | 4 +-- hw/cxl/cxl-device-utils.c | 17 ++++++---- hw/cxl/cxl-mailbox-utils.c | 43 +++++++++--------------- hw/i386/acpi-build.c | 2 +- hw/mem/cxl_type3.c | 61 ++++++++--------------------------- hw/pci-bridge/cxl_upstream.c | 6 ---- tests/data/acpi/q35/DSDT.cxl | Bin 9713 -> 9714 bytes 9 files changed, 58 insertions(+), 95 deletions(-)
Signature · 1 line
2.39.2
PATCH v2 1/12 cxl/cdat: Handle cdat table build errors
From: Ira Weiny <[email protected]>
The callback for building CDAT tables may return negative error codes. This was previously unhandled and will result in potentially huge allocations later on in ct3_build_cdat()
Detect the negative error code and defer cdat building.
--- hw/cxl/cxl-cdat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/cxl/cxl-cdat.c +1 -1
@@ -63,7 +63,7 @@ static void ct3_build_cdat(CDATObject *cdat, Error **errp) cdat->built_buf_len = cdat->build_cdat_table (&cdat->built_buf, cdat->private); -if (!cdat->built_buf_len) { +if (cdat->built_buf_len <=0 ) {/* Build later as not all data available yet */ cdat->to_update = true;return ;
Signature · 1 line
2.39.2
PATCH v2 2/12 hw/mem/cxl_type3: Drop handling of failure of g_malloc0() and g_malloc()
In reply to Jonathan CameronAs g_malloc0/g_malloc() will just exit QEMU on failure there is no point in checking for it failing.
---
v2: Fix up description to include g_malloc()
--- hw/mem/cxl_type3.c | 52 +++++++--------------------------------------- 1 file changed, 7 insertions(+), 45 deletions(-)
hw/mem/cxl_type3.c +7 -45
@@ -42,9 +42,9 @@ enum {CT3_CDAT_NUM_ENTRIES }; -static int ct3_build_cdat_entries_for_mr (CDATSubHeader **cdat_table, -int dsmad_handle,MemoryRegion *mr, -bool is_pmem,uint64_t dpa_base) +static void ct3_build_cdat_entries_for_mr (CDATSubHeader **cdat_table, +int dsmad_handle,MemoryRegion *mr, +bool is_pmem,uint64_t dpa_base) { g_autofree CDATDsmas *dsmas = NULL; g_autofree CDATDslbis *dslbis0 = NULL;
@@ -54,9 +54,6 @@ static int ct3_build_cdat_entries_for_mr(CDATSubHeader **cdat_table, g_autofree CDATDsemts *dsemts = NULL; dsmas =g_malloc (sizeof (*dsmas)); -if (!dsmas) { -return -ENOMEM ; - } *dsmas = (CDATDsmas ) { .header = { .type =CDAT_TYPE_DSMAS ,
@@ -70,9 +67,6 @@ static int ct3_build_cdat_entries_for_mr(CDATSubHeader **cdat_table,/* For now, no memory side cache, plausiblish numbers */ dslbis0 =g_malloc (sizeof (*dslbis0)); -if (!dslbis0) { -return -ENOMEM ; - } *dslbis0 = (CDATDslbis ) { .header = { .type =CDAT_TYPE_DSLBIS ,
@@ -86,9 +80,6 @@ static int ct3_build_cdat_entries_for_mr(CDATSubHeader **cdat_table, }; dslbis1 =g_malloc (sizeof (*dslbis1)); -if (!dslbis1) { -return -ENOMEM ; - } *dslbis1 = (CDATDslbis ) { .header = { .type =CDAT_TYPE_DSLBIS ,
@@ -102,9 +93,6 @@ static int ct3_build_cdat_entries_for_mr(CDATSubHeader **cdat_table, }; dslbis2 =g_malloc (sizeof (*dslbis2)); -if (!dslbis2) { -return -ENOMEM ; - } *dslbis2 = (CDATDslbis ) { .header = { .type =CDAT_TYPE_DSLBIS ,
@@ -118,9 +106,6 @@ static int ct3_build_cdat_entries_for_mr(CDATSubHeader **cdat_table, }; dslbis3 =g_malloc (sizeof (*dslbis3)); -if (!dslbis3) { -return -ENOMEM ; - } *dslbis3 = (CDATDslbis ) { .header = { .type =CDAT_TYPE_DSLBIS ,
@@ -134,9 +119,6 @@ static int ct3_build_cdat_entries_for_mr(CDATSubHeader **cdat_table, }; dsemts =g_malloc (sizeof (*dsemts)); -if (!dsemts) { -return -ENOMEM ; - } *dsemts = (CDATDsemts ) { .header = { .type =CDAT_TYPE_DSEMTS ,
@@ -159,8 +141,6 @@ static int ct3_build_cdat_entries_for_mr(CDATSubHeader **cdat_table, cdat_table[CT3_CDAT_DSLBIS2 ] =g_steal_pointer (&dslbis2); cdat_table[CT3_CDAT_DSLBIS3 ] =g_steal_pointer (&dslbis3); cdat_table[CT3_CDAT_DSEMTS ] =g_steal_pointer (&dsemts); - -return 0 ; }static int ct3_build_cdat_table (CDATSubHeader ***cdat_table,void *priv)
@@ -171,7 +151,6 @@ static int ct3_build_cdat_table(CDATSubHeader ***cdat_table, void *priv)int dsmad_handle =0 ;int cur_ent =0 ;int len =0 ; -int rc, i;if (!ct3d->hostpmem && !ct3d->hostvmem) {return 0 ;
@@ -194,27 +173,18 @@ static int ct3_build_cdat_table(CDATSubHeader ***cdat_table, void *priv) } table =g_malloc0 (len *sizeof (*table)); -if (!table) { -return -ENOMEM ; - }/* Now fill them in */ if (volatile_mr) { - rc =ct3_build_cdat_entries_for_mr (table, dsmad_handle++, volatile_mr, - false,0 ); -if (rc <0 ) { -return rc; - } +ct3_build_cdat_entries_for_mr (table, dsmad_handle++, volatile_mr, + false,0 ); cur_ent =CT3_CDAT_NUM_ENTRIES ; }if (nonvolatile_mr) {uint64_t base = volatile_mr ?memory_region_size (volatile_mr) :0 ; - rc =ct3_build_cdat_entries_for_mr (&(table[cur_ent]), dsmad_handle++, - nonvolatile_mr, true, base); -if (rc <0 ) { - goto error_cleanup; - } +ct3_build_cdat_entries_for_mr (&(table[cur_ent]), dsmad_handle++, + nonvolatile_mr, true, base); cur_ent +=CT3_CDAT_NUM_ENTRIES ; }assert (len == cur_ent);
@@ -222,11 +192,6 @@ static int ct3_build_cdat_table(CDATSubHeader ***cdat_table, void *priv) *cdat_table =g_steal_pointer (&table);return len; -error_cleanup: -for (i =0 ; i < cur_ent; i++) { -g_free (table[i]); - } -return rc; }static void ct3_free_cdat_table (CDATSubHeader **cdat_table,int num,void *priv)
@@ -1168,9 +1133,6 @@ void qmp_cxl_inject_uncorrectable_errors(const char *path, } cxl_err =g_malloc0 (sizeof (*cxl_err)); -if (!cxl_err) { -return ; - } cxl_err->type = cxl_err_code;while (header && header_count <32 ) {
Signature · 1 line
2.39.2
PATCH v2 3/12 hw/pci-bridge/cxl_upstream: Drop g_malloc() failure handling
In reply to Jonathan CameronAs a failure of g_malloc() will result in QEMU exiting, it won't return a NULL to check. As such, drop the incorrect handling of such NULL returns in the cdat table building code.
--- hw/pci-bridge/cxl_upstream.c | 6 ------ 1 file changed, 6 deletions(-)
hw/pci-bridge/cxl_upstream.c +0 -6
@@ -228,9 +228,6 @@ static int build_cdat_table(CDATSubHeader ***cdat_table, void *priv) sslbis_size =sizeof (CDATSslbis) +sizeof (*sslbis_latency->sslbe) * count; sslbis_latency =g_malloc (sslbis_size); -if (!sslbis_latency) { -return -ENOMEM ; - } *sslbis_latency = (CDATSslbis ) { .sslbis_header = { .header = {
@@ -251,9 +248,6 @@ static int build_cdat_table(CDATSubHeader ***cdat_table, void *priv) } sslbis_bandwidth =g_malloc (sslbis_size); -if (!sslbis_bandwidth) { -return 0 ; - } *sslbis_bandwidth = (CDATSslbis ) { .sslbis_header = { .header = {
Signature · 1 line
2.39.2
PATCH v2 4/12 cxl/cdat: Fix header sum value in CDAT checksum
In reply to Jonathan CameronFrom: Ira Weiny <[email protected]>
The addition of the DCD support for CXL type-3 devices extended the CDAT table large enough that the checksum being returned was incorrect.[1]
This was because the checksum value was using the header length field rather than each of the 4 bytes of the length field. This was previously not seen because the length of the CDAT data was less than 256 thus resulting in an equivalent checksum value.
Properly calculate the checksum for the CDAT header.
[1] https://lore.kernel.org/all/[email protected]/
---
Ammended buf naming to hdr_buf to avoid shadow issue with an existing buf variable with more limited scope.
--- hw/cxl/cxl-cdat.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
hw/cxl/cxl-cdat.c +7 -2
@@ -49,6 +49,7 @@ static void ct3_build_cdat(CDATObject *cdat, Error **errp) g_autofree CDATTableHeader *cdat_header = NULL; g_autofree CDATEntry *cdat_st = NULL;uint8_t sum =0 ; +uint8_t *hdr_buf;int ent, i;/* Use default table if fopen == NULL */
@@ -95,8 +96,12 @@ static void ct3_build_cdat(CDATObject *cdat, Error **errp)/* For now, no runtime updates */ cdat_header->sequence =0 ; cdat_header->length +=sizeof (CDATTableHeader); - sum += cdat_header->revision + cdat_header->sequence + - cdat_header->length; + + hdr_buf = (uint8_t *)cdat_header; +for (i =0 ; i <sizeof (*cdat_header); i++) { + sum += hdr_buf[i]; + } +/* Sum of all bytes including checksum must be 0 */ cdat_header->checksum = ~sum +1 ;
Signature · 1 line
2.39.2
PATCH v2 5/12 hw/cxl/mbox: Remove dead code
In reply to Jonathan CameronFrom: Davidlohr Bueso <[email protected]>
Two functions were reported to have dead code, remove the bogus branches altogether, as well as a misplaced qemu_log call.
--- hw/cxl/cxl-mailbox-utils.c | 43 +++++++++++++------------------------- 1 file changed, 15 insertions(+), 28 deletions(-)
hw/cxl/cxl-mailbox-utils.c +15 -28
@@ -1001,15 +1001,8 @@ static CXLRetCode cmd_sanitize_overwrite(const struct cxl_cmd *cmd,cxl_dev_disable_media (&ct3d->cxl_dstate); -if (secs >2 ) { -/* sanitize when done */ -return CXL_MBOX_BG_STARTED ; - }else { -__do_sanitization (ct3d); -cxl_dev_enable_media (&ct3d->cxl_dstate); - -return CXL_MBOX_SUCCESS ; - } +/* sanitize when done */ +return CXL_MBOX_BG_STARTED ; } static CXLRetCode cmd_get_security_state(const struct cxl_cmd *cmd,
@@ -1387,27 +1380,21 @@ static void bg_timercb(void *opaque) cci->bg.complete_pct =100 ; cci->bg.ret_code = ret; -if (ret ==CXL_MBOX_SUCCESS ) { -switch (cci->bg.opcode) { -case 0x4400 :/* sanitize */ - { -CXLType3Dev *ct3d =CXL_TYPE3 (cci->d); - -__do_sanitization (ct3d); -cxl_dev_enable_media (&ct3d->cxl_dstate); - } +switch (cci->bg.opcode) { +case 0x4400 :/* sanitize */ + { +CXLType3Dev *ct3d =CXL_TYPE3 (cci->d); + +__do_sanitization (ct3d); +cxl_dev_enable_media (&ct3d->cxl_dstate); + } +break ; +case 0x4304 :/* TODO: scan media */ +break ; +default : +__builtin_unreachable ();break ; -case 0x4304 :/* TODO: scan media */ -break ; -default : -__builtin_unreachable (); -break ; - } } - -qemu_log ("Background command %04xh finished: %s\n" , - cci->bg.opcode, - ret ==CXL_MBOX_SUCCESS ?"success" :"aborted" ); }else {/* estimate only */ cci->bg.complete_pct =100 * now / total_time;
Signature · 1 line
2.39.2
PATCH v2 6/12 hw/cxl/device: read from register values in mdev_reg_read()
In reply to Jonathan CameronFrom: Hyeonggon Yoo <[email protected]>
In the current mdev_reg_read() implementation, it consistently returns that the Media Status is Ready (01b). This was fine until commit 25a52959f99d ("hw/cxl: Add support for device sanitation") because the media was presumed to be ready.
However, as per the CXL 3.0 spec "8.2.9.8.5.1 Sanitize (Opcode 4400h)", during sanitation, the Media State should be set to Disabled (11b). The mentioned commit correctly sets it to Disabled, but mdev_reg_read() still returns Media Status as Ready.
To address this, update mdev_reg_read() to read register values instead of returning dummy values.
Note that __toggle_media() managed to not only write something that no one read, it did it to the wrong register storage and so changed the reported mailbox size which was definitely not the intent. That gets fixed as a side effect of allocating separate state storage for this register.
---
Patch description expanded to cover the overwrite bug fixed almost by accident in this patch.
--- include/hw/cxl/cxl_device.h | 9 +++++++-- hw/cxl/cxl-device-utils.c | 17 +++++++++++------ 2 files changed, 18 insertions(+), 8 deletions(-)
include/hw/cxl/cxl_device.h +7 -2
@@ -202,6 +202,9 @@ typedef struct cxl_device_state { }; }; +/* Stash the memory device status value */ +uint64_t memdev_status; +struct {bool set;uint64_t last_set;
@@ -353,8 +356,10 @@ static inline void __toggle_media(CXLDeviceState *cxl_dstate, int val) {uint64_t dev_status_reg; - dev_status_reg =FIELD_DP64 (0 ,CXL_MEM_DEV_STS ,MEDIA_STATUS , val); - cxl_dstate->mbox_reg_state64[R_CXL_MEM_DEV_STS ] = dev_status_reg; + dev_status_reg = cxl_dstate->memdev_status; + dev_status_reg =FIELD_DP64 (dev_status_reg,CXL_MEM_DEV_STS ,MEDIA_STATUS , + val); + cxl_dstate->memdev_status = dev_status_reg; }#define cxl_dev_disable_media (cxlds) \ do { __toggle_media((cxlds), 0x3); } while (0)
hw/cxl/cxl-device-utils.c +11 -6
@@ -229,12 +229,9 @@ static void mailbox_reg_write(void *opaque, hwaddr offset, uint64_t value,static uint64_t mdev_reg_read (void *opaque,hwaddr offset,unsigned size) { -uint64_t retval =0 ; - - retval =FIELD_DP64 (retval,CXL_MEM_DEV_STS ,MEDIA_STATUS ,1 ); - retval =FIELD_DP64 (retval,CXL_MEM_DEV_STS ,MBOX_READY ,1 ); +CXLDeviceState *cxl_dstate = opaque; -return retval; +return cxl_dstate->memdev_status; } static void ro_reg_write(void *opaque, hwaddr offset, uint64_t value,
@@ -371,7 +368,15 @@ static void mailbox_reg_init_common(CXLDeviceState *cxl_dstate) cxl_dstate->mbox_msi_n = msi_n; } -static void memdev_reg_init_common (CXLDeviceState *cxl_dstate) { } +static void memdev_reg_init_common (CXLDeviceState *cxl_dstate) +{ +uint64_t memdev_status_reg; + + memdev_status_reg =FIELD_DP64 (0 ,CXL_MEM_DEV_STS ,MEDIA_STATUS ,1 ); + memdev_status_reg =FIELD_DP64 (memdev_status_reg,CXL_MEM_DEV_STS , +MBOX_READY ,1 ); + cxl_dstate->memdev_status = memdev_status_reg; +}void cxl_device_register_init_t3 (CXLType3Dev *ct3d) {
Signature · 1 line
2.39.2
PATCH v2 7/12 hw/cxl: Pass CXLComponentState to cache_mem_ops
In reply to Jonathan CameronFrom: Li Zhijian <[email protected]>
cache_mem_ops.{read,write}() interprets opaque as CXLComponentState(cxl_cstate) instead of ComponentRegisters(cregs).
Fortunately, cregs is the first member of cxl_cstate, so their values are the same.
--- hw/cxl/cxl-component-utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/cxl/cxl-component-utils.c +1 -1
@@ -199,7 +199,7 @@ void cxl_component_register_block_init(Object *obj,/* io registers controls link which we don't care about in QEMU */ memory_region_init_io (&cregs->io, obj,NULL , cregs,".io" ,CXL2_COMPONENT_IO_REGION_SIZE ); -memory_region_init_io (&cregs->cache_mem, obj, &cache_mem_ops, cregs, +memory_region_init_io (&cregs->cache_mem, obj, &cache_mem_ops, cxl_cstate,".cache_mem" ,CXL2_COMPONENT_CM_REGION_SIZE );memory_region_add_subregion (&cregs->component_registers,0 , &cregs->io);
Signature · 1 line
2.39.2
PATCH v2 8/12 hw/cxl: Pass NULL for a NULL MemoryRegionOps
In reply to Jonathan CameronFrom: Li Zhijian <[email protected]>
a NULL parameter is enough for a NULL MemoryRegionOps
--- hw/cxl/cxl-component-utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/cxl/cxl-component-utils.c +1 -1
@@ -197,7 +197,7 @@ void cxl_component_register_block_init(Object *obj, CXL2_COMPONENT_BLOCK_SIZE);/* io registers controls link which we don't care about in QEMU */ -memory_region_init_io (&cregs->io, obj,NULL , cregs,".io" , +memory_region_init_io (&cregs->io, obj,NULL ,NULL ,".io" ,CXL2_COMPONENT_IO_REGION_SIZE );memory_region_init_io (&cregs->cache_mem, obj, &cache_mem_ops, cxl_cstate,".cache_mem" ,CXL2_COMPONENT_CM_REGION_SIZE );
Signature · 1 line
2.39.2
PATCH v2 9/12 hw/mem/cxl_type3: Fix potential divide by zero reported by coverity
In reply to Jonathan CameronFixes Coverity ID 1522368.
Currently error_fatal is set if interleave_ways_dec() is going to return 0 but we should handle that zero return explicitly.
---
Note this is a stop gap until a more complex HDM decoder verification series.
--- hw/mem/cxl_type3.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
hw/mem/cxl_type3.c +7 -2
@@ -794,8 +794,13 @@ static bool cxl_type3_dpa(CXLType3Dev *ct3d, hwaddr host_addr, uint64_t *dpa) }if (((uint64_t )host_addr < decoder_base) || (hpa_offset >= decoder_size)) { - dpa_base += decoder_size / -cxl_interleave_ways_dec (iw, &error_fatal); +int decoded_iw =cxl_interleave_ways_dec (iw, &error_fatal); + +if (decoded_iw ==0 ) { +return false; + } + + dpa_base += decoder_size / decoded_iw;continue ; }
Signature · 1 line
2.39.2
PATCH v2 10/12 tests/acpi: Allow update of DSDT.cxl
In reply to Jonathan CameronThe _STA value returned currently indicates the ACPI0017 device is not enabled. Whilst this isn't a real device, setting _STA like this may prevent an OS from enumerating it correctly and hence from parsing the CEDT table.
--- tests/qtest/bios-tables-test-allowed-diff.h | 1 + 1 file changed, 1 insertion(+)
tests/qtest/bios-tables-test-allowed-diff.h +1 -0
@@ -1 +1,2 @@/* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/q35/DSDT.cxl",
Signature · 1 line
2.39.2
PATCH v2 11/12 hw/i386: Fix _STA return value for ACPI0017
In reply to Jonathan CameronFound whilst testing a series for the linux kernel that actually bothers to check if enabled is set. 0xB is the option used for vast majority of DSDT entries in QEMU.
It is a little odd for a device that doesn't really exist and is simply a hook to tell the OS there is a CEDT table but 0xB seems a reasonable choice and avoids need to special case this device in the OS.
Means:
* Device present.
* Device enabled and decoding it's resources.
* Not shown in UI
* Functioning properly
* No battery (on this device!)
--- hw/i386/acpi-build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/i386/acpi-build.c +1 -1
@@ -1415,7 +1415,7 @@ static void build_acpi0017(Aml *table)aml_append (dev,aml_name_decl ("_HID" ,aml_string ("ACPI0017" ))); method =aml_method ("_STA" ,0 ,AML_NOTSERIALIZED ); -aml_append (method,aml_return (aml_int (0x01 ))); +aml_append (method,aml_return (aml_int (0x0B )));aml_append (dev, method);build_cxl_dsm_method (dev);
Signature · 1 line
2.39.2
PATCH v2 12/12 tests/acpi: Update DSDT.cxl to reflect change _STA return value.
In reply to Jonathan Cameron_STA will now return 0xB (in common with most other devices) rather than not setting the bits to indicate this fake device has not been enabled, and self tests haven't passed.
--- tests/qtest/bios-tables-test-allowed-diff.h | 1 - tests/data/acpi/q35/DSDT.cxl | Bin 9713 -> 9714 bytes 2 files changed, 1 deletion(-)
tests/qtest/bios-tables-test-allowed-diff.h +0 -1
@@ -1,2 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/q35/DSDT.cxl",
tests/data/acpi/q35/DSDT.cxl binary +0 -0
Signature · 1 line
2.39.2