| Message ID | 20230725183939.2741025-9-fan.ni@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [Qemu,v2,1/9] hw/cxl/cxl-mailbox-utils: Add dc_event_log_size field to output payload of identify memory device command | expand |
On Tue, 25 Jul 2023 18:39:56 +0000 Fan Ni <fan.ni@samsung.com> wrote: > From: Fan Ni <nifan@outlook.com> > > Since fabric manager emulation is not supported yet, the change implements > the functions to add/release dynamic capacity extents as QMP interfaces. > > 1. Add dynamic capacity extents: > > For example, the command to add two continuous extents (each is 128MB long) > to region 0 (starting at dpa offset 0 and 128MB) looks like below: > > { "execute": "qmp_capabilities" } > > { "execute": "cxl-add-dynamic-capacity-event", > "arguments": { > "path": "/machine/peripheral/cxl-dcd0", > "extents": [ > { > "region-id": 0, > "dpa": 0, > "len": 128 > }, > { > "region-id": 0, > "dpa": 128, > "len": 128 > } > ] > } > } > > 2. Release dynamic capacity extents: > > For example, the command to release an extent of size 128MB from region 0 > (starting at dpa offset 128MB) look like below: > > { "execute": "cxl-release-dynamic-capacity-event", > "arguments": { > "path": "/machine/peripheral/cxl-dcd0", > "extents": [ > { > "region-id": 0, > "dpa": 128, > "len": 128 > } > ] > } > } > > Signed-off-by: Fan Ni <fan.ni@samsung.com> > --- > hw/mem/cxl_type3.c | 145 ++++++++++++++++++++++++++++++++++++ > hw/mem/cxl_type3_stubs.c | 6 ++ > include/hw/cxl/cxl_events.h | 16 ++++ > qapi/cxl.json | 49 ++++++++++++ > 4 files changed, 216 insertions(+) > > diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c > index f1170b8047..41a828598a 100644 > --- a/hw/mem/cxl_type3.c > +++ b/hw/mem/cxl_type3.c > @@ -1817,6 +1817,151 @@ void qmp_cxl_inject_memory_module_event(const char *path, CxlEventLog log, > } > } > > +static const QemuUUID dynamic_capacity_uuid = { > + .data = UUID(0xca95afa7, 0xf183, 0x4018, 0x8c, 0x2f, > + 0x95, 0x26, 0x8e, 0x10, 0x1a, 0x2a), > +}; > + > +/* > + * cxl r3.0: Table 8-47 > + * 00h: add capacity > + * 01h: release capacity > + * 02h: forced capacity release > + * 03h: region configuration updated > + * 04h: Add capacity response > + * 05h: capacity released If we explicitly set the values in the enum below then this comment only adds the useful reference. Hence I've done that and updated reference to my preferred format. Also moved the reference up a few lines so it covers the UUID as well. > + */ > +enum DC_Event_Type { > + DC_EVENT_ADD_CAPACITY, > + DC_EVENT_RELEASE_CAPACITY, > + DC_EVENT_FORCED_RELEASE_CAPACITY, > + DC_EVENT_REGION_CONFIG_UPDATED, > + DC_EVENT_ADD_CAPACITY_RSP, > + DC_EVENT_CAPACITY_RELEASED, > + DC_EVENT_NUM > +}; > + > +#define MEM_BLK_SIZE_MB 128 > +static void qmp_cxl_process_dynamic_capacity_event(const char *path, > + CxlEventLog log, enum DC_Event_Type type, > + uint16_t hid, CXLDCExtentRecordList *records, Error **errp) > +{ > + Object *obj = object_resolve_path(path, NULL); > + CXLEventDynamicCapacity dCap; > + CXLEventRecordHdr *hdr = &dCap.hdr; > + CXLDeviceState *cxlds; > + CXLType3Dev *dcd; > + uint8_t flags = 1 << CXL_EVENT_TYPE_INFO; > + uint32_t num_extents = 0; > + CXLDCExtentRecordList *list = records; For consistency (as we reset this for second pass) I've moved the setting of this down to just above the first loop. > + CXLDCExtent_raw *extents; > + uint64_t dpa, len; > + uint8_t rid = 0; > + int i; > + > + if (!obj) { > + error_setg(errp, "Unable to resolve path"); > + return; > + } > + if (!object_dynamic_cast(obj, TYPE_CXL_TYPE3)) { > + error_setg(errp, "Path not point to a valid CXL type3 device"); > + return; > + } > + > + dcd = CXL_TYPE3(obj); > + cxlds = &dcd->cxl_dstate; Only used once so I've moved it inline. > + memset(&dCap, 0, sizeof(dCap)); Can use dCap = {}; It's packed so no holes to be covered by the memset. AS a side note, I'd have done this after the next check if we were doing it explicitly. With the {} approach we can rely on compiler to optimize when it is done. > + > + if (!dcd->dc.num_regions) { > + error_setg(errp, "No dynamic capacity support from the device"); > + return; > + } > + > + while (list) { > + dpa = list->value->dpa * 1024 * 1024; MiB > + len = list->value->len * 1024 * 1024; > + rid = list->value->region_id; > + > + if (rid >= dcd->dc.num_regions) { > + error_setg(errp, "region id is too large"); > + return; > + } > + > + if (dpa % dcd->dc.regions[rid].block_size > + || len % dcd->dc.regions[rid].block_size) { > + error_setg(errp, "dpa or len is not aligned to region block size"); > + return; > + } > + > + if (dpa + len > dcd->dc.regions[rid].decode_len * 256 * 1024 * 1024) { > + error_setg(errp, "extent range is beyond the region end"); > + return; > + } > + > + num_extents++; > + list = list->next; > + } > + > + i = 0; > + list = records; > + extents = g_new0(CXLDCExtent_raw, num_extents); > + while (list) { > + dpa = list->value->dpa * 1024 * 1024; > + len = list->value->len * 1024 * 1024; MiB > + rid = list->value->region_id; > + > + extents[i].start_dpa = dpa + dcd->dc.regions[rid].base; > + extents[i].len = len; > + memset(extents[i].tag, 0, 0x10); I'd suggest we add a tag sooner rather than later. Can make it optional and default to zero though. Note I'm not making that change whilst rebasing this. > + extents[i].shared_seq = 0; > + > + list = list->next; > + i++; > + } > + > + /* > + * 8.2.9.1.5 > + * All Dynamic Capacity event records shall set the Event Record > + * Severity field in the Common Event Record Format to Informational > + * Event. All Dynamic Capacity related events shall be logged in the > + * Dynamic Capacity Event Log. > + */ > + cxl_assign_event_header(hdr, &dynamic_capacity_uuid, flags, sizeof(dCap), > + cxl_device_get_timestamp(&dcd->cxl_dstate)); > + > + dCap.type = type; > + stw_le_p(&dCap.host_id, hid); > + /* only valid for DC_REGION_CONFIG_UPDATED event */ > + dCap.updated_region_id = rid; > + for (i = 0; i < num_extents; i++) { > + memcpy(&dCap.dynamic_capacity_extent, &extents[i] > + , sizeof(CXLDCExtent_raw)); > + > + if (cxl_event_insert(cxlds, CXL_EVENT_TYPE_DYNAMIC_CAP, > + (CXLEventRecordRaw *)&dCap)) { > + cxl_event_irq_assert(dcd); > + } > + } > + > + g_free(extents); Can use g_autofree given lifetime of this can be governed by the scope. Qemu code does this a lot - it's just starting to sneak into the kernel as well and makes this sort of handling much nicer as they end up more or less looking like they are on the stack ;) > +} > + > +void qmp_cxl_add_dynamic_capacity_event(const char *path, > + struct CXLDCExtentRecordList *records, Don't need the struct as there is a typedef autocreated from the qmp schema stuff. > + Error **errp) Where it doesn't go over 80 chars, prefer aligned to one space after the ( > +{ > + qmp_cxl_process_dynamic_capacity_event(path, CXL_EVENT_LOG_INFORMATIONAL, > + DC_EVENT_ADD_CAPACITY, 0, records, errp); > +} > + > +void qmp_cxl_release_dynamic_capacity_event(const char *path, > + struct CXLDCExtentRecordList *records, > + Error **errp) > +{ > + qmp_cxl_process_dynamic_capacity_event(path, CXL_EVENT_LOG_INFORMATIONAL, > + DC_EVENT_RELEASE_CAPACITY, 0, records, errp); > +} > + > static void ct3_class_init(ObjectClass *oc, void *data) > { > DeviceClass *dc = DEVICE_CLASS(oc); > diff --git a/hw/mem/cxl_type3_stubs.c b/hw/mem/cxl_type3_stubs.c > index f3e4a9fa72..482229f3bd 100644 > --- a/hw/mem/cxl_type3_stubs.c > +++ b/hw/mem/cxl_type3_stubs.c > @@ -56,3 +56,9 @@ void qmp_cxl_inject_correctable_error(const char *path, CxlCorErrorType type, > { > error_setg(errp, "CXL Type 3 support is not compiled in"); > } > + > +void qmp_cxl_add_dynamic_capacity_event(const char *path, > + struct CXLDCExtentRecordList *records, Error **errp) {} Good to have the error prints as done for the other cases. > + > +void qmp_cxl_release_dynamic_capacity_event(const char *path, > + struct CXLDCExtentRecordList *records, Error **errp) {} > diff --git a/include/hw/cxl/cxl_events.h b/include/hw/cxl/cxl_events.h > index 089ba2091f..3baf745f8d 100644 > --- a/include/hw/cxl/cxl_events.h > +++ b/include/hw/cxl/cxl_events.h > @@ -165,4 +165,20 @@ typedef struct CXLEventMemoryModule { > uint8_t reserved[0x3d]; > } QEMU_PACKED CXLEventMemoryModule; > > +/* > + * Dynamic Capacity Event Record > + * CXL Rev 3.0 Section 8.2.9.2.1.5: Table 8-47 > + * All fields little endian. > + */ > +typedef struct CXLEventDynamicCapacity { > + CXLEventRecordHdr hdr; > + uint8_t type; > + uint8_t reserved1; > + uint16_t host_id; > + uint8_t updated_region_id; > + uint8_t reserved2[3]; > + uint8_t dynamic_capacity_extent[0x28]; /* defined in cxl_device.h */ > + uint8_t reserved[0x20]; > +} QEMU_PACKED CXLEventDynamicCapacity; > + > #endif /* CXL_EVENTS_H */ > diff --git a/qapi/cxl.json b/qapi/cxl.json > index 05c560cfe5..fb04ec4c41 100644 > --- a/qapi/cxl.json > +++ b/qapi/cxl.json > @@ -369,3 +369,52 @@ > ## > {'command': 'cxl-inject-correctable-error', > 'data': {'path': 'str', 'type': 'CxlCorErrorType'}} > + > +## > +# @CXLDCExtentRecord: > +# > +# Record of a single extent to add/release > +# > +# @region-id: id of the region where the extent to add/release > +# @dpa: start dpa (in MiB) of the extent, related to region base address > +# @len: extent size (in MiB) > +# > +# Since: 8.0 > +## > +{ 'struct': 'CXLDCExtentRecord', > + 'data': { > + 'region-id': 'uint8', > + 'dpa':'uint64', > + 'len': 'uint64' > + } > +} > + > +## > +# @cxl-add-dynamic-capacity-event: In later patches this is going to add the capacity - the event is just part of it. So I've renamed to simply cxl-add-dynamic-capacity and added a bit about it 'starting the add capacity flow./ > +# > +# Command to add dynamic capacity extent event > +# > +# @path: CXL DCD canonical QOM path > +# @extents: Extents to add Added a highly speculative (and optimistic) Since: 8.2 as hopefully we can remember to update them. I'm thinking this is at least 9.0 material but you never know! :) > +# > +## > +{ 'command': 'cxl-add-dynamic-capacity-event', > + 'data': { 'path': 'str', > + 'extents': [ 'CXLDCExtentRecord' ] > + } > +} > + > +## > +# @cxl-release-dynamic-capacity-event: > +# > +# Command to release dynamic capacity extent event > +# > +# @path: CXL DCD canonical QOM path > +# @extents: Extents to release > +# > +## > +{ 'command': 'cxl-release-dynamic-capacity-event', > + 'data': { 'path': 'str', > + 'extents': [ 'CXLDCExtentRecord' ] > + } > +}
diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c index f1170b8047..41a828598a 100644 --- a/hw/mem/cxl_type3.c +++ b/hw/mem/cxl_type3.c @@ -1817,6 +1817,151 @@ void qmp_cxl_inject_memory_module_event(const char *path, CxlEventLog log, } } +static const QemuUUID dynamic_capacity_uuid = { + .data = UUID(0xca95afa7, 0xf183, 0x4018, 0x8c, 0x2f, + 0x95, 0x26, 0x8e, 0x10, 0x1a, 0x2a), +}; + +/* + * cxl r3.0: Table 8-47 + * 00h: add capacity + * 01h: release capacity + * 02h: forced capacity release + * 03h: region configuration updated + * 04h: Add capacity response + * 05h: capacity released + */ +enum DC_Event_Type { + DC_EVENT_ADD_CAPACITY, + DC_EVENT_RELEASE_CAPACITY, + DC_EVENT_FORCED_RELEASE_CAPACITY, + DC_EVENT_REGION_CONFIG_UPDATED, + DC_EVENT_ADD_CAPACITY_RSP, + DC_EVENT_CAPACITY_RELEASED, + DC_EVENT_NUM +}; + +#define MEM_BLK_SIZE_MB 128 +static void qmp_cxl_process_dynamic_capacity_event(const char *path, + CxlEventLog log, enum DC_Event_Type type, + uint16_t hid, CXLDCExtentRecordList *records, Error **errp) +{ + Object *obj = object_resolve_path(path, NULL); + CXLEventDynamicCapacity dCap; + CXLEventRecordHdr *hdr = &dCap.hdr; + CXLDeviceState *cxlds; + CXLType3Dev *dcd; + uint8_t flags = 1 << CXL_EVENT_TYPE_INFO; + uint32_t num_extents = 0; + CXLDCExtentRecordList *list = records; + CXLDCExtent_raw *extents; + uint64_t dpa, len; + uint8_t rid = 0; + int i; + + if (!obj) { + error_setg(errp, "Unable to resolve path"); + return; + } + if (!object_dynamic_cast(obj, TYPE_CXL_TYPE3)) { + error_setg(errp, "Path not point to a valid CXL type3 device"); + return; + } + + dcd = CXL_TYPE3(obj); + cxlds = &dcd->cxl_dstate; + memset(&dCap, 0, sizeof(dCap)); + + if (!dcd->dc.num_regions) { + error_setg(errp, "No dynamic capacity support from the device"); + return; + } + + while (list) { + dpa = list->value->dpa * 1024 * 1024; + len = list->value->len * 1024 * 1024; + rid = list->value->region_id; + + if (rid >= dcd->dc.num_regions) { + error_setg(errp, "region id is too large"); + return; + } + + if (dpa % dcd->dc.regions[rid].block_size + || len % dcd->dc.regions[rid].block_size) { + error_setg(errp, "dpa or len is not aligned to region block size"); + return; + } + + if (dpa + len > dcd->dc.regions[rid].decode_len * 256 * 1024 * 1024) { + error_setg(errp, "extent range is beyond the region end"); + return; + } + + num_extents++; + list = list->next; + } + + i = 0; + list = records; + extents = g_new0(CXLDCExtent_raw, num_extents); + while (list) { + dpa = list->value->dpa * 1024 * 1024; + len = list->value->len * 1024 * 1024; + rid = list->value->region_id; + + extents[i].start_dpa = dpa + dcd->dc.regions[rid].base; + extents[i].len = len; + memset(extents[i].tag, 0, 0x10); + extents[i].shared_seq = 0; + + list = list->next; + i++; + } + + /* + * 8.2.9.1.5 + * All Dynamic Capacity event records shall set the Event Record + * Severity field in the Common Event Record Format to Informational + * Event. All Dynamic Capacity related events shall be logged in the + * Dynamic Capacity Event Log. + */ + cxl_assign_event_header(hdr, &dynamic_capacity_uuid, flags, sizeof(dCap), + cxl_device_get_timestamp(&dcd->cxl_dstate)); + + dCap.type = type; + stw_le_p(&dCap.host_id, hid); + /* only valid for DC_REGION_CONFIG_UPDATED event */ + dCap.updated_region_id = rid; + for (i = 0; i < num_extents; i++) { + memcpy(&dCap.dynamic_capacity_extent, &extents[i] + , sizeof(CXLDCExtent_raw)); + + if (cxl_event_insert(cxlds, CXL_EVENT_TYPE_DYNAMIC_CAP, + (CXLEventRecordRaw *)&dCap)) { + cxl_event_irq_assert(dcd); + } + } + + g_free(extents); +} + +void qmp_cxl_add_dynamic_capacity_event(const char *path, + struct CXLDCExtentRecordList *records, + Error **errp) +{ + qmp_cxl_process_dynamic_capacity_event(path, CXL_EVENT_LOG_INFORMATIONAL, + DC_EVENT_ADD_CAPACITY, 0, records, errp); +} + +void qmp_cxl_release_dynamic_capacity_event(const char *path, + struct CXLDCExtentRecordList *records, + Error **errp) +{ + qmp_cxl_process_dynamic_capacity_event(path, CXL_EVENT_LOG_INFORMATIONAL, + DC_EVENT_RELEASE_CAPACITY, 0, records, errp); +} + static void ct3_class_init(ObjectClass *oc, void *data) { DeviceClass *dc = DEVICE_CLASS(oc); diff --git a/hw/mem/cxl_type3_stubs.c b/hw/mem/cxl_type3_stubs.c index f3e4a9fa72..482229f3bd 100644 --- a/hw/mem/cxl_type3_stubs.c +++ b/hw/mem/cxl_type3_stubs.c @@ -56,3 +56,9 @@ void qmp_cxl_inject_correctable_error(const char *path, CxlCorErrorType type, { error_setg(errp, "CXL Type 3 support is not compiled in"); } + +void qmp_cxl_add_dynamic_capacity_event(const char *path, + struct CXLDCExtentRecordList *records, Error **errp) {} + +void qmp_cxl_release_dynamic_capacity_event(const char *path, + struct CXLDCExtentRecordList *records, Error **errp) {} diff --git a/include/hw/cxl/cxl_events.h b/include/hw/cxl/cxl_events.h index 089ba2091f..3baf745f8d 100644 --- a/include/hw/cxl/cxl_events.h +++ b/include/hw/cxl/cxl_events.h @@ -165,4 +165,20 @@ typedef struct CXLEventMemoryModule { uint8_t reserved[0x3d]; } QEMU_PACKED CXLEventMemoryModule; +/* + * Dynamic Capacity Event Record + * CXL Rev 3.0 Section 8.2.9.2.1.5: Table 8-47 + * All fields little endian. + */ +typedef struct CXLEventDynamicCapacity { + CXLEventRecordHdr hdr; + uint8_t type; + uint8_t reserved1; + uint16_t host_id; + uint8_t updated_region_id; + uint8_t reserved2[3]; + uint8_t dynamic_capacity_extent[0x28]; /* defined in cxl_device.h */ + uint8_t reserved[0x20]; +} QEMU_PACKED CXLEventDynamicCapacity; + #endif /* CXL_EVENTS_H */ diff --git a/qapi/cxl.json b/qapi/cxl.json index 05c560cfe5..fb04ec4c41 100644 --- a/qapi/cxl.json +++ b/qapi/cxl.json @@ -369,3 +369,52 @@ ## {'command': 'cxl-inject-correctable-error', 'data': {'path': 'str', 'type': 'CxlCorErrorType'}} + +## +# @CXLDCExtentRecord: +# +# Record of a single extent to add/release +# +# @region-id: id of the region where the extent to add/release +# @dpa: start dpa (in MiB) of the extent, related to region base address +# @len: extent size (in MiB) +# +# Since: 8.0 +## +{ 'struct': 'CXLDCExtentRecord', + 'data': { + 'region-id': 'uint8', + 'dpa':'uint64', + 'len': 'uint64' + } +} + +## +# @cxl-add-dynamic-capacity-event: +# +# Command to add dynamic capacity extent event +# +# @path: CXL DCD canonical QOM path +# @extents: Extents to add +# +## +{ 'command': 'cxl-add-dynamic-capacity-event', + 'data': { 'path': 'str', + 'extents': [ 'CXLDCExtentRecord' ] + } +} + +## +# @cxl-release-dynamic-capacity-event: +# +# Command to release dynamic capacity extent event +# +# @path: CXL DCD canonical QOM path +# @extents: Extents to release +# +## +{ 'command': 'cxl-release-dynamic-capacity-event', + 'data': { 'path': 'str', + 'extents': [ 'CXLDCExtentRecord' ] + } +}