Skip to contentSkip to conversation

hw/cxl: Misc minor improvements

PATCH Superseded Jonathan Cameron 3 participants 9 messages Jul 2, 2024 – Jul 5, 2024

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover hw/cxl: Misc minor improvements

Before pushing on to more significant features a few unrelated patches doing tidying up + one to avoid people setting the memory backend both for a CXL type 3 device and as normal RAM in an attempt to get SRAT to cover it correctly. We've had multiple 'bug' reports from this and if nothing else I'd like to stop getting those!

Based on master + the two DCD series Michael Tsirkin has queued.

Based-on: [PATCH v8 00/14] Enabling DCD emulation support in Qemu
Based-on: https://lore.kernel.org/qemu-devel/[email protected]/
Based-on: [PATCH qemu 0/2] hw/cxl: DCD tweaks and improvements.
Based-on: https://lore.kernel.org/qemu-devel/[email protected]/

Fan Ni (1):
hw/cxl/cxl-mailbox-utils: remove unneeded mailbox output payload space
zeroing

Jonathan Cameron (1):
hw/cxl: Check for multiple mappings of memory backends.

Li Zhijian (1):
hw/cxl: Get rid of unused cfmw_list

 include/hw/cxl/cxl.h       |  1 -
 hw/cxl/cxl-host.c          |  1 -
 hw/cxl/cxl-mailbox-utils.c |  7 -------
 hw/mem/cxl_type3.c         | 15 +++++++++++++++
 4 files changed, 15 insertions(+), 9 deletions(-)
Signature · 1 line
2.43.0
#1 lore raw

PATCH 1/3 hw/cxl: Get rid of unused cfmw_list

From: Li Zhijian <[email protected]>

There is no user for this member. All '-M cxl-fmw.N' options have been parsed and saved to CXLState.fixed_windows.

---
 include/hw/cxl/cxl.h | 1 -
 hw/cxl/cxl-host.c    | 1 -
 2 files changed, 2 deletions(-)
include/hw/cxl/cxl.h +0 -1
index 75e47b6864..e3ecbef038 100644
@@ -43,7 +43,6 @@ typedef struct CXLState {
     MemoryRegion host_mr;
     unsigned int next_mr_idx;
     GList *fixed_windows;
-    CXLFixedMemoryWindowOptionsList *cfmw_list;
 } CXLState;
 
 struct CXLHost {
hw/cxl/cxl-host.c +0 -1
index c5f5fcfd64..926d3d3da7 100644
@@ -335,7 +335,6 @@ static void machine_set_cfmw(Object *obj, Visitor *v, const char *name,
     for (it = cfmw_list; it; it = it->next) {
         cxl_fixed_memory_window_config(state, it->value, errp);
     }
-    state->cfmw_list = cfmw_list;
 }
 
 void cxl_machine_init(Object *obj, CXLState *state)
Signature · 1 line
2.43.0
#2 lore raw

Re: [PATCH 1/3] hw/cxl: Get rid of unused cfmw_list

Jonathan,

There is a new user for cfmw_list now
https://lore.kernel.org/qemu-devel/[email protected]/

So I think we should drop this patch.

Quoted 36 lines · Jonathan Cameron

From: Li Zhijian <[email protected]>

There is no user for this member. All '-M cxl-fmw.N' options have been parsed and saved to CXLState.fixed_windows.

---
  include/hw/cxl/cxl.h | 1 -
  hw/cxl/cxl-host.c    | 1 -
  2 files changed, 2 deletions(-)
include/hw/cxl/cxl.h +0 -1
index 75e47b6864..e3ecbef038 100644
@@ -43,7 +43,6 @@ typedef struct CXLState {
      MemoryRegion host_mr;
      unsigned int next_mr_idx;
      GList *fixed_windows;
-    CXLFixedMemoryWindowOptionsList *cfmw_list;
  } CXLState;
 
  struct CXLHost {
hw/cxl/cxl-host.c +0 -1
index c5f5fcfd64..926d3d3da7 100644
@@ -335,7 +335,6 @@ static void machine_set_cfmw(Object *obj, Visitor *v, const char *name,
      for (it = cfmw_list; it; it = it->next) {
          cxl_fixed_memory_window_config(state, it->value, errp);
      }
-    state->cfmw_list = cfmw_list;
  }
 
  void cxl_machine_init(Object *obj, CXLState *state)
#3 lore raw

Re: [PATCH 1/3] hw/cxl: Get rid of unused cfmw_list

Quoted 11 lines · Zhijian Li (Fujitsu)

Date: Fri, 5 Jul 2024 01:04:51 +0000
From: "Zhijian Li (Fujitsu)" <[email protected]>
Subject: Re: [PATCH 1/3] hw/cxl: Get rid of unused cfmw_list

Jonathan,

There is a new user for cfmw_list now
https://lore.kernel.org/qemu-devel/[email protected]/

So I think we should drop this patch.

Hi Zhijian,

I'm not a "real" user and that bug was originally found by code reading.

So that fix won't block your drop. :-)

And I think the fix is worth being laned before cfmw_list gets dropped, for being able to port backwards to stable QEMU.

Quoted 37 lines · Jonathan Cameron
Quoted 36 lines

From: Li Zhijian <[email protected]>

There is no user for this member. All '-M cxl-fmw.N' options have been parsed and saved to CXLState.fixed_windows.

---
  include/hw/cxl/cxl.h | 1 -
  hw/cxl/cxl-host.c    | 1 -
  2 files changed, 2 deletions(-)
include/hw/cxl/cxl.h +0 -1
index 75e47b6864..e3ecbef038 100644
@@ -43,7 +43,6 @@ typedef struct CXLState {
      MemoryRegion host_mr;
      unsigned int next_mr_idx;
      GList *fixed_windows;
-    CXLFixedMemoryWindowOptionsList *cfmw_list;
  } CXLState;
 
  struct CXLHost {
hw/cxl/cxl-host.c +0 -1
index c5f5fcfd64..926d3d3da7 100644
@@ -335,7 +335,6 @@ static void machine_set_cfmw(Object *obj, Visitor *v, const char *name,
      for (it = cfmw_list; it; it = it->next) {
          cxl_fixed_memory_window_config(state, it->value, errp);
      }
-    state->cfmw_list = cfmw_list;
  }
 
  void cxl_machine_init(Object *obj, CXLState *state)
#4 lore raw

Re: [PATCH 1/3] hw/cxl: Get rid of unused cfmw_list

Quoted 10 lines · Zhao Liu
Quoted 4 lines

There is a new user for cfmw_list now
https://lore.kernel.org/qemu-devel/[email protected]/

So I think we should drop this patch.

Hi Zhijian,

I'm not a "real" user and that bug was originally found by code reading.

So that fix won't block your drop. 🙂

"hw/cxl: Get rid of unused cfmw_list" is no longer needed.

Quoted 3 lines

And I think the fix is worth being laned before cfmw_list gets dropped, for being able to port backwards to stable QEMU.

Your fix[0] requires CXLState.cfmw_list, and I think CXLState.cfmw_list was designed for *get* purpose but got mistake at that time.

[0] https://lore.kernel.org/qemu-devel/[email protected]/

Quoted 25 lines
Quoted 25 lines · Jonathan Cameron
Quoted 23 lines

From: Li Zhijian<[email protected]>

There is no user for this member. All '-M cxl-fmw.N' options have been parsed and saved to CXLState.fixed_windows.

---
   include/hw/cxl/cxl.h | 1 -
   hw/cxl/cxl-host.c    | 1 -
   2 files changed, 2 deletions(-)
include/hw/cxl/cxl.h +0 -1
index 75e47b6864..e3ecbef038 100644
@@ -43,7 +43,6 @@ typedef struct CXLState {
       MemoryRegion host_mr;
       unsigned int next_mr_idx;
       GList *fixed_windows;
-    CXLFixedMemoryWindowOptionsList *cfmw_list;
   } CXLState;
 
#5 lore raw

Re: [PATCH 1/3] hw/cxl: Get rid of unused cfmw_list

Quoted 18 lines · On Fri, 5 Jul 2024 02:29:34 +0000 "Zhijian Li (Fujitsu)"…
Quoted 10 lines · Zhao Liu
Quoted 4 lines

There is a new user for cfmw_list now
https://lore.kernel.org/qemu-devel/[email protected]/

So I think we should drop this patch.

Hi Zhijian,

I'm not a "real" user and that bug was originally found by code reading.

So that fix won't block your drop. 🙂

"hw/cxl: Get rid of unused cfmw_list" is no longer needed.

Quoted 1 line
Quoted 7 lines
Quoted 2 lines

And I think the fix is worth being laned before cfmw_list gets dropped, for being able to port backwards to stable QEMU.

Your fix[0] requires CXLState.cfmw_list, and I think CXLState.cfmw_list was designed for *get* purpose but got mistake at that time.

[0] https://lore.kernel.org/qemu-devel/[email protected]/

Ok. Michael, please ignore this one as the lack of use is result of another bug. I hadn't gotten to that fix yet, so missed the connection.

The rest of this series is unrelated.

Jonathan

Quoted 27 lines
Quoted 27 lines
Quoted 27 lines · Jonathan Cameron
Quoted 23 lines

From: Li Zhijian<[email protected]>

There is no user for this member. All '-M cxl-fmw.N' options have been parsed and saved to CXLState.fixed_windows.

---
   include/hw/cxl/cxl.h | 1 -
   hw/cxl/cxl-host.c    | 1 -
   2 files changed, 2 deletions(-)
include/hw/cxl/cxl.h +0 -1
index 75e47b6864..e3ecbef038 100644
@@ -43,7 +43,6 @@ typedef struct CXLState {
       MemoryRegion host_mr;
       unsigned int next_mr_idx;
       GList *fixed_windows;
-    CXLFixedMemoryWindowOptionsList *cfmw_list;
   } CXLState;
 
#6 lore raw

PATCH 2/3 hw/cxl/cxl-mailbox-utils: remove unneeded mailbox output payload space zeroing

In reply to Jonathan Cameron

From: Fan Ni <[email protected]>

The whole mailbox output payload space is already zeroed after copying out the input payload, which happens before processing the specific mailbox command:
https://elixir.bootlin.com/qemu/v8.2.1/source/hw/cxl/cxl-device-utils.c#L204

---
 hw/cxl/cxl-mailbox-utils.c | 7 -------
 1 file changed, 7 deletions(-)
hw/cxl/cxl-mailbox-utils.c +0 -7
index 74eeb6fde7..facec42dc8 100644
@@ -235,7 +235,6 @@ static CXLRetCode cmd_events_get_records(const struct cxl_cmd *cmd,
     log_type = payload_in[0];
 
     pl = (CXLGetEventPayload *)payload_out;
-    memset(pl, 0, sizeof(*pl));
 
     max_recs = (cxlds->payload_size - CXL_EVENT_PAYLOAD_HDR_SIZE) /
                 CXL_EVENT_RECORD_SIZE;
@@ -273,7 +272,6 @@ static CXLRetCode cmd_events_get_interrupt_policy(const struct cxl_cmd *cmd,
     CXLEventLog *log;
 
     policy = (CXLEventInterruptPolicy *)payload_out;
-    memset(policy, 0, sizeof(*policy));
 
     log = &cxlds->event_logs[CXL_EVENT_TYPE_INFO];
     if (log->irq_enabled) {
@@ -372,7 +370,6 @@ static CXLRetCode cmd_infostat_identify(const struct cxl_cmd *cmd,
     QEMU_BUILD_BUG_ON(sizeof(*is_identify) != 18);
 
     is_identify = (void *)payload_out;
-    memset(is_identify, 0, sizeof(*is_identify));
     is_identify->pcie_vid = class->vendor_id;
     is_identify->pcie_did = class->device_id;
     if (object_dynamic_cast(OBJECT(cci->d), TYPE_CXL_USP)) {
@@ -606,7 +603,6 @@ static CXLRetCode cmd_infostat_bg_op_sts(const struct cxl_cmd *cmd,
     QEMU_BUILD_BUG_ON(sizeof(*bg_op_status) != 8);
 
     bg_op_status = (void *)payload_out;
-    memset(bg_op_status, 0, sizeof(*bg_op_status));
     bg_op_status->status = cci->bg.complete_pct << 1;
     if (cci->bg.runtime > 0) {
         bg_op_status->status |= 1U << 0;
@@ -647,7 +643,6 @@ static CXLRetCode cmd_firmware_update_get_info(const struct cxl_cmd *cmd,
     }
 
     fw_info = (void *)payload_out;
-    memset(fw_info, 0, sizeof(*fw_info));
 
     fw_info->slots_supported = 2;
     fw_info->slot_info = BIT(0) | BIT(3);
@@ -805,7 +800,6 @@ static CXLRetCode cmd_identify_memory_device(const struct cxl_cmd *cmd,
     }
 
     id = (void *)payload_out;
-    memset(id, 0, sizeof(*id));
 
     snprintf(id->fw_revision, 0x10, "BWFW VERSION %02d", 0);
 
@@ -1095,7 +1089,6 @@ static CXLRetCode cmd_media_get_poison_list(const struct cxl_cmd *cmd,
     out_pl_len = sizeof(*out) + record_count * sizeof(out->records[0]);
     assert(out_pl_len <= CXL_MAILBOX_MAX_PAYLOAD_SIZE);
 
-    memset(out, 0, out_pl_len);
     QLIST_FOREACH(ent, poison_list, node) {
         uint64_t start, stop;
 
Signature · 1 line
2.43.0
#7 lore raw

PATCH 3/3 hw/cxl: Check for multiple mappings of memory backends.

In reply to Jonathan Cameron

Similar protection to that provided for -numa memdev=x
to make sure that memory used to back a type3 device is not also mapped as normal RAM, or for multiple type3 devices.

This is an easy footgun to remove and seems multiple people have run into it.

---
 hw/mem/cxl_type3.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
hw/mem/cxl_type3.c +15 -0
index 35ac59883a..e7fbbb4d51 100644
@@ -737,6 +737,11 @@ static bool cxl_setup_memory(CXLType3Dev *ct3d, Error **errp)
             error_setg(errp, "volatile memdev must have backing device");
             return false;
         }
+        if (host_memory_backend_is_mapped(ct3d->hostvmem)) {
+            error_setg(errp, "memory backend %s can't be used multiple times.",
+               object_get_canonical_path_component(OBJECT(ct3d->hostvmem)));
+            return false;
+        }
         memory_region_set_nonvolatile(vmr, false);
         memory_region_set_enabled(vmr, true);
         host_memory_backend_set_mapped(ct3d->hostvmem, true);
@@ -760,6 +765,11 @@ static bool cxl_setup_memory(CXLType3Dev *ct3d, Error **errp)
             error_setg(errp, "persistent memdev must have backing device");
             return false;
         }
+        if (host_memory_backend_is_mapped(ct3d->hostpmem)) {
+            error_setg(errp, "memory backend %s can't be used multiple times.",
+               object_get_canonical_path_component(OBJECT(ct3d->hostpmem)));
+            return false;
+        }
         memory_region_set_nonvolatile(pmr, true);
         memory_region_set_enabled(pmr, true);
         host_memory_backend_set_mapped(ct3d->hostpmem, true);
@@ -790,6 +800,11 @@ static bool cxl_setup_memory(CXLType3Dev *ct3d, Error **errp)
             return false;
         }
 
+        if (host_memory_backend_is_mapped(ct3d->dc.host_dc)) {
+            error_setg(errp, "memory backend %s can't be used multiple times.",
+               object_get_canonical_path_component(OBJECT(ct3d->dc.host_dc)));
+            return false;
+        }
         /*
          * Set DC regions as volatile for now, non-volatile support can
          * be added in the future if needed.
Signature · 1 line
2.43.0
#8 lore raw
In reply to Jonathan Cameron
Quoted 6 lines · On Tue, 2 Jul 2024 15:34:22 +0100 Jonathan Cameron…

Before pushing on to more significant features a few unrelated patches doing tidying up + one to avoid people setting the memory backend both for a CXL type 3 device and as normal RAM in an attempt to get SRAT to cover it correctly. We've had multiple 'bug' reports from this and if nothing else I'd like to stop getting those!

Quoted 6 lines

Based on master + the two DCD series Michael Tsirkin has queued.

Based-on: [PATCH v8 00/14] Enabling DCD emulation support in Qemu
Based-on: https://lore.kernel.org/qemu-devel/[email protected]/
Based-on: [PATCH qemu 0/2] hw/cxl: DCD tweaks and improvements.
Based-on: https://lore.kernel.org/qemu-devel/[email protected]/

I'll send a v2 that replaces the unused cfmw_list with the fix that makes us of it to avoid a crash.

Quoted 17 lines

Fan Ni (1):
hw/cxl/cxl-mailbox-utils: remove unneeded mailbox output payload space
zeroing

Jonathan Cameron (1):
hw/cxl: Check for multiple mappings of memory backends.

Li Zhijian (1):
hw/cxl: Get rid of unused cfmw_list

 include/hw/cxl/cxl.h       |  1 -
 hw/cxl/cxl-host.c          |  1 -
 hw/cxl/cxl-mailbox-utils.c |  7 -------
 hw/mem/cxl_type3.c         | 15 +++++++++++++++
 4 files changed, 15 insertions(+), 9 deletions(-)