2022-12-08 05:42:38

by Ira Weiny

Subject: [PATCH V3 8/8] cxl/test: Simulate event log overflow

From: Ira Weiny <[email protected]>

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: Jonathan Cameron <[email protected]>
Signed-off-by: Ira Weiny <[email protected]>

---
Changes from V2:
Rebased on pending cxl-security

Changes from RFC
Adjust for new struct changes
---
tools/testing/cxl/test/events.c | 48 ++++++++++++++++++++++++++++++++-
tools/testing/cxl/test/events.h | 2 ++
2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/tools/testing/cxl/test/events.c b/tools/testing/cxl/test/events.c
index 5214826d264f..f389e1ba2ab7 100644
--- a/tools/testing/cxl/test/events.c
+++ b/tools/testing/cxl/test/events.c
@@ -23,6 +23,7 @@ void reset_event_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 */
@@ -54,8 +55,12 @@ static void event_store_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++;
@@ -65,6 +70,7 @@ 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;
+ u16 nr_overflow;
u8 log_type;
int i;

@@ -96,6 +102,19 @@ int mock_get_event(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *cmd)
if (!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;
}
EXPORT_SYMBOL_GPL(mock_get_event);
@@ -136,6 +155,9 @@ int mock_clear_event(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *cmd)
}
}

+ if (log->nr_overflow)
+ log->nr_overflow = 0;
+
/* Clear events */
log->clear_idx += pl->nr_recs;
return 0;
@@ -260,6 +282,30 @@ 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;

+ 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);
+ /* Overflow this log */
+ event_store_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace);
+ event_store_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace);
+ event_store_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace);
+ event_store_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace);
+ event_store_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace);
+ event_store_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace);
+ event_store_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace);
+ event_store_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace);
+ event_store_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace);
+ event_store_add_event(mes, CXL_EVENT_TYPE_FAIL, &hardware_replace);
+ 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.h b/tools/testing/cxl/test/events.h
index 626cd79f1871..80a74568f455 100644
--- a/tools/testing/cxl/test/events.h
+++ b/tools/testing/cxl/test/events.h
@@ -14,6 +14,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];
};

--
2.37.2

2022-12-09 23:17:03

by Dan Williams

Subject: RE: [PATCH V3 8/8] cxl/test: Simulate event log overflow

ira.weiny@ wrote:
> From: Ira Weiny <[email protected]>
>
> Log overflow is marked by a separate trace message.
>
> Simulate a log with lots of messages and flag overflow until space is
> cleared.

This and patch 7 look good to me after addressing the move to mem.c.

Reviewed-by: Dan Williams <[email protected]>

2022-12-12 05:06:11

by Ira Weiny

Subject: Re: [PATCH V3 8/8] cxl/test: Simulate event log overflow

On Fri, Dec 09, 2022 at 02:52:55PM -0800, Dan Williams wrote:
> ira.weiny@ wrote:
> > From: Ira Weiny <[email protected]>
> >
> > Log overflow is marked by a separate trace message.
> >
> > Simulate a log with lots of messages and flag overflow until space is
> > cleared.
>
> This and patch 7 look good to me after addressing the move to mem.c.
>
> Reviewed-by: Dan Williams <[email protected]>

Thanks!
Ira