From nobody Tue May 5 10:01:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4213DC433F5 for ; Sun, 29 May 2022 03:35:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230301AbiE2DfI (ORCPT ); Sat, 28 May 2022 23:35:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230281AbiE2DfF (ORCPT ); Sat, 28 May 2022 23:35:05 -0400 Received: from alexa-out-sd-02.qualcomm.com (alexa-out-sd-02.qualcomm.com [199.106.114.39]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3CD725FDA for ; Sat, 28 May 2022 20:35:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; i=@quicinc.com; q=dns/txt; s=qcdkim; t=1653795304; x=1685331304; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=HTLeVtdGiqXGjUTVh45e9aj+QkquVDKFMRh70PnS8TM=; b=yog10ebn+JiiAh+4J5XF4+x+rdQdZbf1LvH9XEXugiBzQwYOD0AAbhZ3 sLKVtVY14zNvcoMIBcByvXMGXTcN4zcabkuW7Kg0YwVH3fYd1B1v+CTjV VBQ9rdmQAseAHZWiSsrDBf9wL1EzYSxS2a/7reuX/AtF5EpzOUoQz9npq 4=; Received: from unknown (HELO ironmsg04-sd.qualcomm.com) ([10.53.140.144]) by alexa-out-sd-02.qualcomm.com with ESMTP; 28 May 2022 20:35:04 -0700 X-QCInternal: smtphost Received: from nasanex01c.na.qualcomm.com ([10.47.97.222]) by ironmsg04-sd.qualcomm.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 May 2022 20:35:03 -0700 Received: from nalasex01b.na.qualcomm.com (10.47.209.197) by nasanex01c.na.qualcomm.com (10.47.97.222) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Sat, 28 May 2022 20:35:03 -0700 Received: from linyyuan-gv.qualcomm.com (10.80.80.8) by nalasex01b.na.qualcomm.com (10.47.209.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Sat, 28 May 2022 20:35:01 -0700 From: Linyu Yuan To: Steven Rostedt , Masami Hiramatsu , Tom Zanussi , Ingo Molnar CC: , Linyu Yuan Subject: [PATCH v2 1/2] tracing: auto generate event name when create a group of events Date: Sun, 29 May 2022 11:34:53 +0800 Message-ID: <1653795294-19764-2-git-send-email-quic_linyyuan@quicinc.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1653795294-19764-1-git-send-email-quic_linyyuan@quicinc.com> References: <1653795294-19764-1-git-send-email-quic_linyyuan@quicinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01b.na.qualcomm.com (10.47.209.197) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Currently when create a specific group of trace events, take kprobe event as example, user must use the following format: p:GRP/EVENT [MOD:]KSYM[+OFFS]|KADDR [FETCHARGS], which means user must enter EVENT name, one example is: echo 'p:usb_gadget/config_usb_cfg_link config_usb_cfg_link $arg1' >> kprobe_events, it is not simple if there are too many entries because the event name is same as symbol name. This change allows user to specify no EVENT name, format changed as: p:GRP/ [MOD:]KSYM[+OFFS]|KADDR [FETCHARGS], it will generate event name automatically and one example is: echo 'p:usb_gadget/ config_usb_cfg_link $arg1' >> kprobe_events. Signed-off-by: Linyu Yuan --- v2: fix review comments in V1: change TP_ENAME_EMPTTY to TP_ENAME_EMPTY, add some space, document the macros return by traceprobe_parse_event_name(), updatea commit description. Documentation/trace/kprobetrace.rst | 8 ++++---- Documentation/trace/uprobetracer.rst | 8 ++++---- kernel/trace/trace_dynevent.c | 2 +- kernel/trace/trace_eprobe.c | 20 ++++++++++++-------- kernel/trace/trace_kprobe.c | 19 ++++++++++++------- kernel/trace/trace_probe.c | 9 ++++++++- kernel/trace/trace_probe.h | 4 ++++ kernel/trace/trace_uprobe.c | 15 ++++++++++----- 8 files changed, 55 insertions(+), 30 deletions(-) diff --git a/Documentation/trace/kprobetrace.rst b/Documentation/trace/kpro= betrace.rst index b175d88..4274cc6 100644 --- a/Documentation/trace/kprobetrace.rst +++ b/Documentation/trace/kprobetrace.rst @@ -28,10 +28,10 @@ Synopsis of kprobe_events ------------------------- :: =20 - p[:[GRP/]EVENT] [MOD:]SYM[+offs]|MEMADDR [FETCHARGS] : Set a probe - r[MAXACTIVE][:[GRP/]EVENT] [MOD:]SYM[+0] [FETCHARGS] : Set a return probe - p:[GRP/]EVENT] [MOD:]SYM[+0]%return [FETCHARGS] : Set a return probe - -:[GRP/]EVENT : Clear a probe + p[:[GRP/][EVENT]] [MOD:]SYM[+offs]|MEMADDR [FETCHARGS] : Set a probe + r[MAXACTIVE][:[GRP/][EVENT]] [MOD:]SYM[+0] [FETCHARGS] : Set a return pr= obe + p[:[GRP/][EVENT]] [MOD:]SYM[+0]%return [FETCHARGS] : Set a return probe + -:[GRP/][EVENT] : Clear a probe =20 GRP : Group name. If omitted, use "kprobes" for it. EVENT : Event name. If omitted, the event name is generated diff --git a/Documentation/trace/uprobetracer.rst b/Documentation/trace/upr= obetracer.rst index a8e5938..3a1797d7 100644 --- a/Documentation/trace/uprobetracer.rst +++ b/Documentation/trace/uprobetracer.rst @@ -26,10 +26,10 @@ Synopsis of uprobe_tracer ------------------------- :: =20 - p[:[GRP/]EVENT] PATH:OFFSET [FETCHARGS] : Set a uprobe - r[:[GRP/]EVENT] PATH:OFFSET [FETCHARGS] : Set a return uprobe (uretprobe) - p[:[GRP/]EVENT] PATH:OFFSET%return [FETCHARGS] : Set a return uprobe (ur= etprobe) - -:[GRP/]EVENT : Clear uprobe or uretprobe event + p[:[GRP/][EVENT]] PATH:OFFSET [FETCHARGS] : Set a uprobe + r[:[GRP/][EVENT]] PATH:OFFSET [FETCHARGS] : Set a return uprobe (uretpro= be) + p[:[GRP/][EVENT]] PATH:OFFSET%return [FETCHARGS] : Set a return uprobe (= uretprobe) + -:[GRP/][EVENT] : Clear uprobe or uretprobe ev= ent =20 GRP : Group name. If omitted, "uprobes" is the default value. EVENT : Event name. If omitted, the event name is generated based diff --git a/kernel/trace/trace_dynevent.c b/kernel/trace/trace_dynevent.c index e34e8182..033248d 100644 --- a/kernel/trace/trace_dynevent.c +++ b/kernel/trace/trace_dynevent.c @@ -101,7 +101,7 @@ int dyn_event_release(const char *raw_command, struct d= yn_event_operations *type event =3D p + 1; *p =3D '\0'; } - if (event[0] =3D=3D '\0') { + if (!system && event[0] =3D=3D '\0') { ret =3D -EINVAL; goto out; } diff --git a/kernel/trace/trace_eprobe.c b/kernel/trace/trace_eprobe.c index 7d44785..13cd7fc 100644 --- a/kernel/trace/trace_eprobe.c +++ b/kernel/trace/trace_eprobe.c @@ -125,6 +125,7 @@ static bool eprobe_dyn_event_match(const char *system, = const char *event, * We match the following: * event only - match all eprobes with event name * system and event only - match all system/event probes + * system only - match all system probes * * The below has the above satisfied with more arguments: * @@ -143,7 +144,7 @@ static bool eprobe_dyn_event_match(const char *system, = const char *event, return false; =20 /* Must match the event name */ - if (strcmp(trace_probe_name(&ep->tp), event) !=3D 0) + if (event[0] !=3D '\0' && strcmp(trace_probe_name(&ep->tp), event) !=3D 0) return false; =20 /* No arguments match all */ @@ -848,7 +849,7 @@ static int __trace_eprobe_create(int argc, const char *= argv[]) { /* * Argument syntax: - * e[:[GRP/]ENAME] SYSTEM.EVENT [FETCHARGS] + * e[:[GRP/][ENAME]] SYSTEM.EVENT [FETCHARGS] * Fetch args: * =3D$[:TYPE] */ @@ -858,6 +859,7 @@ static int __trace_eprobe_create(int argc, const char *= argv[]) struct trace_eprobe *ep =3D NULL; char buf1[MAX_EVENT_NAME_LEN]; char buf2[MAX_EVENT_NAME_LEN]; + char grp_buf[MAX_EVENT_NAME_LEN]; int ret =3D 0; int i; =20 @@ -866,14 +868,17 @@ static int __trace_eprobe_create(int argc, const char= *argv[]) =20 trace_probe_log_init("event_probe", argc, argv); =20 + ret =3D TP_ENAME_EMPTY; event =3D strchr(&argv[0][1], ':'); if (event) { event++; - ret =3D traceprobe_parse_event_name(&event, &group, buf1, + ret =3D traceprobe_parse_event_name(&event, &group, grp_buf, event - argv[0]); - if (ret) + if (ret < 0) goto parse_error; - } else { + } + + if (ret =3D=3D TP_ENAME_EMPTY || ret =3D=3D TP_ENAME_GROUP) { strscpy(buf1, argv[1], MAX_EVENT_NAME_LEN); sanitize_event_name(buf1); event =3D buf1; @@ -882,9 +887,8 @@ static int __trace_eprobe_create(int argc, const char *= argv[]) goto parse_error; =20 sys_event =3D argv[1]; - ret =3D traceprobe_parse_event_name(&sys_event, &sys_name, buf2, - sys_event - argv[1]); - if (ret || !sys_name) + ret =3D traceprobe_parse_event_name(&sys_event, &sys_name, buf2, 0); + if (ret !=3D TP_ENAME_GROUP_EVENT) goto parse_error; if (!is_good_name(sys_event) || !is_good_name(sys_name)) goto parse_error; diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 47cebef..55822b6 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -163,7 +163,8 @@ static bool trace_kprobe_match(const char *system, cons= t char *event, { struct trace_kprobe *tk =3D to_trace_kprobe(ev); =20 - return strcmp(trace_probe_name(&tk->tp), event) =3D=3D 0 && + return (event[0] =3D=3D '\0' || + strcmp(trace_probe_name(&tk->tp), event) =3D=3D 0) && (!system || strcmp(trace_probe_group_name(&tk->tp), system) =3D=3D 0)= && trace_kprobe_match_command_head(tk, argc, argv); } @@ -708,11 +709,11 @@ static int __trace_kprobe_create(int argc, const char= *argv[]) /* * Argument syntax: * - Add kprobe: - * p[:[GRP/]EVENT] [MOD:]KSYM[+OFFS]|KADDR [FETCHARGS] + * p[:[GRP/][EVENT]] [MOD:]KSYM[+OFFS]|KADDR [FETCHARGS] * - Add kretprobe: - * r[MAXACTIVE][:[GRP/]EVENT] [MOD:]KSYM[+0] [FETCHARGS] + * r[MAXACTIVE][:[GRP/][EVENT]] [MOD:]KSYM[+0] [FETCHARGS] * Or - * p:[GRP/]EVENT] [MOD:]KSYM[+0]%return [FETCHARGS] + * p[:[GRP/][EVENT]] [MOD:]KSYM[+0]%return [FETCHARGS] * * Fetch args: * $retval : fetch return value @@ -739,6 +740,7 @@ static int __trace_kprobe_create(int argc, const char *= argv[]) long offset =3D 0; void *addr =3D NULL; char buf[MAX_EVENT_NAME_LEN]; + char grp_buf[MAX_EVENT_NAME_LEN]; unsigned int flags =3D TPARG_FL_KERNEL; =20 switch (argv[0][0]) { @@ -832,12 +834,15 @@ static int __trace_kprobe_create(int argc, const char= *argv[]) } =20 trace_probe_log_set_index(0); + ret =3D TP_ENAME_EMPTY; if (event) { - ret =3D traceprobe_parse_event_name(&event, &group, buf, + ret =3D traceprobe_parse_event_name(&event, &group, grp_buf, event - argv[0]); - if (ret) + if (ret < 0) goto parse_error; - } else { + } + + if (ret =3D=3D TP_ENAME_EMPTY || ret =3D=3D TP_ENAME_GROUP) { /* Make a new event name */ if (symbol) snprintf(buf, MAX_EVENT_NAME_LEN, "%c_%s_%ld", diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c index 80863c6..7fd50ab 100644 --- a/kernel/trace/trace_probe.c +++ b/kernel/trace/trace_probe.c @@ -257,6 +257,9 @@ int traceprobe_parse_event_name(const char **pevent, co= nst char **pgroup, } len =3D strlen(event); if (len =3D=3D 0) { + if (slash) + return TP_ENAME_GROUP; + trace_probe_log_err(offset, NO_EVENT_NAME); return -EINVAL; } else if (len > MAX_EVENT_NAME_LEN) { @@ -267,7 +270,11 @@ int traceprobe_parse_event_name(const char **pevent, c= onst char **pgroup, trace_probe_log_err(offset, BAD_EVENT_NAME); return -EINVAL; } - return 0; + + if (slash) + return TP_ENAME_GROUP_EVENT; + + return TP_ENAME_EVENT; } =20 #define PARAM_MAX_STACK (THREAD_SIZE / sizeof(unsigned long)) diff --git a/kernel/trace/trace_probe.h b/kernel/trace/trace_probe.h index 92cc149..7390669 100644 --- a/kernel/trace/trace_probe.h +++ b/kernel/trace/trace_probe.h @@ -364,6 +364,10 @@ extern void traceprobe_free_probe_arg(struct probe_arg= *arg); extern int traceprobe_split_symbol_offset(char *symbol, long *offset); int traceprobe_parse_event_name(const char **pevent, const char **pgroup, char *buf, int offset); +#define TP_ENAME_GROUP_EVENT 0 /* GRP/EVENT format, user defined group and= event name */ +#define TP_ENAME_EVENT 1 /* EVENT format, user defined event name, defaul= t group */ +#define TP_ENAME_GROUP 2 /* GRP/ format, user defined group name, auto ev= ent name */ +#define TP_ENAME_EMPTY 3 /* default group and auto event name */ =20 enum probe_print_type { PROBE_PRINT_NORMAL, diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c index 9711589..bc32361 100644 --- a/kernel/trace/trace_uprobe.c +++ b/kernel/trace/trace_uprobe.c @@ -312,7 +312,8 @@ static bool trace_uprobe_match(const char *system, cons= t char *event, { struct trace_uprobe *tu =3D to_trace_uprobe(ev); =20 - return strcmp(trace_probe_name(&tu->tp), event) =3D=3D 0 && + return (event[0] =3D=3D '\0' || + strcmp(trace_probe_name(&tu->tp), event) =3D=3D 0) && (!system || strcmp(trace_probe_group_name(&tu->tp), system) =3D=3D 0) = && trace_uprobe_match_command_head(tu, argc, argv); } @@ -532,7 +533,7 @@ static int register_trace_uprobe(struct trace_uprobe *t= u) =20 /* * Argument syntax: - * - Add uprobe: p|r[:[GRP/]EVENT] PATH:OFFSET[%return][(REF)] [FETCHARGS] + * - Add uprobe: p|r[:[GRP/][EVENT]] PATH:OFFSET[%return][(REF)] [FETCHAR= GS] */ static int __trace_uprobe_create(int argc, const char **argv) { @@ -540,6 +541,7 @@ static int __trace_uprobe_create(int argc, const char *= *argv) const char *event =3D NULL, *group =3D UPROBE_EVENT_SYSTEM; char *arg, *filename, *rctr, *rctr_end, *tmp; char buf[MAX_EVENT_NAME_LEN]; + char grp_buf[MAX_EVENT_NAME_LEN]; enum probe_print_type ptype; struct path path; unsigned long offset, ref_ctr_offset; @@ -644,12 +646,15 @@ static int __trace_uprobe_create(int argc, const char= **argv) =20 /* setup a probe */ trace_probe_log_set_index(0); + ret =3D TP_ENAME_EMPTY; if (event) { - ret =3D traceprobe_parse_event_name(&event, &group, buf, + ret =3D traceprobe_parse_event_name(&event, &group, grp_buf, event - argv[0]); - if (ret) + if (ret < 0) goto fail_address_parse; - } else { + } + + if (ret =3D=3D TP_ENAME_EMPTY || ret =3D=3D TP_ENAME_GROUP) { char *tail; char *ptr; =20 --=20 2.7.4 From nobody Tue May 5 10:01:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B52BC433F5 for ; Sun, 29 May 2022 03:35:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230306AbiE2DfU (ORCPT ); Sat, 28 May 2022 23:35:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54472 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230297AbiE2DfI (ORCPT ); Sat, 28 May 2022 23:35:08 -0400 Received: from alexa-out.qualcomm.com (alexa-out.qualcomm.com [129.46.98.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9048614E for ; Sat, 28 May 2022 20:35:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; i=@quicinc.com; q=dns/txt; s=qcdkim; t=1653795306; x=1685331306; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WGlVSOwfybXCFZgxHyal61TawoAb6vp6CRxsR8ZXmeE=; b=jbILLlqfhWCqUhuPXl+ct0QqCnfCVL25z9TYcxv29TJm0S9uoFgtbZuc i/VCKjLDCFBwl4hZMCd4HlztLvTAbhCzHlrrpaKTKa85kEM7BSxi2MPdt 3FU6r6NZZN/o8LPfq7uZ19Leddpt+UoP4kz/0STiK1S/g2LjvtOxyGKmj o=; Received: from ironmsg07-lv.qualcomm.com ([10.47.202.151]) by alexa-out.qualcomm.com with ESMTP; 28 May 2022 20:35:06 -0700 X-QCInternal: smtphost Received: from nasanex01c.na.qualcomm.com ([10.47.97.222]) by ironmsg07-lv.qualcomm.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 May 2022 20:35:06 -0700 Received: from nalasex01b.na.qualcomm.com (10.47.209.197) by nasanex01c.na.qualcomm.com (10.47.97.222) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Sat, 28 May 2022 20:35:05 -0700 Received: from linyyuan-gv.qualcomm.com (10.80.80.8) by nalasex01b.na.qualcomm.com (10.47.209.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Sat, 28 May 2022 20:35:03 -0700 From: Linyu Yuan To: Steven Rostedt , Masami Hiramatsu , Tom Zanussi , Ingo Molnar CC: , Linyu Yuan Subject: [PATCH v2 2/2] tracing: eprobe: remove duplicate is_good_name() operation Date: Sun, 29 May 2022 11:34:54 +0800 Message-ID: <1653795294-19764-3-git-send-email-quic_linyyuan@quicinc.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1653795294-19764-1-git-send-email-quic_linyyuan@quicinc.com> References: <1653795294-19764-1-git-send-email-quic_linyyuan@quicinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01b.na.qualcomm.com (10.47.209.197) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" traceprobe_parse_event_name() already validate group and event name, there is no need to call is_good_name() after it. Signed-off-by: Linyu Yuan --- v2: drop v1 change as it is NACK. add it to remove duplicate is_good_name(). kernel/trace/trace_eprobe.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/kernel/trace/trace_eprobe.c b/kernel/trace/trace_eprobe.c index 13cd7fc..2ee041d 100644 --- a/kernel/trace/trace_eprobe.c +++ b/kernel/trace/trace_eprobe.c @@ -883,15 +883,11 @@ static int __trace_eprobe_create(int argc, const char= *argv[]) sanitize_event_name(buf1); event =3D buf1; } - if (!is_good_name(event) || !is_good_name(group)) - goto parse_error; =20 sys_event =3D argv[1]; ret =3D traceprobe_parse_event_name(&sys_event, &sys_name, buf2, 0); if (ret !=3D TP_ENAME_GROUP_EVENT) goto parse_error; - if (!is_good_name(sys_event) || !is_good_name(sys_name)) - goto parse_error; =20 mutex_lock(&event_mutex); event_call =3D find_and_get_event(sys_name, sys_event); --=20 2.7.4