@@ -8,6 +8,7 @@ cxl_src = [
'json.c',
'filter.c',
'event_trace.c',
+ 'monitor.c',
]
cxl_tool = executable('cxl',
new file mode 100644
@@ -0,0 +1,139 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2022, Intel Corp. All rights reserved.
+/* Some bits copied from ndctl monitor code */
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include <json-c/json.h>
+#include <libgen.h>
+#include <time.h>
+#include <dirent.h>
+#include <ccan/list/list.h>
+#include <util/json.h>
+#include <util/util.h>
+#include <util/parse-options.h>
+#include <util/parse-configs.h>
+#include <util/strbuf.h>
+#include <sys/epoll.h>
+#include <sys/stat.h>
+#include <traceevent/event-parse.h>
+#include <tracefs/tracefs.h>
+#include <cxl/libcxl.h>
+
+/* reuse the core log helpers for the monitor logger */
+#ifndef ENABLE_LOGGING
+#define ENABLE_LOGGING
+#endif
+#ifndef ENABLE_DEBUG
+#define ENABLE_DEBUG
+#endif
+#include <util/log.h>
+
+#include "event_trace.h"
+
+static const char *cxl_system = "cxl";
+
+static struct monitor {
+ struct log_ctx ctx;
+ FILE *log_file;
+ bool human;
+} monitor;
+
+static int monitor_event(struct cxl_ctx *ctx)
+{
+ int fd, epollfd, rc = 0, timeout = -1;
+ struct epoll_event ev, *events;
+ struct tracefs_instance *inst;
+ struct event_ctx ectx;
+ int jflag;
+
+ events = calloc(1, sizeof(struct epoll_event));
+ if (!events) {
+ err(&monitor, "alloc for events error\n");
+ return -ENOMEM;
+ }
+
+ epollfd = epoll_create1(0);
+ if (epollfd == -1) {
+ rc = -errno;
+ err(&monitor, "epoll_create1() error: %d\n", rc);
+ goto epoll_err;
+ }
+
+ inst = tracefs_instance_create("cxl_monitor");
+ if (!inst) {
+ rc = -errno;
+ err(&monitor, "tracefs_instance_crate( failed: %d\n", rc);
+ goto inst_err;
+ }
+
+ fd = tracefs_instance_file_open(inst, "trace_pipe", -1);
+ if (fd < 0) {
+ rc = fd;
+ err(&monitor, "tracefs_instance_file_open() err: %d\n", rc);
+ goto inst_file_err;
+ }
+
+ memset(&ev, 0, sizeof(ev));
+ ev.events = EPOLLIN;
+ ev.data.fd = fd;
+
+ if (epoll_ctl(epollfd, EPOLL_CTL_ADD, fd, &ev) != 0) {
+ rc = -errno;
+ err(&monitor, "epoll_ctl() error: %d\n", rc);
+ goto epoll_ctl_err;
+ }
+
+ rc = cxl_event_tracing_enable(inst, cxl_system);
+ if (rc < 0) {
+ err(&monitor, "cxl_trace_event_enable() failed: %d\n", rc);
+ goto event_en_err;
+ }
+
+ ectx.system = cxl_system;
+ if (monitor.human)
+ jflag = JSON_C_TO_STRING_PRETTY;
+ else
+ jflag = JSON_C_TO_STRING_PLAIN;
+
+ while (1) {
+ struct jlist_node *jnode, *next;
+
+ rc = epoll_wait(epollfd, events, 1, timeout);
+ if (rc < 0) {
+ rc = -errno;
+ if (errno != EINTR)
+ err(&monitor, "epoll_wait error: %d\n", -errno);
+ break;
+ }
+
+ list_head_init(&ectx.jlist_head);
+ rc = cxl_parse_events(inst, &ectx);
+ if (rc < 0)
+ goto parse_err;
+
+ if (list_empty(&ectx.jlist_head))
+ continue;
+
+ list_for_each_safe(&ectx.jlist_head, jnode, next, list) {
+ notice(&monitor, "%s\n",
+ json_object_to_json_string_ext(jnode->jobj, jflag));
+ list_del(&jnode->list);
+ json_object_put(jnode->jobj);
+ free(jnode);
+ }
+ }
+
+parse_err:
+ rc = cxl_event_tracing_disable(inst);
+event_en_err:
+epoll_ctl_err:
+ close(fd);
+inst_file_err:
+ tracefs_instance_free(inst);
+inst_err:
+ close(epollfd);
+epoll_err:
+ free(events);
+ return rc;
+}
Add function that creates an event trace instance and utilize the cxl event trace common functions to extract interested events from the trace buffer. The monitoring function will pend on an epoll fd and wait for new events to appear in the trace buffer. Signed-off-by: Dave Jiang <dave.jiang@intel.com> --- cxl/meson.build | 1 cxl/monitor.c | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+) create mode 100644 cxl/monitor.c