[ndctl,v11,3/7] cxl/event_trace: support poison context in event parsing

Commit Message

Alison Schofield March 14, 2024, 4:05 a.m. UTC

From: Alison Schofield <[e-mail]>

CXL event tracing provides helpers to iterate through a trace
buffer and extract events of interest. It offers two parsing
options: a default parser that adds every field of an event to
a json object, and a private parsing option where the caller can
parse each event as it wishes.

Although the private parser can do some conditional parsing based
on field values, it has no method to receive additional information
needed to make parsing decisions in the callback.

Provide additional information required by cxl_poison events by
adding a pointer to the poison_ctx directly the struct event_context.

Tidy-up the calling convention by passing the entire event_ctx to
it's own parse_event method rather than growing the param list.

This is in preparation for adding a private parser requiring the
additional context for cxl_poison events.

Signed-off-by: Alison Schofield <[e-mail]>
Reviewed-by: Dave Jiang <[e-mail]>
---
 cxl/event_trace.c |  9 ++++-----
 cxl/event_trace.h | 10 +++++++++-
 2 files changed, 13 insertions(+), 6 deletions(-)

Patch

diff --git a/cxl/event_trace.c b/cxl/event_trace.c
index 93a95f9729fd..640abdab67bf 100644
--- a/cxl/event_trace.c
+++ b/cxl/event_trace.c
@@ -60,7 +60,7 @@  static struct json_object *num_to_json(void *num, int elem_size, unsigned long f
 }
 
 static int cxl_event_to_json(struct tep_event *event, struct tep_record *record,
-			     struct list_head *jlist_head)
+			     struct event_ctx *ctx)
 {
 	struct json_object *jevent, *jobj, *jarray;
 	struct tep_format_field **fields;
@@ -190,7 +190,7 @@  static int cxl_event_to_json(struct tep_event *event, struct tep_record *record,
 		}
 	}
 
-	list_add_tail(jlist_head, &jnode->list);
+	list_add_tail(&ctx->jlist_head, &jnode->list);
 	return 0;
 
 err_jevent:
@@ -220,10 +220,9 @@  static int cxl_event_parse(struct tep_event *event, struct tep_record *record,
 	}
 
 	if (event_ctx->parse_event)
-		return event_ctx->parse_event(event, record,
-					      &event_ctx->jlist_head);
+		return event_ctx->parse_event(event, record, event_ctx);
 
-	return cxl_event_to_json(event, record, &event_ctx->jlist_head);
+	return cxl_event_to_json(event, record, event_ctx);
 }
 
 int cxl_parse_events(struct tracefs_instance *inst, struct event_ctx *ectx)
diff --git a/cxl/event_trace.h b/cxl/event_trace.h
index 7f7773b2201f..b77cafb410c4 100644
--- a/cxl/event_trace.h
+++ b/cxl/event_trace.h
@@ -11,13 +11,21 @@  struct jlist_node {
 	struct list_node list;
 };
 
+struct poison_ctx {
+	struct json_object *jpoison;
+	struct cxl_region *region;
+	struct cxl_memdev *memdev;
+	unsigned long flags;
+};
+
 struct event_ctx {
 	const char *system;
 	struct list_head jlist_head;
 	const char *event_name; /* optional */
 	int event_pid; /* optional */
+	struct poison_ctx *poison_ctx; /* optional */
 	int (*parse_event)(struct tep_event *event, struct tep_record *record,
-			   struct list_head *jlist_head); /* optional */
+			   struct event_ctx *ctx);
 };
 
 int cxl_parse_events(struct tracefs_instance *inst, struct event_ctx *ectx);