Message ID | 20221216-cxl-ev-log-v7-8-2316a5c8f7d8@intel.com |
---|---|
State | Accepted |
Commit | bab2a5e6fe7fddc00be0356bd538e38161bab085 |
Headers | show |
Series | cxl: Process event logs | expand |
On 1/17/23 10:53 PM, Ira Weiny wrote: > Log overflow is marked by a separate trace message. > > Simulate a log with lots of messages and flag overflow until space is > cleared. > > Reviewed-by: Dan Williams <dan.j.williams@intel.com> > Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > Signed-off-by: Ira Weiny <ira.weiny@intel.com> Reviewed-by: Dave Jiang <dave.jiang@intel.com> > > --- > Changes in v7: > <no change> > --- > tools/testing/cxl/test/mem.c | 50 +++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 49 insertions(+), 1 deletion(-) > > diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c > index 00bf19a68604..9263b04d35f7 100644 > --- a/tools/testing/cxl/test/mem.c > +++ b/tools/testing/cxl/test/mem.c > @@ -78,6 +78,8 @@ struct mock_event_log { > u16 clear_idx; > u16 cur_idx; > u16 nr_events; > + u16 nr_overflow; > + u16 overflow_reset; > struct cxl_event_record_raw *events[CXL_TEST_EVENT_CNT_MAX]; > }; > > @@ -116,6 +118,7 @@ static void event_reset_log(struct mock_event_log *log) > { > log->cur_idx = 0; > log->clear_idx = 0; > + log->nr_overflow = log->overflow_reset; > } > > /* Handle can never be 0 use 1 based indexing for handle */ > @@ -147,8 +150,12 @@ static void mes_add_event(struct mock_event_store *mes, > return; > > log = &mes->mock_logs[log_type]; > - if (WARN_ON(log->nr_events >= CXL_TEST_EVENT_CNT_MAX)) > + > + if ((log->nr_events + 1) > CXL_TEST_EVENT_CNT_MAX) { > + log->nr_overflow++; > + log->overflow_reset = log->nr_overflow; > return; > + } > > log->events[log->nr_events] = event; > log->nr_events++; > @@ -159,6 +166,7 @@ static int mock_get_event(struct cxl_dev_state *cxlds, > { > struct cxl_get_event_payload *pl; > struct mock_event_log *log; > + u16 nr_overflow; > u8 log_type; > int i; > > @@ -191,6 +199,19 @@ static int mock_get_event(struct cxl_dev_state *cxlds, > if (!event_log_empty(log)) > pl->flags |= CXL_GET_EVENT_FLAG_MORE_RECORDS; > > + if (log->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); > + } > + > return 0; > } > > @@ -231,6 +252,9 @@ static int mock_clear_event(struct cxl_dev_state *cxlds, > } > } > > + if (log->nr_overflow) > + log->nr_overflow = 0; > + > /* Clear events */ > log->clear_idx += pl->nr_recs; > return 0; > @@ -353,6 +377,30 @@ static void cxl_mock_add_event_logs(struct mock_event_store *mes) > (struct cxl_event_record_raw *)&mem_module); > mes->ev_status |= CXLDEV_EVENT_STATUS_INFO; > > + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, &maint_needed); > + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace); > + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, > + (struct cxl_event_record_raw *)&dram); > + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, > + (struct cxl_event_record_raw *)&gen_media); > + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, > + (struct cxl_event_record_raw *)&mem_module); > + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace); > + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, > + (struct cxl_event_record_raw *)&dram); > + /* Overflow this log */ > + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace); > + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace); > + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace); > + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace); > + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace); > + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace); > + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace); > + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace); > + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace); > + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace); > + mes->ev_status |= CXLDEV_EVENT_STATUS_FAIL; > + > mes_add_event(mes, CXL_EVENT_TYPE_FATAL, &hardware_replace); > mes_add_event(mes, CXL_EVENT_TYPE_FATAL, > (struct cxl_event_record_raw *)&dram); >
diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c index 00bf19a68604..9263b04d35f7 100644 --- a/tools/testing/cxl/test/mem.c +++ b/tools/testing/cxl/test/mem.c @@ -78,6 +78,8 @@ struct mock_event_log { u16 clear_idx; u16 cur_idx; u16 nr_events; + u16 nr_overflow; + u16 overflow_reset; struct cxl_event_record_raw *events[CXL_TEST_EVENT_CNT_MAX]; }; @@ -116,6 +118,7 @@ static void event_reset_log(struct mock_event_log *log) { log->cur_idx = 0; log->clear_idx = 0; + log->nr_overflow = log->overflow_reset; } /* Handle can never be 0 use 1 based indexing for handle */ @@ -147,8 +150,12 @@ static void mes_add_event(struct mock_event_store *mes, return; log = &mes->mock_logs[log_type]; - if (WARN_ON(log->nr_events >= CXL_TEST_EVENT_CNT_MAX)) + + if ((log->nr_events + 1) > CXL_TEST_EVENT_CNT_MAX) { + log->nr_overflow++; + log->overflow_reset = log->nr_overflow; return; + } log->events[log->nr_events] = event; log->nr_events++; @@ -159,6 +166,7 @@ static int mock_get_event(struct cxl_dev_state *cxlds, { struct cxl_get_event_payload *pl; struct mock_event_log *log; + u16 nr_overflow; u8 log_type; int i; @@ -191,6 +199,19 @@ static int mock_get_event(struct cxl_dev_state *cxlds, if (!event_log_empty(log)) pl->flags |= CXL_GET_EVENT_FLAG_MORE_RECORDS; + if (log->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); + } + return 0; } @@ -231,6 +252,9 @@ static int mock_clear_event(struct cxl_dev_state *cxlds, } } + if (log->nr_overflow) + log->nr_overflow = 0; + /* Clear events */ log->clear_idx += pl->nr_recs; return 0; @@ -353,6 +377,30 @@ static void cxl_mock_add_event_logs(struct mock_event_store *mes) (struct cxl_event_record_raw *)&mem_module); mes->ev_status |= CXLDEV_EVENT_STATUS_INFO; + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, &maint_needed); + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace); + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, + (struct cxl_event_record_raw *)&dram); + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, + (struct cxl_event_record_raw *)&gen_media); + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, + (struct cxl_event_record_raw *)&mem_module); + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace); + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, + (struct cxl_event_record_raw *)&dram); + /* Overflow this log */ + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace); + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace); + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace); + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace); + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace); + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace); + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace); + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace); + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace); + mes_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace); + mes->ev_status |= CXLDEV_EVENT_STATUS_FAIL; + mes_add_event(mes, CXL_EVENT_TYPE_FATAL, &hardware_replace); mes_add_event(mes, CXL_EVENT_TYPE_FATAL, (struct cxl_event_record_raw *)&dram);