From nobody Sun Apr 12 06:07: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 71A20C00140 for ; Mon, 1 Aug 2022 02:32:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239131AbiHACcn (ORCPT ); Sun, 31 Jul 2022 22:32:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239028AbiHACcc (ORCPT ); Sun, 31 Jul 2022 22:32:32 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9072212D3E for ; Sun, 31 Jul 2022 19:32:30 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E9F9261218 for ; Mon, 1 Aug 2022 02:32:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EBE2DC433D6; Mon, 1 Aug 2022 02:32:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659321149; bh=TZqKC9i8D5iV3DKzWvU7wGOtxzIeg45/o3i8PitTRhU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C31B1wZpU5POUc7Am3Gd5B0Af2nueE7qMl3fBppGDif2WSGCkc1pci21vpU7KmZqd FAtqko59eKZjK7htm+Ariz4sIeFlYNp9s3v1FMFT2Nj2fehCIc6sdH8SrSwccLZd53 mJgPwU/IkYJan7S6yEPlb3IEiAkESasZbe8EIS/4rokCD3JE1ZNFYbh672W5hUgBoU az/E60VUN2AYxpP83EKpA+BEdVBl8ZHBEDpqw8tkRqdAER6gYs3ptZmB3oxr7ZMKyO EUv26fzwHKBO4Y6Hdvne0oy63h9xbD0/vJ5BCSiz63KzBeTfALrCoIuVj+bb488WTo D28Kf1P0/6FiA== From: "Masami Hiramatsu (Google)" To: Steven Rostedt Cc: LKML , Tzvetomir Stoyanov , Ingo Molnar , Masami Hiramatsu Subject: [PATCH 2/3] tracing/eprobe: Add eprobe filter support Date: Mon, 1 Aug 2022 11:32:25 +0900 Message-Id: <165932114513.2850673.2592206685744598080.stgit@devnote2> X-Mailer: git-send-email 2.25.1 In-Reply-To: <165932112555.2850673.7704483936633223533.stgit@devnote2> References: <165932112555.2850673.7704483936633223533.stgit@devnote2> User-Agent: StGit/0.19 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Masami Hiramatsu (Google) Add the filter option to the event probe. This is useful if user wants to derive a new event based on the condition of the original event. E.g. echo 'e:egroup/stat_runtime_4core sched/sched_stat_runtime \ runtime=3D$runtime:u32 if cpu < 4' >> ../dynamic_events Then it can filter the events only on first 4 cores. Note that the fields used for 'if' must be the fields in the original events, not eprobe events. Signed-off-by: Masami Hiramatsu (Google) --- kernel/trace/trace_eprobe.c | 104 +++++++++++++++++++++++++++++++++++++++= +--- kernel/trace/trace_probe.h | 3 + 2 files changed, 98 insertions(+), 9 deletions(-) diff --git a/kernel/trace/trace_eprobe.c b/kernel/trace/trace_eprobe.c index 4a0e9d927443..8b32d1a3b9c7 100644 --- a/kernel/trace/trace_eprobe.c +++ b/kernel/trace/trace_eprobe.c @@ -26,6 +26,9 @@ struct trace_eprobe { /* tracepoint event */ const char *event_name; =20 + /* filter string for the tracepoint */ + char *filter_str; + struct trace_event_call *event; =20 struct dyn_event devent; @@ -589,14 +592,15 @@ static struct event_trigger_data * new_eprobe_trigger(struct trace_eprobe *ep, struct trace_event_file *file) { struct event_trigger_data *trigger; + struct event_filter *filter =3D NULL; struct eprobe_data *edata; + int ret; =20 edata =3D kzalloc(sizeof(*edata), GFP_KERNEL); trigger =3D kzalloc(sizeof(*trigger), GFP_KERNEL); if (!trigger || !edata) { - kfree(edata); - kfree(trigger); - return ERR_PTR(-ENOMEM); + ret =3D -ENOMEM; + goto error; } =20 trigger->flags =3D EVENT_TRIGGER_FL_PROBE; @@ -611,13 +615,25 @@ new_eprobe_trigger(struct trace_eprobe *ep, struct tr= ace_event_file *file) trigger->cmd_ops =3D &event_trigger_cmd; =20 INIT_LIST_HEAD(&trigger->list); - RCU_INIT_POINTER(trigger->filter, NULL); + + if (ep->filter_str) { + ret =3D create_event_filter(file->tr, file->event_call, + ep->filter_str, false, &filter); + if (ret) + goto error; + } + RCU_INIT_POINTER(trigger->filter, filter); =20 edata->file =3D file; edata->ep =3D ep; trigger->private_data =3D edata; =20 return trigger; +error: + free_event_filter(filter); + kfree(edata); + kfree(trigger); + return ERR_PTR(ret); } =20 static int enable_eprobe(struct trace_eprobe *ep, @@ -651,6 +667,7 @@ static int disable_eprobe(struct trace_eprobe *ep, { struct event_trigger_data *trigger =3D NULL, *iter; struct trace_event_file *file; + struct event_filter *filter; struct eprobe_data *edata; =20 file =3D find_event_file(tr, ep->event_system, ep->event_name); @@ -677,6 +694,10 @@ static int disable_eprobe(struct trace_eprobe *ep, /* Make sure nothing is using the edata or trigger */ tracepoint_synchronize_unregister(); =20 + filter =3D rcu_access_pointer(trigger->filter); + + if (filter) + free_event_filter(filter); kfree(edata); kfree(trigger); =20 @@ -848,12 +869,62 @@ static int trace_eprobe_tp_update_arg(struct trace_ep= robe *ep, const char *argv[ return ret; } =20 +static int trace_eprobe_parse_filter(struct trace_eprobe *ep, int argc, co= nst char *argv[]) +{ + struct event_filter *dummy; + int i, ret, len =3D 0; + char *p; + + if (argc =3D=3D 0) { + trace_probe_log_err(0, NO_EP_FILTER); + return -EINVAL; + } + + /* Recover the filter string */ + for (i =3D 0; i < argc; i++) + len +=3D strlen(argv[i]) + 1; + + ep->filter_str =3D kzalloc(len, GFP_KERNEL); + if (!ep->filter_str) + return -ENOMEM; + + p =3D ep->filter_str; + for (i =3D 0; i < argc; i++) { + ret =3D snprintf(p, len, "%s ", argv[i]); + if (ret < 0) + goto error; + if (ret > len) { + ret =3D -E2BIG; + goto error; + } + p +=3D ret; + len -=3D ret; + } + p[-1] =3D '\0'; + + /* + * Ensure the filter string can be parsed correctly. Note, this + * filter string is for the original event, not for the eprobe. + */ + ret =3D create_event_filter(top_trace_array(), ep->event, ep->filter_str, + true, &dummy); + free_event_filter(dummy); + if (ret) + goto error; + + return 0; +error: + kfree(ep->filter_str); + ep->filter_str =3D NULL; + return ret; +} + static int __trace_eprobe_create(int argc, const char *argv[]) { /* * Argument syntax: - * e[:[GRP/][ENAME]] SYSTEM.EVENT [FETCHARGS] - * Fetch args: + * e[:[GRP/][ENAME]] SYSTEM.EVENT [FETCHARGS] [if FILTER] + * Fetch args (no space): * =3D$[:TYPE] */ const char *event =3D NULL, *group =3D EPROBE_EVENT_SYSTEM; @@ -863,8 +934,8 @@ static int __trace_eprobe_create(int argc, const char *= argv[]) char buf1[MAX_EVENT_NAME_LEN]; char buf2[MAX_EVENT_NAME_LEN]; char gbuf[MAX_EVENT_NAME_LEN]; - int ret =3D 0; - int i; + int ret =3D 0, filter_idx =3D 0; + int i, filter_cnt; =20 if (argc < 2 || argv[0][0] !=3D 'e') return -ECANCELED; @@ -894,6 +965,15 @@ static int __trace_eprobe_create(int argc, const char = *argv[]) event =3D buf1; } =20 + for (i =3D 2; i < argc; i++) { + if (!strcmp(argv[i], "if")) { + filter_idx =3D i + 1; + filter_cnt =3D argc - filter_idx; + argc =3D i; + break; + } + } + mutex_lock(&event_mutex); event_call =3D find_and_get_event(sys_name, sys_event); ep =3D alloc_event_probe(group, event, event_call, argc - 2); @@ -909,6 +989,14 @@ static int __trace_eprobe_create(int argc, const char = *argv[]) goto error; } =20 + if (filter_idx) { + trace_probe_log_set_index(filter_idx); + ret =3D trace_eprobe_parse_filter(ep, filter_cnt, argv + filter_idx); + if (ret) + goto parse_error; + } else + ep->filter_str =3D NULL; + argc -=3D 2; argv +=3D 2; /* parse arguments */ for (i =3D 0; i < argc && i < MAX_TRACE_ARGS; i++) { diff --git a/kernel/trace/trace_probe.h b/kernel/trace/trace_probe.h index 3b3869ae8cfd..de38f1c03776 100644 --- a/kernel/trace/trace_probe.h +++ b/kernel/trace/trace_probe.h @@ -445,7 +445,8 @@ extern int traceprobe_define_arg_fields(struct trace_ev= ent_call *event_call, C(SAME_PROBE, "There is already the exact same probe event"),\ C(NO_EVENT_INFO, "This requires both group and event name to attach"),\ C(BAD_ATTACH_EVENT, "Attached event does not exist"),\ - C(BAD_ATTACH_ARG, "Attached event does not have this field"), + C(BAD_ATTACH_ARG, "Attached event does not have this field"),\ + C(NO_EP_FILTER, "No filter rule after 'if'"), =20 #undef C #define C(a, b) TP_ERR_##a