From patchwork Thu Apr 22 21:18:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 12219201 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 59151C433ED for ; Thu, 22 Apr 2021 21:18:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1282561406 for ; Thu, 22 Apr 2021 21:18:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238948AbhDVVSp (ORCPT ); Thu, 22 Apr 2021 17:18:45 -0400 Received: from ex13-edg-ou-002.vmware.com ([208.91.0.190]:26388 "EHLO EX13-EDG-OU-002.vmware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236974AbhDVVSn (ORCPT ); Thu, 22 Apr 2021 17:18:43 -0400 Received: from sc9-mailhost1.vmware.com (10.113.161.71) by EX13-EDG-OU-002.vmware.com (10.113.208.156) with Microsoft SMTP Server id 15.0.1156.6; Thu, 22 Apr 2021 14:18:04 -0700 Received: from vypre.com (unknown [10.21.244.251]) by sc9-mailhost1.vmware.com (Postfix) with ESMTP id 5D386203F0; Thu, 22 Apr 2021 14:18:07 -0700 (PDT) From: Steven Rostedt To: CC: Nicolas Sterchele , "Steven Rostedt (VMware)" Subject: [PATCH v2 1/3] trace-cmd list: Add --full to show print fmt of an event Date: Thu, 22 Apr 2021 17:18:01 -0400 Message-ID: <20210422211803.862397-2-rostedt@goodmis.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210422211803.862397-1-rostedt@goodmis.org> References: <20210422211803.862397-1-rostedt@goodmis.org> MIME-Version: 1.0 Received-SPF: None (EX13-EDG-OU-002.vmware.com: rostedt@goodmis.org does not designate permitted sender hosts) Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org From: "Steven Rostedt (VMware)" There's several times I want to see the print fmt from the event's format file, and there's no way to do that with trace-cmd list -e. Add a --full option to display the entire format file of an event, including the print fmt, which can be useful as well. Signed-off-by: Steven Rostedt (VMware) --- Documentation/trace-cmd/trace-cmd-list.1.txt | 5 ++- tracecmd/trace-list.c | 37 ++++++++++++-------- tracecmd/trace-usage.c | 1 + 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/Documentation/trace-cmd/trace-cmd-list.1.txt b/Documentation/trace-cmd/trace-cmd-list.1.txt index 0ad62643..a5c6b16c 100644 --- a/Documentation/trace-cmd/trace-cmd-list.1.txt +++ b/Documentation/trace-cmd/trace-cmd-list.1.txt @@ -26,7 +26,10 @@ OPTIONS trace-cmd list -e '^sys.*' *-F*:: - Used with *-e* 'regex' to show those events formats. + Used with *-e* 'regex' to show the fields of the event. + +*--full*:: + Used with *-F* which will show the "print fmt" of the event along with the fields. *-l*:: Used with *-e* 'regex' to show those events filters. diff --git a/tracecmd/trace-list.c b/tracecmd/trace-list.c index 4615b322..c33ce8d9 100644 --- a/tracecmd/trace-list.c +++ b/tracecmd/trace-list.c @@ -44,6 +44,7 @@ enum { SHOW_EVENT_FORMAT = 1 << 0, SHOW_EVENT_FILTER = 1 << 1, SHOW_EVENT_TRIGGER = 1 << 2, + SHOW_EVENT_FULL = 1 << 3, }; @@ -56,10 +57,10 @@ void show_file(const char *name) tracefs_put_tracing_file(path); } -typedef int (*process_file_func)(char *buf, int len); +typedef int (*process_file_func)(char *buf, int len, int flags); static void process_file_re(process_file_func func, - const char *name, const char *re) + const char *name, const char *re, int flags) { regex_t reg; char *path; @@ -97,7 +98,7 @@ static void process_file_re(process_file_func func, do { n = getline(&buf, &l, fp); if (n > 0 && regexec(®, buf, 0, NULL, 0) == 0) - func(buf, n); + func(buf, n, flags); } while (n > 0); free(buf); fclose(fp); @@ -105,14 +106,14 @@ static void process_file_re(process_file_func func, regfree(®); } -static int show_file_write(char *buf, int len) +static int show_file_write(char *buf, int len, int flags) { return fwrite(buf, 1, len, stdout); } static void show_file_re(const char *name, const char *re) { - process_file_re(show_file_write, name, re); + process_file_re(show_file_write, name, re, 0); } static char *get_event_file(const char *type, char *buf, int len) @@ -144,7 +145,7 @@ static char *get_event_file(const char *type, char *buf, int len) return file; } -static int event_filter_write(char *buf, int len) +static int event_filter_write(char *buf, int len, int flags) { char *file; @@ -161,7 +162,7 @@ static int event_filter_write(char *buf, int len) return 0; } -static int event_trigger_write(char *buf, int len) +static int event_trigger_write(char *buf, int len, int flags) { char *file; @@ -178,14 +179,17 @@ static int event_trigger_write(char *buf, int len) return 0; } -static int event_format_write(char *fbuf, int len) +static int event_format_write(char *fbuf, int len, int flags) { char *file = get_event_file("format", fbuf, len); char *buf = NULL; size_t l; FILE *fp; + bool full; int n; + full = flags & SHOW_EVENT_FULL; + /* The get_event_file() crops system in fbuf */ printf("system: %s\n", fbuf); @@ -198,7 +202,7 @@ static int event_format_write(char *fbuf, int len) do { n = getline(&buf, &l, fp); if (n > 0) { - if (strncmp(buf, "print fmt", 9) == 0) + if (!full && strncmp(buf, "print fmt", 9) == 0) break; fwrite(buf, 1, n, stdout); } @@ -213,19 +217,19 @@ static int event_format_write(char *fbuf, int len) static void show_event_filter_re(const char *re) { - process_file_re(event_filter_write, "available_events", re); + process_file_re(event_filter_write, "available_events", re, 0); } static void show_event_trigger_re(const char *re) { - process_file_re(event_trigger_write, "available_events", re); + process_file_re(event_trigger_write, "available_events", re, 0); } -static void show_event_format_re(const char *re) +static void show_event_format_re(const char *re, int flags) { - process_file_re(event_format_write, "available_events", re); + process_file_re(event_format_write, "available_events", re, flags); } @@ -236,7 +240,7 @@ static void show_events(const char *eventre, int flags) if (eventre) { if (flags & SHOW_EVENT_FORMAT) - show_event_format_re(eventre); + show_event_format_re(eventre, flags); else if (flags & SHOW_EVENT_FILTER) show_event_filter_re(eventre); @@ -453,7 +457,6 @@ static void show_plugins(void) tep_free(pevent); } - void trace_list(int argc, char **argv) { int events = 0; @@ -536,6 +539,10 @@ void trace_list(int argc, char **argv) tracecmd_set_debug(true); break; } + if (strcmp(argv[i], "--full") == 0) { + flags |= SHOW_EVENT_FULL; + break; + } fprintf(stderr, "list: invalid option -- '%s'\n", argv[i]); default: diff --git a/tracecmd/trace-usage.c b/tracecmd/trace-usage.c index 3faa287b..567a91cb 100644 --- a/tracecmd/trace-usage.c +++ b/tracecmd/trace-usage.c @@ -322,6 +322,7 @@ static struct usage_help usage_help[] = { " %s list [-e [regex]][-t][-o][-f [regex]]\n" " -e list available events\n" " -F show event format\n" + " --full show the print fmt with -F\n" " -R show event triggers\n" " -l show event filters\n" " -t list available tracers\n" From patchwork Thu Apr 22 21:18:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 12219203 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8884CC43460 for ; Thu, 22 Apr 2021 21:18:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3E9B4613E6 for ; Thu, 22 Apr 2021 21:18:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236974AbhDVVSp (ORCPT ); Thu, 22 Apr 2021 17:18:45 -0400 Received: from ex13-edg-ou-002.vmware.com ([208.91.0.190]:26388 "EHLO EX13-EDG-OU-002.vmware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236877AbhDVVSp (ORCPT ); Thu, 22 Apr 2021 17:18:45 -0400 Received: from sc9-mailhost1.vmware.com (10.113.161.71) by EX13-EDG-OU-002.vmware.com (10.113.208.156) with Microsoft SMTP Server id 15.0.1156.6; Thu, 22 Apr 2021 14:18:05 -0700 Received: from vypre.com (unknown [10.21.244.251]) by sc9-mailhost1.vmware.com (Postfix) with ESMTP id 2DB592046C; Thu, 22 Apr 2021 14:18:08 -0700 (PDT) From: Steven Rostedt To: CC: Nicolas Sterchele , "Steven Rostedt (VMware)" Subject: [PATCH v2 2/3] trace-cmd list: Use tracefs to help find events for -e Date: Thu, 22 Apr 2021 17:18:02 -0400 Message-ID: <20210422211803.862397-3-rostedt@goodmis.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210422211803.862397-1-rostedt@goodmis.org> References: <20210422211803.862397-1-rostedt@goodmis.org> MIME-Version: 1.0 Received-SPF: None (EX13-EDG-OU-002.vmware.com: rostedt@goodmis.org does not designate permitted sender hosts) Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org From: "Steven Rostedt (VMware)" When the user specifies -e and wants to search for events, use the tracefs helper functions tracefs_event_systems() and tracefs_system_events() to find the matching events. Signed-off-by: Steven Rostedt (VMware) --- tracecmd/trace-list.c | 135 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 131 insertions(+), 4 deletions(-) diff --git a/tracecmd/trace-list.c b/tracecmd/trace-list.c index c33ce8d9..3e9e2713 100644 --- a/tracecmd/trace-list.c +++ b/tracecmd/trace-list.c @@ -106,6 +106,123 @@ static void process_file_re(process_file_func func, regfree(®); } +static void show_event(process_file_func func, const char *system, + const char *event, int flags) +{ + char *buf; + int ret; + + ret = asprintf(&buf, "%s:%s", system, event); + if (ret < 0) + die("Can not allocate event"); + func(buf, strlen(buf), flags); + free(buf); +} + +static void show_system(process_file_func func, const char *system, int flags) +{ + char **events; + int e; + + events = tracefs_system_events(NULL, system); + if (!events) /* die? */ + return; + + for (e = 0; events[e]; e++) + show_event(func, system, events[e], flags); +} + +static void show_event_systems(process_file_func func, char **systems, int flags) +{ + int s; + + for (s = 0; systems[s]; s++) + show_system(func, systems[s], flags); +} + + +static void process_events(process_file_func func, const char *re, int flags) +{ + regex_t system_reg; + regex_t event_reg; + char *str; + size_t l = strlen(re); + bool just_systems = true; + char **systems; + char **events; + char *system; + char *event; + int s, e; + + systems = tracefs_event_systems(NULL); + if (!systems) + return process_file_re(func, "available_events", re, flags); + + if (!re || l == 0) { + show_event_systems(func, systems, flags); + return; + } + + str = strdup(re); + if (!str) + die("Can not allocate momory for regex"); + + system = strtok(str, ":"); + event = strtok(NULL, ""); + + if (regcomp(&system_reg, system, REG_ICASE|REG_NOSUB)) + die("invalid regex '%s'", system); + + if (event) { + if (regcomp(&event_reg, event, REG_ICASE|REG_NOSUB)) + die("invalid regex '%s'", event); + } else { + /* + * If the regex ends with ":", then event would be null, + * but we do not want to match events. + */ + if (re[l-1] != ':') + just_systems = false; + } + free(str); + + for (s = 0; systems[s]; s++) { + + if (regexec(&system_reg, systems[s], 0, NULL, 0) == 0) { + if (!event) { + show_system(func, systems[s], flags); + continue; + } + events = tracefs_system_events(NULL, systems[s]); + if (!events) /* die? */ + continue; + for (e = 0; events[e]; e++) { + if (regexec(&event_reg, events[e], 0, NULL, 0) == 0) + show_event(func, systems[s], events[e], flags); + } + tracefs_list_free(events); + continue; + } + if (just_systems) + continue; + + events = tracefs_system_events(NULL, systems[s]); + if (!events) /* die? */ + continue; + + for (e = 0; events[e]; e++) { + if (regexec(&system_reg, events[e], 0, NULL, 0) == 0) + show_event(func, systems[s], events[e], flags); + } + tracefs_list_free(events); + } + tracefs_list_free(systems); + + regfree(&system_reg); + if (event) + regfree(&event_reg); +} + static int show_file_write(char *buf, int len, int flags) { return fwrite(buf, 1, len, stdout); @@ -214,24 +331,34 @@ static int event_format_write(char *fbuf, int len, int flags) return 0; } +static int event_name(char *buf, int len, int flags) +{ + printf("%s\n", buf); + + return 0; +} static void show_event_filter_re(const char *re) { - process_file_re(event_filter_write, "available_events", re, 0); + process_events(event_filter_write, re, 0); } static void show_event_trigger_re(const char *re) { - process_file_re(event_trigger_write, "available_events", re, 0); + process_events(event_trigger_write, re, 0); } static void show_event_format_re(const char *re, int flags) { - process_file_re(event_format_write, "available_events", re, flags); + process_events(event_format_write, re, flags); } +static void show_event_names_re(const char *re) +{ + process_events(event_name, re, 0); +} static void show_events(const char *eventre, int flags) { @@ -248,7 +375,7 @@ static void show_events(const char *eventre, int flags) else if (flags & SHOW_EVENT_TRIGGER) show_event_trigger_re(eventre); else - show_file_re("available_events", eventre); + show_event_names_re(eventre); } else show_file("available_events"); } From patchwork Thu Apr 22 21:18:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 12219205 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4462C43461 for ; Thu, 22 Apr 2021 21:18:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6533261417 for ; Thu, 22 Apr 2021 21:18:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236877AbhDVVSp (ORCPT ); Thu, 22 Apr 2021 17:18:45 -0400 Received: from ex13-edg-ou-001.vmware.com ([208.91.0.189]:51684 "EHLO EX13-EDG-OU-001.vmware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237048AbhDVVSp (ORCPT ); Thu, 22 Apr 2021 17:18:45 -0400 Received: from sc9-mailhost1.vmware.com (10.113.161.71) by EX13-EDG-OU-001.vmware.com (10.113.208.155) with Microsoft SMTP Server id 15.0.1156.6; Thu, 22 Apr 2021 14:18:05 -0700 Received: from vypre.com (unknown [10.21.244.251]) by sc9-mailhost1.vmware.com (Postfix) with ESMTP id F1BD9203F0; Thu, 22 Apr 2021 14:18:08 -0700 (PDT) From: Steven Rostedt To: CC: Nicolas Sterchele , "Steven Rostedt (VMware)" Subject: [PATCH v2 3/3] trace-cmd list: Add ftrace events to listing of events Date: Thu, 22 Apr 2021 17:18:03 -0400 Message-ID: <20210422211803.862397-4-rostedt@goodmis.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210422211803.862397-1-rostedt@goodmis.org> References: <20210422211803.862397-1-rostedt@goodmis.org> MIME-Version: 1.0 Received-SPF: None (EX13-EDG-OU-001.vmware.com: rostedt@goodmis.org does not designate permitted sender hosts) Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org From: "Steven Rostedt (VMware)" If a search of events is done with trace-cmd list -e, check if any matches the ftrace events. This is useful to get the fields and print fmt of the events under the ftrace system. Note, just "trace-cmd list -e" will still not list ftrace events by default. Signed-off-by: Steven Rostedt (VMware) --- tracecmd/trace-list.c | 51 +++++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/tracecmd/trace-list.c b/tracecmd/trace-list.c index 3e9e2713..048a7e5d 100644 --- a/tracecmd/trace-list.c +++ b/tracecmd/trace-list.c @@ -140,19 +140,34 @@ static void show_event_systems(process_file_func func, char **systems, int flags show_system(func, systems[s], flags); } +static void match_system_events(process_file_func func, const char *system, + regex_t *reg, int flags) +{ + char **events; + int e; + + events = tracefs_system_events(NULL, system); + if (!events) /* die? */ + return; + for (e = 0; events[e]; e++) { + if (regexec(reg, events[e], 0, NULL, 0) == 0) + show_event(func, system, events[e], flags); + } + tracefs_list_free(events); +} static void process_events(process_file_func func, const char *re, int flags) { + const char *ftrace = "ftrace"; regex_t system_reg; regex_t event_reg; char *str; size_t l = strlen(re); bool just_systems = true; char **systems; - char **events; char *system; char *event; - int s, e; + int s; systems = tracefs_event_systems(NULL); if (!systems) @@ -186,6 +201,19 @@ static void process_events(process_file_func func, const char *re, int flags) } free(str); + /* + * See if this matches the special ftrace system, as ftrace is not included + * in the systems list, but can get events from tracefs_system_events(). + */ + if (regexec(&system_reg, ftrace, 0, NULL, 0) == 0) { + if (!event) + show_system(func, ftrace, flags); + else + match_system_events(func, ftrace, &event_reg, flags); + } else if (!just_systems) { + match_system_events(func, ftrace, &system_reg, flags); + } + for (s = 0; systems[s]; s++) { if (regexec(&system_reg, systems[s], 0, NULL, 0) == 0) { @@ -193,28 +221,13 @@ static void process_events(process_file_func func, const char *re, int flags) show_system(func, systems[s], flags); continue; } - events = tracefs_system_events(NULL, systems[s]); - if (!events) /* die? */ - continue; - for (e = 0; events[e]; e++) { - if (regexec(&event_reg, events[e], 0, NULL, 0) == 0) - show_event(func, systems[s], events[e], flags); - } - tracefs_list_free(events); + match_system_events(func, systems[s], &event_reg, flags); continue; } if (just_systems) continue; - events = tracefs_system_events(NULL, systems[s]); - if (!events) /* die? */ - continue; - - for (e = 0; events[e]; e++) { - if (regexec(&system_reg, events[e], 0, NULL, 0) == 0) - show_event(func, systems[s], events[e], flags); - } - tracefs_list_free(events); + match_system_events(func, systems[s], &system_reg, flags); } tracefs_list_free(systems);