On Fri, 6 Jun 2025 11:21:08 -0700
Fan Ni <nifan....@gmail.com> wrote:
> On Thu, Jun 05, 2025 at 11:42:22PM +0000, anisa.su...@gmail.com wrote:
> > From: Anisa Su <anisa...@samsung.com>
> >
> > FM DCD Management command 0x5604 implemented per CXL r3.2 Spec Section
> > 7.6.7.6.5
> >
> > Signed-off-by: Anisa Su <anisa...@samsung.com>
>
> See below...
A few follow ups.
>
> > ---
> > hw/cxl/cxl-mailbox-utils.c | 152 ++++++++++++++++++++++++++++++++++++
> > hw/mem/cxl_type3.c | 8 +-
> > include/hw/cxl/cxl_device.h | 4 +
> > 3 files changed, 160 insertions(+), 4 deletions(-)
> >
> > diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c
> > index 004e502b22..7ee5be00bc 100644
> > --- a/hw/cxl/cxl-mailbox-utils.c
> > +++ b/hw/cxl/cxl-mailbox-utils.c
> > @@ -123,6 +123,7 @@ enum {
> > #define GET_HOST_DC_REGION_CONFIG 0x1
> > #define SET_DC_REGION_CONFIG 0x2
> > #define GET_DC_REGION_EXTENT_LIST 0x3
> > + #define INITIATE_DC_ADD 0x4
> > };
> >
> > /* CCI Message Format CXL r3.1 Figure 7-19 */
> > @@ -3540,6 +3541,150 @@ static CXLRetCode
> > cmd_fm_get_dc_region_extent_list(const struct cxl_cmd *cmd,
> > return CXL_MBOX_SUCCESS;
> > }
> >
> > +static void cxl_mbox_dc_add_to_pending(CXLType3Dev *ct3d,
>
> This naming can be improved here, not straightforward to me.
> Maybe cxl_add_extents_to_pending_list() ?
>
> > + uint32_t ext_count,
> > + CXLDCExtentRaw extents[])
> > +{
> > + CXLDCExtentGroup *group = NULL;
> > + int i;
> > +
> > + for (i = 0; i < ext_count; i++) {
> > + group = cxl_insert_extent_to_extent_group(group,
> > + extents[i].start_dpa,
> > + extents[i].len,
> > + extents[i].tag,
> > + extents[i].shared_seq);
> > + }
> > +
> > + cxl_extent_group_list_insert_tail(&ct3d->dc.extents_pending, group);
> > + ct3d->dc.total_extent_count += ext_count;
> > +}
>
> Also the code is duplicate with existing code in cxl_type3.c
> qmp_cxl_process_dynamic_capacity_prescriptive().
> The function was simulating the behaviour of the mailbox command, so it is
> behaviour will be smilar to what we have in this patch,
> find a way to reuse code, maybe extract common code as a helper function and
> use
> it in both qmp interface and here.
>
> > +
> > +static void cxl_mbox_create_dc_event_records_for_extents(CXLType3Dev
> > *ct3d,
> cxl_create_dc_extent_records_for extents()?
> > + CXLDCEventType
> > type,
> > + CXLDCExtentRaw
> > extents[],
> > + uint32_t
> > ext_count)
> > +{
> > + CXLEventDynamicCapacity event_rec = {};
> > + int i;
> > +
> > + cxl_assign_event_header(&event_rec.hdr,
> > + &dynamic_capacity_uuid,
> > + (1 << CXL_EVENT_TYPE_INFO),
> > + sizeof(event_rec),
> > + cxl_device_get_timestamp(&ct3d->cxl_dstate));
> > + event_rec.type = type;
> > + event_rec.validity_flags = 1;
> > + event_rec.host_id = 0;
> > + event_rec.updated_region_id = 0;
> > + event_rec.extents_avail = CXL_NUM_EXTENTS_SUPPORTED -
> > + ct3d->dc.total_extent_count;
> > +
> > + for (i = 0; i < ext_count; i++) {
> > + memcpy(&event_rec.dynamic_capacity_extent,
> > + &extents[i],
> > + sizeof(CXLDCExtentRaw));
> > + event_rec.flags = 0;
> > + if (i < ext_count - 1) {
> > + /* Set "More" flag */
> > + event_rec.flags |= BIT(0);
> > + }
> > +
> > + if (cxl_event_insert(&ct3d->cxl_dstate,
> > + CXL_EVENT_TYPE_DYNAMIC_CAP,
> > + (CXLEventRecordRaw *)&event_rec)) {
> > + cxl_event_irq_assert(ct3d);
> > + }
> > + }
> > +}
>
> Some issue here. A lot of duplicate code compared to
> qmp_cxl_process_dynamic_capacity_prescriptive.
>
I'm not going to refactor this on my tree. Given the level of feedback,
Anisa can you spin a new patch to replace what I'm carrying (which is
modified version of this with a bit of rebasing).
I'll push out a tree once I've caught up with reviewing this a bit more.
> > +/* CXL r3.2 Section 7.6.7.6.5 Initiate Dynamic Capacity Add (Opcode 5604h)
> > */
> > +static CXLRetCode cmd_fm_initiate_dc_add(const struct cxl_cmd *cmd,
> > + uint8_t *payload_in,
> > + size_t len_in,
> > + uint8_t *payload_out,
> > + size_t *len_out,
> > + CXLCCI *cci)
> > +{
> > + struct {
> > + uint16_t host_id;
> > + uint8_t selection_policy;
> > + uint8_t reg_num;
> > + uint64_t length;
> > + uint8_t tag[0x10];
> > + uint32_t ext_count;
> > + CXLDCExtentRaw extents[];
> > + } QEMU_PACKED *in = (void *)payload_in;
> > + CXLType3Dev *ct3d = CXL_TYPE3(cci->d);
> > + CXLUpdateDCExtentListInPl *list;
> > + int i, rc;
> > +
> > + switch (in->selection_policy) {
> > + case CXL_EXTENT_SELECTION_POLICY_PRESCRIPTIVE:
> > + /* Adding extents exceeds device's extent tracking ability. */
> > + if (in->ext_count + ct3d->dc.total_extent_count >
> > + CXL_NUM_EXTENTS_SUPPORTED) {
> > + return CXL_MBOX_RESOURCES_EXHAUSTED;
> > + }
> > +
> > + list = calloc(1, (sizeof(*list) +
> > + in->ext_count *
> > sizeof(*list->updated_entries)));
>
> Use g_malloc() and g_free().
g_malloc0() I think.
>
> > + convert_raw_extents(in->extents, list, in->ext_count);
> > + rc = cxl_detect_malformed_extent_list(ct3d, list);
> > +
> > + for (i = 0; i < in->ext_count; i++) {
> > + CXLDCExtentRaw ext = in->extents[i];
> > + /* Check requested extents do not overlap with pending
> > extents. */
> > + if
> > (cxl_extent_groups_overlaps_dpa_range(&ct3d->dc.extents_pending,
> > + ext.start_dpa,
> > ext.len)) {
> > + return CXL_MBOX_INVALID_EXTENT_LIST;
> > + }
> > + /* Check requested extents do not overlap with existing
> > extents. */
> > + if (cxl_extents_overlaps_dpa_range(&ct3d->dc.extents,
> > + ext.start_dpa, ext.len)) {
> > + return CXL_MBOX_INVALID_EXTENT_LIST;
> > + }
> > + }
> > +
> > + if (rc) {
> > + return rc;
> > + }
> > +
> > + cxl_mbox_dc_add_to_pending(ct3d, in->ext_count, in->extents);
> > + cxl_mbox_create_dc_event_records_for_extents(ct3d,
> > + DC_EVENT_ADD_CAPACITY,
> > + in->extents,
> > + in->ext_count);
> > +
> > + return CXL_MBOX_SUCCESS;
> > + default:
> > + qemu_log_mask(LOG_UNIMP,
> > + "CXL extent selection policy not supported.\n");
> > + return CXL_MBOX_INVALID_INPUT;
> > + }
> > +
>
> For all the case to return, instead of return directly set return code and
> jump
> here, do two things:
> 1. g_free(list);
> 2. return rt;
I'd prefer this which I think has same effect. I like direct returns ;)
Don't forget the {} to define scope though - I did and you get odd error
messages :)
@@ -3674,19 +3674,19 @@ static CXLRetCode cmd_fm_initiate_dc_add(const struct
cxl_cmd *cmd,
CXLDCExtentRaw extents[];
} QEMU_PACKED *in = (void *)payload_in;
CXLType3Dev *ct3d = CXL_TYPE3(cci->d);
- CXLUpdateDCExtentListInPl *list;
int i, rc;
switch (in->selection_policy) {
- case CXL_EXTENT_SELECTION_POLICY_PRESCRIPTIVE:
- /* Adding extents exceeds device's extent tracking ability. */
+ case CXL_EXTENT_SELECTION_POLICY_PRESCRIPTIVE: {
+ /* Adding extents exceeds device's extent tracking ability. */
if (in->ext_count + ct3d->dc.total_extent_count >
CXL_NUM_EXTENTS_SUPPORTED) {
return CXL_MBOX_RESOURCES_EXHAUSTED;
}
- list = calloc(1, (sizeof(*list) +
- in->ext_count * sizeof(*list->updated_entries)));
+ g_autofree CXLUpdateDCExtentListInPl *list =
+ g_malloc0(sizeof(*list) +
+ in->ext_count * sizeof(*list->updated_entries));
convert_raw_extents(in->extents, list, in->ext_count);
rc = cxl_detect_malformed_extent_list(ct3d, list);
@@ -3715,13 +3715,12 @@ static CXLRetCode cmd_fm_initiate_dc_add(const struct
cxl_cmd *cmd,
in->ext_count);
return CXL_MBOX_SUCCESS;
+ }
default:
qemu_log_mask(LOG_UNIMP,
"CXL extent selection policy not supported.\n");
return CXL_MBOX_INVALID_INPUT;
}
-
- return CXL_MBOX_SUCCESS;
}
>
> Fan
>
> > + return CXL_MBOX_SUCCESS;
> > +}
> > +
> > static const struct cxl_cmd cxl_cmd_set[256][256] = {
> > [INFOSTAT][BACKGROUND_OPERATION_ABORT] = {
> > "BACKGROUND_OPERATION_ABORT",
> > cmd_infostat_bg_op_abort, 0, 0 },
> > @@ -3667,6 +3812,13 @@ static const struct cxl_cmd
> > cxl_cmd_set_fm_dcd[256][256] = {
> > CXL_MBOX_IMMEDIATE_DATA_CHANGE) },
> > [FMAPI_DCD_MGMT][GET_DC_REGION_EXTENT_LIST] = {
> > "GET_DC_REGION_EXTENT_LIST",
> > cmd_fm_get_dc_region_extent_list, 12, 0 },
> > + [FMAPI_DCD_MGMT][INITIATE_DC_ADD] = { "INIT_DC_ADD",
> > + cmd_fm_initiate_dc_add, ~0,
> > + (CXL_MBOX_CONFIG_CHANGE_COLD_RESET |
> > + CXL_MBOX_CONFIG_CHANGE_CONV_RESET |
> > + CXL_MBOX_CONFIG_CHANGE_CXL_RESET |
> > + CXL_MBOX_IMMEDIATE_CONFIG_CHANGE |
> > + CXL_MBOX_IMMEDIATE_DATA_CHANGE) },
> > };
> >
> > /*
> > diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c
> > index ee554a77be..ca9fe89e4f 100644
> > --- a/hw/mem/cxl_type3.c
> > +++ b/hw/mem/cxl_type3.c
> > @@ -1885,8 +1885,8 @@ void qmp_cxl_inject_memory_module_event(const char
> > *path, CxlEventLog log,
> > * the list.
> > * Return value: return true if has overlaps; otherwise, return false
> > */
> > -static bool cxl_extents_overlaps_dpa_range(CXLDCExtentList *list,
> > - uint64_t dpa, uint64_t len)
> > +bool cxl_extents_overlaps_dpa_range(CXLDCExtentList *list,
> > + uint64_t dpa, uint64_t len)
> > {
> > CXLDCExtent *ent;
> > Range range1, range2;
> > @@ -1931,8 +1931,8 @@ bool cxl_extents_contains_dpa_range(CXLDCExtentList
> > *list,
> > return false;
> > }
> >
> > -static bool cxl_extent_groups_overlaps_dpa_range(CXLDCExtentGroupList
> > *list,
> > - uint64_t dpa, uint64_t
> > len)
> > +bool cxl_extent_groups_overlaps_dpa_range(CXLDCExtentGroupList *list,
> > + uint64_t dpa, uint64_t len)
> > {
> > CXLDCExtentGroup *group;
> >
> > diff --git a/include/hw/cxl/cxl_device.h b/include/hw/cxl/cxl_device.h
> > index 76af75d2d0..d30f6503fa 100644
> > --- a/include/hw/cxl/cxl_device.h
> > +++ b/include/hw/cxl/cxl_device.h
> > @@ -724,4 +724,8 @@ bool ct3_test_region_block_backed(CXLType3Dev *ct3d,
> > uint64_t dpa,
> > void cxl_assign_event_header(CXLEventRecordHdr *hdr,
> > const QemuUUID *uuid, uint32_t flags,
> > uint8_t length, uint64_t timestamp);
> > +bool cxl_extents_overlaps_dpa_range(CXLDCExtentList *list,
> > + uint64_t dpa, uint64_t len);
> > +bool cxl_extent_groups_overlaps_dpa_range(CXLDCExtentGroupList *list,
> > + uint64_t dpa, uint64_t len);
> > #endif
> > --
> > 2.47.2
> >
