| Message ID | 20231222090051.3265307-5-42.hyeyoo@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | A Followup for "QEMU: CXL mailbox rework and features (Part 1)" | expand |
On Fri, 22 Dec 2023, Hyeonggon Yoo wrote: >Per spec 8.2.9.9.5.1 Sanitize (Opcode 4400h), sanitize command should >delete all event logs. Introduce cxl_discard_all_event_logs() and call >this in __do_sanitization(). lgtm Reviewed-by: Davidlohr Bueso <dave@stgolabs.net> >Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> >--- > hw/cxl/cxl-events.c | 13 +++++++++++++ > hw/cxl/cxl-mailbox-utils.c | 1 + > include/hw/cxl/cxl_device.h | 1 + > 3 files changed, 15 insertions(+) > >diff --git a/hw/cxl/cxl-events.c b/hw/cxl/cxl-events.c >index bee6dfaf14..837b18ab47 100644 >--- a/hw/cxl/cxl-events.c >+++ b/hw/cxl/cxl-events.c >@@ -141,6 +141,19 @@ bool cxl_event_insert(CXLDeviceState *cxlds, CXLEventLogType log_type, > return cxl_event_count(log) == 1; > } > >+void cxl_discard_all_event_records(CXLDeviceState *cxlds) >+{ >+ CXLEventLogType log_type; >+ CXLEventLog *log; >+ >+ for (log_type = 0; log_type < CXL_EVENT_TYPE_MAX; log_type++) { >+ log = &cxlds->event_logs[log_type]; >+ while (!cxl_event_empty(log)) { >+ cxl_event_delete_head(cxlds, log_type, log); >+ } >+ } >+} >+ > CXLRetCode cxl_event_get_records(CXLDeviceState *cxlds, CXLGetEventPayload *pl, > uint8_t log_type, int max_recs, > size_t *len) >diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c >index efeb5f8174..2ade351d82 100644 >--- a/hw/cxl/cxl-mailbox-utils.c >+++ b/hw/cxl/cxl-mailbox-utils.c >@@ -1150,6 +1150,7 @@ static void __do_sanitization(CXLType3Dev *ct3d) > memset(lsa, 0, memory_region_size(mr)); > } > } >+ cxl_discard_all_event_records(&ct3d->cxl_dstate); > } > > /* >diff --git a/include/hw/cxl/cxl_device.h b/include/hw/cxl/cxl_device.h >index 5618061ebe..8f05dd9beb 100644 >--- a/include/hw/cxl/cxl_device.h >+++ b/include/hw/cxl/cxl_device.h >@@ -604,6 +604,7 @@ CXLRetCode cxl_event_get_records(CXLDeviceState *cxlds, CXLGetEventPayload *pl, > size_t *len); > CXLRetCode cxl_event_clear_records(CXLDeviceState *cxlds, > CXLClearEventPayload *pl); >+void cxl_discard_all_event_records(CXLDeviceState *cxlds); > > void cxl_event_irq_assert(CXLType3Dev *ct3d); > >-- >2.39.3 >
On Mon, 1 Jan 2024 13:38:28 -0800 Davidlohr Bueso <dave@stgolabs.net> wrote: > On Fri, 22 Dec 2023, Hyeonggon Yoo wrote: > > >Per spec 8.2.9.9.5.1 Sanitize (Opcode 4400h), sanitize command should > >delete all event logs. Introduce cxl_discard_all_event_logs() and call > >this in __do_sanitization(). > > lgtm > > Reviewed-by: Davidlohr Bueso <dave@stgolabs.net> I'll carry this on my tree on top of where I put the previous patch. Seems to apply there at least :) If it makes sense to remix these patches a bit to provide cleaner history I'll do so once these are ready to send for Michael to look at. Jonathan > > >Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> > >--- > > hw/cxl/cxl-events.c | 13 +++++++++++++ > > hw/cxl/cxl-mailbox-utils.c | 1 + > > include/hw/cxl/cxl_device.h | 1 + > > 3 files changed, 15 insertions(+) > > > >diff --git a/hw/cxl/cxl-events.c b/hw/cxl/cxl-events.c > >index bee6dfaf14..837b18ab47 100644 > >--- a/hw/cxl/cxl-events.c > >+++ b/hw/cxl/cxl-events.c > >@@ -141,6 +141,19 @@ bool cxl_event_insert(CXLDeviceState *cxlds, CXLEventLogType log_type, > > return cxl_event_count(log) == 1; > > } > > > >+void cxl_discard_all_event_records(CXLDeviceState *cxlds) > >+{ > >+ CXLEventLogType log_type; > >+ CXLEventLog *log; > >+ > >+ for (log_type = 0; log_type < CXL_EVENT_TYPE_MAX; log_type++) { > >+ log = &cxlds->event_logs[log_type]; > >+ while (!cxl_event_empty(log)) { > >+ cxl_event_delete_head(cxlds, log_type, log); > >+ } > >+ } > >+} > >+ > > CXLRetCode cxl_event_get_records(CXLDeviceState *cxlds, CXLGetEventPayload *pl, > > uint8_t log_type, int max_recs, > > size_t *len) > >diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c > >index efeb5f8174..2ade351d82 100644 > >--- a/hw/cxl/cxl-mailbox-utils.c > >+++ b/hw/cxl/cxl-mailbox-utils.c > >@@ -1150,6 +1150,7 @@ static void __do_sanitization(CXLType3Dev *ct3d) > > memset(lsa, 0, memory_region_size(mr)); > > } > > } > >+ cxl_discard_all_event_records(&ct3d->cxl_dstate); > > } > > > > /* > >diff --git a/include/hw/cxl/cxl_device.h b/include/hw/cxl/cxl_device.h > >index 5618061ebe..8f05dd9beb 100644 > >--- a/include/hw/cxl/cxl_device.h > >+++ b/include/hw/cxl/cxl_device.h > >@@ -604,6 +604,7 @@ CXLRetCode cxl_event_get_records(CXLDeviceState *cxlds, CXLGetEventPayload *pl, > > size_t *len); > > CXLRetCode cxl_event_clear_records(CXLDeviceState *cxlds, > > CXLClearEventPayload *pl); > >+void cxl_discard_all_event_records(CXLDeviceState *cxlds); > > > > void cxl_event_irq_assert(CXLType3Dev *ct3d); > > > >-- > >2.39.3 > >
diff --git a/hw/cxl/cxl-events.c b/hw/cxl/cxl-events.c index bee6dfaf14..837b18ab47 100644 --- a/hw/cxl/cxl-events.c +++ b/hw/cxl/cxl-events.c @@ -141,6 +141,19 @@ bool cxl_event_insert(CXLDeviceState *cxlds, CXLEventLogType log_type, return cxl_event_count(log) == 1; } +void cxl_discard_all_event_records(CXLDeviceState *cxlds) +{ + CXLEventLogType log_type; + CXLEventLog *log; + + for (log_type = 0; log_type < CXL_EVENT_TYPE_MAX; log_type++) { + log = &cxlds->event_logs[log_type]; + while (!cxl_event_empty(log)) { + cxl_event_delete_head(cxlds, log_type, log); + } + } +} + CXLRetCode cxl_event_get_records(CXLDeviceState *cxlds, CXLGetEventPayload *pl, uint8_t log_type, int max_recs, size_t *len) diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c index efeb5f8174..2ade351d82 100644 --- a/hw/cxl/cxl-mailbox-utils.c +++ b/hw/cxl/cxl-mailbox-utils.c @@ -1150,6 +1150,7 @@ static void __do_sanitization(CXLType3Dev *ct3d) memset(lsa, 0, memory_region_size(mr)); } } + cxl_discard_all_event_records(&ct3d->cxl_dstate); } /* diff --git a/include/hw/cxl/cxl_device.h b/include/hw/cxl/cxl_device.h index 5618061ebe..8f05dd9beb 100644 --- a/include/hw/cxl/cxl_device.h +++ b/include/hw/cxl/cxl_device.h @@ -604,6 +604,7 @@ CXLRetCode cxl_event_get_records(CXLDeviceState *cxlds, CXLGetEventPayload *pl, size_t *len); CXLRetCode cxl_event_clear_records(CXLDeviceState *cxlds, CXLClearEventPayload *pl); +void cxl_discard_all_event_records(CXLDeviceState *cxlds); void cxl_event_irq_assert(CXLType3Dev *ct3d);
Per spec 8.2.9.9.5.1 Sanitize (Opcode 4400h), sanitize command should delete all event logs. Introduce cxl_discard_all_event_logs() and call this in __do_sanitization(). Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> --- hw/cxl/cxl-events.c | 13 +++++++++++++ hw/cxl/cxl-mailbox-utils.c | 1 + include/hw/cxl/cxl_device.h | 1 + 3 files changed, 15 insertions(+)