Message ID | 20221110185758.879472-12-ira.weiny@intel.com |
---|---|
State | Superseded |
Headers | show |
Series | CXL: Process event logs | expand |
On Thu, 10 Nov 2022 10:57:58 -0800 ira.weiny@intel.com wrote: > From: Ira Weiny <ira.weiny@intel.com> > > Log overflow is marked by a separate trace message. > > Simulate a log with lots of messages and flag overflow until it is > drained a bit. > > Signed-off-by: Ira Weiny <ira.weiny@intel.com> Looks fine to me Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > --- > Changes from RFC > Adjust for new struct changes > --- > tools/testing/cxl/test/events.c | 37 +++++++++++++++++++++++++++++++++ > 1 file changed, 37 insertions(+) > > diff --git a/tools/testing/cxl/test/events.c b/tools/testing/cxl/test/events.c > index 8693f3fb9cbb..5ce257114f4e 100644 > --- a/tools/testing/cxl/test/events.c > +++ b/tools/testing/cxl/test/events.c > @@ -69,11 +69,21 @@ static void event_store_add_event(struct mock_event_store *mes, > log->nr_events++; > } > > +static u16 log_overflow(struct mock_event_log *log) > +{ > + int cnt = log_rec_left(log) - 5; > + > + if (cnt < 0) > + return 0; > + return cnt; > +} > + > int mock_get_event(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *cmd) > { > struct cxl_get_event_payload *pl; > struct mock_event_log *log; > u8 log_type; > + u16 nr_overflow; > > /* Valid request? */ > if (cmd->size_in != sizeof(log_type)) > @@ -95,6 +105,20 @@ int mock_get_event(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *cmd) > if (log_rec_left(log) > 1) > pl->flags |= CXL_GET_EVENT_FLAG_MORE_RECORDS; > > + nr_overflow = log_overflow(log); > + if (nr_overflow) { > + u64 ns; > + > + pl->flags |= CXL_GET_EVENT_FLAG_OVERFLOW; > + pl->overflow_err_count = cpu_to_le16(nr_overflow); > + ns = ktime_get_real_ns(); > + ns -= 5000000000; /* 5s ago */ > + pl->first_overflow_timestamp = cpu_to_le64(ns); > + ns = ktime_get_real_ns(); > + ns -= 1000000000; /* 1s ago */ > + pl->last_overflow_timestamp = cpu_to_le64(ns); > + } > + > memcpy(&pl->record[0], get_cur_event(log), sizeof(pl->record[0])); > pl->record[0].hdr.handle = get_cur_event_handle(log); > return 0; > @@ -274,6 +298,19 @@ u32 cxl_mock_add_event_logs(struct cxl_dev_state *cxlds) > (struct cxl_event_record_raw *)&mem_module); > mes->ev_status |= CXLDEV_EVENT_STATUS_INFO; > > + event_store_add_event(mes, CXL_EVENT_TYPE_FAIL, &maint_needed); > + event_store_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace); > + event_store_add_event(mes, CXL_EVENT_TYPE_FAIL, > + (struct cxl_event_record_raw *)&dram); > + event_store_add_event(mes, CXL_EVENT_TYPE_FAIL, > + (struct cxl_event_record_raw *)&gen_media); > + event_store_add_event(mes, CXL_EVENT_TYPE_FAIL, > + (struct cxl_event_record_raw *)&mem_module); > + event_store_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace); > + event_store_add_event(mes, CXL_EVENT_TYPE_FAIL, > + (struct cxl_event_record_raw *)&dram); > + mes->ev_status |= CXLDEV_EVENT_STATUS_FAIL; > + > event_store_add_event(mes, CXL_EVENT_TYPE_FATAL, &hardware_replace); > event_store_add_event(mes, CXL_EVENT_TYPE_FATAL, > (struct cxl_event_record_raw *)&dram);
diff --git a/tools/testing/cxl/test/events.c b/tools/testing/cxl/test/events.c index 8693f3fb9cbb..5ce257114f4e 100644 --- a/tools/testing/cxl/test/events.c +++ b/tools/testing/cxl/test/events.c @@ -69,11 +69,21 @@ static void event_store_add_event(struct mock_event_store *mes, log->nr_events++; } +static u16 log_overflow(struct mock_event_log *log) +{ + int cnt = log_rec_left(log) - 5; + + if (cnt < 0) + return 0; + return cnt; +} + int mock_get_event(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *cmd) { struct cxl_get_event_payload *pl; struct mock_event_log *log; u8 log_type; + u16 nr_overflow; /* Valid request? */ if (cmd->size_in != sizeof(log_type)) @@ -95,6 +105,20 @@ int mock_get_event(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *cmd) if (log_rec_left(log) > 1) pl->flags |= CXL_GET_EVENT_FLAG_MORE_RECORDS; + nr_overflow = log_overflow(log); + if (nr_overflow) { + u64 ns; + + pl->flags |= CXL_GET_EVENT_FLAG_OVERFLOW; + pl->overflow_err_count = cpu_to_le16(nr_overflow); + ns = ktime_get_real_ns(); + ns -= 5000000000; /* 5s ago */ + pl->first_overflow_timestamp = cpu_to_le64(ns); + ns = ktime_get_real_ns(); + ns -= 1000000000; /* 1s ago */ + pl->last_overflow_timestamp = cpu_to_le64(ns); + } + memcpy(&pl->record[0], get_cur_event(log), sizeof(pl->record[0])); pl->record[0].hdr.handle = get_cur_event_handle(log); return 0; @@ -274,6 +298,19 @@ u32 cxl_mock_add_event_logs(struct cxl_dev_state *cxlds) (struct cxl_event_record_raw *)&mem_module); mes->ev_status |= CXLDEV_EVENT_STATUS_INFO; + event_store_add_event(mes, CXL_EVENT_TYPE_FAIL, &maint_needed); + event_store_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace); + event_store_add_event(mes, CXL_EVENT_TYPE_FAIL, + (struct cxl_event_record_raw *)&dram); + event_store_add_event(mes, CXL_EVENT_TYPE_FAIL, + (struct cxl_event_record_raw *)&gen_media); + event_store_add_event(mes, CXL_EVENT_TYPE_FAIL, + (struct cxl_event_record_raw *)&mem_module); + event_store_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace); + event_store_add_event(mes, CXL_EVENT_TYPE_FAIL, + (struct cxl_event_record_raw *)&dram); + mes->ev_status |= CXLDEV_EVENT_STATUS_FAIL; + event_store_add_event(mes, CXL_EVENT_TYPE_FATAL, &hardware_replace); event_store_add_event(mes, CXL_EVENT_TYPE_FATAL, (struct cxl_event_record_raw *)&dram);