| Message ID | 166318848131.3087953.17609964424559300800.stgit@djiang5-desk3.ch.intel.com |
|---|---|
| State | Superseded |
| Delegated to: | Vishal Verma |
| Headers | show |
| Series | ndctl: cxl: add monitor support for trace events | expand |
On Wed, Sep 14, 2022 at 01:48:01PM -0700, Dave Jiang wrote: > Add common function to iterate through and extract the events in the > current trace buffer. The function uses tracefs_iterate_raw_events() from > libtracefs to go through all the events loaded into a tep_handle. A > callback is provided to the API call in order to parse the event. For cxl > monitor, an array of interested "systems" is provided in order to filter > for the interested events. Also been testing this one, and WFM. I'll look for the addition of the caller defined parsing callback in the next rev. > > Signed-off-by: Dave Jiang <dave.jiang@intel.com> > --- > cxl/event_trace.c | 35 +++++++++++++++++++++++++++++++++++ > cxl/event_trace.h | 7 +++++++ > cxl/meson.build | 1 + > meson.build | 2 ++ > 4 files changed, 45 insertions(+) > > diff --git a/cxl/event_trace.c b/cxl/event_trace.c > index ffa2a9b9b036..d5e67b55a4d8 100644 > --- a/cxl/event_trace.c > +++ b/cxl/event_trace.c > @@ -16,6 +16,7 @@ > #include <libcxl.h> > #include <uuid/uuid.h> > #include <traceevent/event-parse.h> > +#include <tracefs/tracefs.h> > #include "json.h" > #include "event_trace.h" > > @@ -164,3 +165,37 @@ err_jevent: > free(jnode); > return rc; > } > + > +static int cxl_event_parse_cb(struct tep_event *event, struct tep_record *record, > + int cpu, void *ctx) > +{ > + struct event_ctx *event_ctx = (struct event_ctx *)ctx; > + int rc, i; > + > + /* Filter out all the events that the caller isn't interested in. */ > + for (i = 0; event_ctx->systems[i]; i++) { > + if (strcmp(event->system, event_ctx->systems[i]) != 0) > + continue; > + > + rc = cxl_event_to_json_callback(event, record, &event_ctx->jlist_head); > + if (rc < 0) > + return rc; > + } > + > + return 0; > +} > + > +int cxl_parse_events(struct tracefs_instance *inst, struct event_ctx *ectx) > +{ > + struct tep_handle *tep; > + int rc; > + > + tep = tracefs_local_events(NULL); > + if (!tep) > + return -ENOMEM; > + > + rc = tracefs_iterate_raw_events(tep, inst, NULL, 0, > + cxl_event_parse_cb, ectx); > + tep_free(tep); > + return rc; > +} > diff --git a/cxl/event_trace.h b/cxl/event_trace.h > index 00975a0b5680..98cfbb4602e1 100644 > --- a/cxl/event_trace.h > +++ b/cxl/event_trace.h > @@ -11,4 +11,11 @@ struct jlist_node { > struct list_node list; > }; > > +struct event_ctx { > + const char **systems; > + struct list_head jlist_head; > +}; > + > +int cxl_parse_events(struct tracefs_instance *inst, struct event_ctx *ectx); > + > #endif > diff --git a/cxl/meson.build b/cxl/meson.build > index 8c7733431613..c59876262e76 100644 > --- a/cxl/meson.build > +++ b/cxl/meson.build > @@ -21,6 +21,7 @@ cxl_tool = executable('cxl', > json, > versiondep, > traceevent, > + tracefs, > ], > install : true, > install_dir : rootbindir, > diff --git a/meson.build b/meson.build > index f611e0bdd7f3..c204c8ac52de 100644 > --- a/meson.build > +++ b/meson.build > @@ -143,6 +143,8 @@ libudev = dependency('libudev') > uuid = dependency('uuid') > json = dependency('json-c') > traceevent = dependency('libtraceevent') > +tracefs = dependency('libtracefs') > + > if get_option('docs').enabled() > if get_option('asciidoctor').enabled() > asciidoc = find_program('asciidoctor', required : true) > >
diff --git a/cxl/event_trace.c b/cxl/event_trace.c index ffa2a9b9b036..d5e67b55a4d8 100644 --- a/cxl/event_trace.c +++ b/cxl/event_trace.c @@ -16,6 +16,7 @@ #include <libcxl.h> #include <uuid/uuid.h> #include <traceevent/event-parse.h> +#include <tracefs/tracefs.h> #include "json.h" #include "event_trace.h" @@ -164,3 +165,37 @@ err_jevent: free(jnode); return rc; } + +static int cxl_event_parse_cb(struct tep_event *event, struct tep_record *record, + int cpu, void *ctx) +{ + struct event_ctx *event_ctx = (struct event_ctx *)ctx; + int rc, i; + + /* Filter out all the events that the caller isn't interested in. */ + for (i = 0; event_ctx->systems[i]; i++) { + if (strcmp(event->system, event_ctx->systems[i]) != 0) + continue; + + rc = cxl_event_to_json_callback(event, record, &event_ctx->jlist_head); + if (rc < 0) + return rc; + } + + return 0; +} + +int cxl_parse_events(struct tracefs_instance *inst, struct event_ctx *ectx) +{ + struct tep_handle *tep; + int rc; + + tep = tracefs_local_events(NULL); + if (!tep) + return -ENOMEM; + + rc = tracefs_iterate_raw_events(tep, inst, NULL, 0, + cxl_event_parse_cb, ectx); + tep_free(tep); + return rc; +} diff --git a/cxl/event_trace.h b/cxl/event_trace.h index 00975a0b5680..98cfbb4602e1 100644 --- a/cxl/event_trace.h +++ b/cxl/event_trace.h @@ -11,4 +11,11 @@ struct jlist_node { struct list_node list; }; +struct event_ctx { + const char **systems; + struct list_head jlist_head; +}; + +int cxl_parse_events(struct tracefs_instance *inst, struct event_ctx *ectx); + #endif diff --git a/cxl/meson.build b/cxl/meson.build index 8c7733431613..c59876262e76 100644 --- a/cxl/meson.build +++ b/cxl/meson.build @@ -21,6 +21,7 @@ cxl_tool = executable('cxl', json, versiondep, traceevent, + tracefs, ], install : true, install_dir : rootbindir, diff --git a/meson.build b/meson.build index f611e0bdd7f3..c204c8ac52de 100644 --- a/meson.build +++ b/meson.build @@ -143,6 +143,8 @@ libudev = dependency('libudev') uuid = dependency('uuid') json = dependency('json-c') traceevent = dependency('libtraceevent') +tracefs = dependency('libtracefs') + if get_option('docs').enabled() if get_option('asciidoctor').enabled() asciidoc = find_program('asciidoctor', required : true)
Add common function to iterate through and extract the events in the current trace buffer. The function uses tracefs_iterate_raw_events() from libtracefs to go through all the events loaded into a tep_handle. A callback is provided to the API call in order to parse the event. For cxl monitor, an array of interested "systems" is provided in order to filter for the interested events. Signed-off-by: Dave Jiang <dave.jiang@intel.com> --- cxl/event_trace.c | 35 +++++++++++++++++++++++++++++++++++ cxl/event_trace.h | 7 +++++++ cxl/meson.build | 1 + meson.build | 2 ++ 4 files changed, 45 insertions(+)