From nobody Mon Oct 6 15:13:24 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 075004A0F; Sun, 20 Jul 2025 06:21:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752992512; cv=none; b=ashzZ9Mp8iFBhKutF2980aZO9euWOpvnwHDXUdabLaYZF5Av53kxxAayGYdVg6xJDrFFGWHgRCQpCVW1aeZFlhebZ7Wz/Pg+iGd2AEJ2UN64x/Y+fZGN+A5dBVSsVpH4Dd/Rrrj0Y6I2YzTTUFNcE09UhC4VD6CgGLnLU3/f/bE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752992512; c=relaxed/simple; bh=o0R2CCHj+qVQFFwXi1ijtEJ/1OHgE5CgE1qHLrSSV0w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=u6/nLSQwXYLvlVmg27ZvIJVPZk2Wy3c8SCx7g32kyx8nyRjOJ9INjPEMN2HVjkgYrAx5Uj6pzTtKKD6S0Able8UTH4RIM5Dtecml9Gbj+DZl8MyDA/BLtppWZR8mnlDVfx+NJsdqbM6DkvVxZxVMittXQd1SdSGEprwaMlpSteM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UNd+QV+N; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="UNd+QV+N" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4B5B4C4CEE7; Sun, 20 Jul 2025 06:21:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752992511; bh=o0R2CCHj+qVQFFwXi1ijtEJ/1OHgE5CgE1qHLrSSV0w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UNd+QV+NMZyn2uNksNWeZtWQwfSJapPWJXDavgRJ1cSCEWQqy7hb3Ba8iDuK71tcK w7v46MPIcgMAz5JLReawH+2PWqbGQ6fwLDmJSw9hn6Q4RpNCQxTLfJw9IIzvuSNjqy 85+TGG3jSr7/cl19TvHIXoR+N5cr7zua6qNnoY7/X2+kpBMc3z61D3w7fIh1WjM3Z9 3paH4O2nppUdpSaFaRTMZq8pBubmE/l35oTPw6+imFIQO0InyJa42s73/DpkZNZzNV NFnuVqdyKL5TJeXLzoE/sNSLwAbeZyrhidWQtl+CSHJ87luJYk9gxoyo45aAhJYmBS 38n0sc/GyOQ2g== From: "Masami Hiramatsu (Google)" To: Steven Rostedt , Masami Hiramatsu Cc: Mathieu Desnoyers , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH v2 1/6] tracing: probe: Allocate traceprobe_parse_context from heap Date: Sun, 20 Jul 2025 15:21:47 +0900 Message-ID: <175299250735.418723.6298873768702875564.stgit@devnote2> X-Mailer: git-send-email 2.43.0 In-Reply-To: <175299249728.418723.17799706394466693180.stgit@devnote2> References: <175299249728.418723.17799706394466693180.stgit@devnote2> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Masami Hiramatsu (Google) Instead of allocating traceprobe_parse_context on stack, allocate it dynamically from heap (slab). This change is likely intended to prevent potential stack overflow issues, which can be a concern in the kernel environment where stack space is limited. Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202506240416.nZIhDXoO-lkp@int= el.com/ Signed-off-by: Masami Hiramatsu (Google) --- Changes in v2: - Sort #include alphabetically. - Just NULL check for freeing traceprobe_parse_context. - Do not change the semantics of traceprobe_parse_context for uprobe event. (alloc/free in loop) --- kernel/trace/trace_eprobe.c | 14 ++++++++------ kernel/trace/trace_fprobe.c | 13 ++++++++----- kernel/trace/trace_kprobe.c | 10 +++++++--- kernel/trace/trace_probe.h | 26 ++++++++++++++++++-------- kernel/trace/trace_uprobe.c | 13 ++++++++----- 5 files changed, 49 insertions(+), 27 deletions(-) diff --git a/kernel/trace/trace_eprobe.c b/kernel/trace/trace_eprobe.c index 916555f0de81..1e18a8619b40 100644 --- a/kernel/trace/trace_eprobe.c +++ b/kernel/trace/trace_eprobe.c @@ -797,18 +797,20 @@ find_and_get_event(const char *system, const char *ev= ent_name) =20 static int trace_eprobe_tp_update_arg(struct trace_eprobe *ep, const char = *argv[], int i) { - struct traceprobe_parse_context ctx =3D { - .event =3D ep->event, - .flags =3D TPARG_FL_KERNEL | TPARG_FL_TEVENT, - }; + struct traceprobe_parse_context *ctx __free(traceprobe_parse_context) =3D= NULL; int ret; =20 - ret =3D traceprobe_parse_probe_arg(&ep->tp, i, argv[i], &ctx); + ctx =3D kzalloc(sizeof(*ctx), GFP_KERNEL); + if (!ctx) + return -ENOMEM; + ctx->event =3D ep->event; + ctx->flags =3D TPARG_FL_KERNEL | TPARG_FL_TEVENT; + + ret =3D traceprobe_parse_probe_arg(&ep->tp, i, argv[i], ctx); /* Handle symbols "@" */ if (!ret) ret =3D traceprobe_update_arg(&ep->tp.args[i]); =20 - traceprobe_finish_parse(&ctx); return ret; } =20 diff --git a/kernel/trace/trace_fprobe.c b/kernel/trace/trace_fprobe.c index dbf9d413125a..264cf7fc9a1d 100644 --- a/kernel/trace/trace_fprobe.c +++ b/kernel/trace/trace_fprobe.c @@ -1383,14 +1383,17 @@ static int trace_fprobe_create_internal(int argc, c= onst char *argv[], =20 static int trace_fprobe_create_cb(int argc, const char *argv[]) { - struct traceprobe_parse_context ctx =3D { - .flags =3D TPARG_FL_KERNEL | TPARG_FL_FPROBE, - }; + struct traceprobe_parse_context *ctx __free(traceprobe_parse_context) =3D= NULL; int ret; =20 + ctx =3D kzalloc(sizeof(*ctx), GFP_KERNEL); + if (!ctx) + return -ENOMEM; + + ctx->flags =3D TPARG_FL_KERNEL | TPARG_FL_FPROBE, + trace_probe_log_init("trace_fprobe", argc, argv); - ret =3D trace_fprobe_create_internal(argc, argv, &ctx); - traceprobe_finish_parse(&ctx); + ret =3D trace_fprobe_create_internal(argc, argv, ctx); trace_probe_log_clear(); return ret; } diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 3e5c47b6d7b2..15d7a381a128 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -1065,14 +1065,18 @@ static int trace_kprobe_create_internal(int argc, c= onst char *argv[], =20 static int trace_kprobe_create_cb(int argc, const char *argv[]) { - struct traceprobe_parse_context ctx =3D { .flags =3D TPARG_FL_KERNEL }; + struct traceprobe_parse_context *ctx __free(traceprobe_parse_context) =3D= NULL; int ret; =20 + ctx =3D kzalloc(sizeof(*ctx), GFP_KERNEL); + if (!ctx) + return -ENOMEM; + ctx->flags =3D TPARG_FL_KERNEL; + trace_probe_log_init("trace_kprobe", argc, argv); =20 - ret =3D trace_kprobe_create_internal(argc, argv, &ctx); + ret =3D trace_kprobe_create_internal(argc, argv, ctx); =20 - traceprobe_finish_parse(&ctx); trace_probe_log_clear(); return ret; } diff --git a/kernel/trace/trace_probe.h b/kernel/trace/trace_probe.h index 854e5668f5ee..842383fbc03b 100644 --- a/kernel/trace/trace_probe.h +++ b/kernel/trace/trace_probe.h @@ -10,20 +10,22 @@ * Author: Srikar Dronamraju */ =20 +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include -#include #include -#include -#include -#include #include -#include +#include +#include #include -#include -#include + #include =20 #include "trace.h" @@ -438,6 +440,14 @@ extern void traceprobe_free_probe_arg(struct probe_arg= *arg); * this MUST be called for clean up the context and return a resource. */ void traceprobe_finish_parse(struct traceprobe_parse_context *ctx); +static inline void traceprobe_free_parse_ctx(struct traceprobe_parse_conte= xt *ctx) +{ + traceprobe_finish_parse(ctx); + kfree(ctx); +} + +DEFINE_FREE(traceprobe_parse_context, struct traceprobe_parse_context *, + if (_T) traceprobe_free_parse_ctx(_T)) =20 extern int traceprobe_split_symbol_offset(char *symbol, long *offset); int traceprobe_parse_event_name(const char **pevent, const char **pgroup, diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c index f95a2c3d5b1b..797ac1250956 100644 --- a/kernel/trace/trace_uprobe.c +++ b/kernel/trace/trace_uprobe.c @@ -695,13 +695,16 @@ static int __trace_uprobe_create(int argc, const char= **argv) =20 /* parse arguments */ for (i =3D 0; i < argc; i++) { - struct traceprobe_parse_context ctx =3D { - .flags =3D (is_return ? TPARG_FL_RETURN : 0) | TPARG_FL_USER, - }; + struct traceprobe_parse_context *ctx __free(traceprobe_parse_context) + =3D kzalloc(sizeof(*ctx), GFP_KERNEL); =20 + if (!ctx) { + ret =3D -ENOMEM; + goto error; + } + ctx->flags =3D (is_return ? TPARG_FL_RETURN : 0) | TPARG_FL_USER; trace_probe_log_set_index(i + 2); - ret =3D traceprobe_parse_probe_arg(&tu->tp, i, argv[i], &ctx); - traceprobe_finish_parse(&ctx); + ret =3D traceprobe_parse_probe_arg(&tu->tp, i, argv[i], ctx); if (ret) goto error; } From nobody Mon Oct 6 15:13:24 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C5F1D1B9831; Sun, 20 Jul 2025 06:22:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752992521; cv=none; b=sE6yRNYRCIhc3MM4hF6fLY7yjIVsgrQxi+bU1bq53JcJUED/8yQw83uRtTaw/YvZXJUuXDNvvU3fNrxcqPPqNFuIVVFaOP9PV6ep8cXyb6LOXbGrLtPAyqCMfj/Ch86/Wl+dhgQA3VXmxqYbpiCKgL3FwGv8U9u3TBdCPy2AqMQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752992521; c=relaxed/simple; bh=oBnvY0GESgkHTGe+X4QPvvoGt0YxYYQo5O6GaTuTlJY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DGV8ByUpL5awv2PQ4VtVde9W379RZqkDsLDw0ETdYE0Fy63mMIK4tSkGs1YtCyRaYkN4gFedCBcPX4Orwo/ne6wPMnWwJwRFduQTWs+6AX8/J0y+eopdGKTy34aV2N+QzvfvcKuRTdU72TU2GL92dT6bna1MWpcKepd38IITFDk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GDSN2tGs; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="GDSN2tGs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 517E7C4CEE7; Sun, 20 Jul 2025 06:22:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752992521; bh=oBnvY0GESgkHTGe+X4QPvvoGt0YxYYQo5O6GaTuTlJY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GDSN2tGsKzb/JIDPkrOfY2UCOgxWCg2NiPw+7fgeljs1Hs6cRU//FD/U9Pvm6Xv1E FdEa7/vxz3rzBTUO22k4Z1fgPzn3O4skHhosEsZmwzLrdBOUKRrUHrAY65zRyKB5d8 7eum1uhV+8THeU9IwptoFUpOMHsaZNYpFI3UJi6xdu3Kw/Uv8BMKR91g6ro0A8E0fY hqURa0ruHr5l4ShQivmGsftxxnkzvBuYu9vHrPs7jdDNlkqs/ffS41mkkKcDsUDlC3 5WkZdz4qbnzqhqMQcxAVGXABkMglCRy2RZXqmghE0mrA8SgKPpCxRlvw7qQzKD0why BaMkU6tgCDdTg== From: "Masami Hiramatsu (Google)" To: Steven Rostedt , Masami Hiramatsu Cc: Mathieu Desnoyers , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH v2 2/6] tracing: fprobe-event: Allocate string buffers from heap Date: Sun, 20 Jul 2025 15:21:57 +0900 Message-ID: <175299251697.418723.5675227764506974097.stgit@devnote2> X-Mailer: git-send-email 2.43.0 In-Reply-To: <175299249728.418723.17799706394466693180.stgit@devnote2> References: <175299249728.418723.17799706394466693180.stgit@devnote2> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Masami Hiramatsu (Google) Allocate temporary string buffers for fprobe-event from heap instead of stack. This fixes the stack frame exceed limit error. Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202506240416.nZIhDXoO-lkp@int= el.com/ Signed-off-by: Masami Hiramatsu (Google) --- kernel/trace/trace_fprobe.c | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/kernel/trace/trace_fprobe.c b/kernel/trace/trace_fprobe.c index 264cf7fc9a1d..fd1036e27309 100644 --- a/kernel/trace/trace_fprobe.c +++ b/kernel/trace/trace_fprobe.c @@ -1234,18 +1234,18 @@ static int trace_fprobe_create_internal(int argc, c= onst char *argv[], * FETCHARG:TYPE : use TYPE instead of unsigned long. */ struct trace_fprobe *tf __free(free_trace_fprobe) =3D NULL; - struct module *mod __free(module_put) =3D NULL; - int i, new_argc =3D 0, ret =3D 0; - bool is_return =3D false; - char *symbol __free(kfree) =3D NULL; const char *event =3D NULL, *group =3D FPROBE_EVENT_SYSTEM; + struct module *mod __free(module_put) =3D NULL; const char **new_argv __free(kfree) =3D NULL; - char buf[MAX_EVENT_NAME_LEN]; - char gbuf[MAX_EVENT_NAME_LEN]; - char sbuf[KSYM_NAME_LEN]; - char abuf[MAX_BTF_ARGS_LEN]; + char *symbol __free(kfree) =3D NULL; + char *ebuf __free(kfree) =3D NULL; + char *gbuf __free(kfree) =3D NULL; + char *sbuf __free(kfree) =3D NULL; + char *abuf __free(kfree) =3D NULL; char *dbuf __free(kfree) =3D NULL; + int i, new_argc =3D 0, ret =3D 0; bool is_tracepoint =3D false; + bool is_return =3D false; =20 if ((argv[0][0] !=3D 'f' && argv[0][0] !=3D 't') || argc < 2) return -ECANCELED; @@ -1273,6 +1273,9 @@ static int trace_fprobe_create_internal(int argc, con= st char *argv[], =20 trace_probe_log_set_index(0); if (event) { + gbuf =3D kmalloc(MAX_EVENT_NAME_LEN, GFP_KERNEL); + if (!gbuf) + return -ENOMEM; ret =3D traceprobe_parse_event_name(&event, &group, gbuf, event - argv[0]); if (ret) @@ -1280,15 +1283,18 @@ static int trace_fprobe_create_internal(int argc, c= onst char *argv[], } =20 if (!event) { + ebuf =3D kmalloc(MAX_EVENT_NAME_LEN, GFP_KERNEL); + if (!ebuf) + return -ENOMEM; /* Make a new event name */ if (is_tracepoint) - snprintf(buf, MAX_EVENT_NAME_LEN, "%s%s", + snprintf(ebuf, MAX_EVENT_NAME_LEN, "%s%s", isdigit(*symbol) ? "_" : "", symbol); else - snprintf(buf, MAX_EVENT_NAME_LEN, "%s__%s", symbol, + snprintf(ebuf, MAX_EVENT_NAME_LEN, "%s__%s", symbol, is_return ? "exit" : "entry"); - sanitize_event_name(buf); - event =3D buf; + sanitize_event_name(ebuf); + event =3D ebuf; } =20 if (is_return) @@ -1304,13 +1310,20 @@ static int trace_fprobe_create_internal(int argc, c= onst char *argv[], ctx->flags |=3D TPARG_FL_TPOINT; mod =3D NULL; tpoint =3D find_tracepoint(symbol, &mod); - if (tpoint) + if (tpoint) { + sbuf =3D kmalloc(KSYM_NAME_LEN, GFP_KERNEL); + if (!sbuf) + return -ENOMEM; ctx->funcname =3D kallsyms_lookup((unsigned long)tpoint->probestub, NULL, NULL, NULL, sbuf); + } } if (!ctx->funcname) ctx->funcname =3D symbol; =20 + abuf =3D kmalloc(MAX_BTF_ARGS_LEN, GFP_KERNEL); + if (!abuf) + return -ENOMEM; argc -=3D 2; argv +=3D 2; new_argv =3D traceprobe_expand_meta_args(argc, argv, &new_argc, abuf, MAX_BTF_ARGS_LEN, ctx); From nobody Mon Oct 6 15:13:24 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 675FD1C07D9; Sun, 20 Jul 2025 06:22:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752992531; cv=none; b=AYBy34+Fv0+T7hfyoxVeRTahD8+tk+MmPOX4wvt2wGLGhF8Q61NN8AwtaK5vaWD0kGUdGpQEBsBxf2bTtd2uR6rSDPLChHQeto3yiYsdppSEM+DWJkRE8MibDdIfQudE/7iMGGi20mLLH1eV7dEYdXyHsPDCEmP1tK5RfX/cCuo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752992531; c=relaxed/simple; bh=4fCAoOlUAYN4OepnrGbr6t6ZiYM13X/fVvLLVIkY70Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tzNhchMbmzkADXyFn2eqB57n4eI44ISVdM4M3nOxJDtFUUGuyXOgxcfp7+oskUTe/5kqTY4uY3BVJOf0IZBw8KHbF/agDxCd7Pi6+jyfOrzPkvqQQ1fMKRw+KidhR5BZnTcGz+qCDte/AhVwU0EsE+8eMqYlFExYpCxVx2TSUBQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=T459RqW6; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="T459RqW6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9F357C4CEE7; Sun, 20 Jul 2025 06:22:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752992531; bh=4fCAoOlUAYN4OepnrGbr6t6ZiYM13X/fVvLLVIkY70Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T459RqW6fBk16ZmxI4r9ReAEAxiKKWsCNYjCbN79LLH27jB19/r5zGF6Mlp6O3RAG 5L6NkLyXgmuzDOPaG4m9HyHXWb0GoDCzyyThLxpFrOM0KhLhJZL9AXgc0ps2yQwqm2 iRRv8YvOfEv9T6SgzjbGkQ5vCD8zk3XEUdqwEK8vsWoos65DVWL5n30Q1KL5HVXStv WhFnbfL/uQ3oexkGc92LfIS5HH/IRHZUed+7vR5qnTlR+o88qfjOm7BsRkkszA/vkP q9j249iqgMjcD0T8MWZ67IX38VGsSbx1ir8ZAbDLDUhRDXbMQ5TfAB5Dcz9RbtQgCR 4nIA/EkgDCdyQ== From: "Masami Hiramatsu (Google)" To: Steven Rostedt , Masami Hiramatsu Cc: Mathieu Desnoyers , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH v2 3/6] tracing: kprobe-event: Allocate string buffers from heap Date: Sun, 20 Jul 2025 15:22:06 +0900 Message-ID: <175299252660.418723.3670130235025329010.stgit@devnote2> X-Mailer: git-send-email 2.43.0 In-Reply-To: <175299249728.418723.17799706394466693180.stgit@devnote2> References: <175299249728.418723.17799706394466693180.stgit@devnote2> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Masami Hiramatsu (Google) Allocate temporary string buffers for parsing kprobe-events from heap instead of stack. Signed-off-by: Masami Hiramatsu (Google) Reviewed-by: Steven Rostedt (Google) --- kernel/trace/trace_kprobe.c | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 15d7a381a128..793af6000f16 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -861,20 +861,20 @@ static int trace_kprobe_create_internal(int argc, con= st char *argv[], * FETCHARG:TYPE : use TYPE instead of unsigned long. */ struct trace_kprobe *tk __free(free_trace_kprobe) =3D NULL; + const char *event =3D NULL, *group =3D KPROBE_EVENT_SYSTEM; + const char **new_argv __free(kfree) =3D NULL; int i, len, new_argc =3D 0, ret =3D 0; - bool is_return =3D false; char *symbol __free(kfree) =3D NULL; - char *tmp =3D NULL; - const char **new_argv __free(kfree) =3D NULL; - const char *event =3D NULL, *group =3D KPROBE_EVENT_SYSTEM; + char *ebuf __free(kfree) =3D NULL; + char *gbuf __free(kfree) =3D NULL; + char *abuf __free(kfree) =3D NULL; + char *dbuf __free(kfree) =3D NULL; enum probe_print_type ptype; + bool is_return =3D false; int maxactive =3D 0; - long offset =3D 0; void *addr =3D NULL; - char buf[MAX_EVENT_NAME_LEN]; - char gbuf[MAX_EVENT_NAME_LEN]; - char abuf[MAX_BTF_ARGS_LEN]; - char *dbuf __free(kfree) =3D NULL; + char *tmp =3D NULL; + long offset =3D 0; =20 switch (argv[0][0]) { case 'r': @@ -893,6 +893,8 @@ static int trace_kprobe_create_internal(int argc, const= char *argv[], event++; =20 if (isdigit(argv[0][1])) { + char *buf __free(kfree) =3D NULL; + if (!is_return) { trace_probe_log_err(1, BAD_MAXACT_TYPE); return -EINVAL; @@ -905,7 +907,7 @@ static int trace_kprobe_create_internal(int argc, const= char *argv[], trace_probe_log_err(1, BAD_MAXACT); return -EINVAL; } - memcpy(buf, &argv[0][1], len); + buf =3D kmemdup(&argv[0][1], len + 1, GFP_KERNEL); buf[len] =3D '\0'; ret =3D kstrtouint(buf, 0, &maxactive); if (ret || !maxactive) { @@ -973,6 +975,9 @@ static int trace_kprobe_create_internal(int argc, const= char *argv[], =20 trace_probe_log_set_index(0); if (event) { + gbuf =3D kmalloc(MAX_EVENT_NAME_LEN, GFP_KERNEL); + if (!gbuf) + return -ENOMEM; ret =3D traceprobe_parse_event_name(&event, &group, gbuf, event - argv[0]); if (ret) @@ -981,16 +986,22 @@ static int trace_kprobe_create_internal(int argc, con= st char *argv[], =20 if (!event) { /* Make a new event name */ + ebuf =3D kmalloc(MAX_EVENT_NAME_LEN, GFP_KERNEL); + if (!ebuf) + return -ENOMEM; if (symbol) - snprintf(buf, MAX_EVENT_NAME_LEN, "%c_%s_%ld", + snprintf(ebuf, MAX_EVENT_NAME_LEN, "%c_%s_%ld", is_return ? 'r' : 'p', symbol, offset); else - snprintf(buf, MAX_EVENT_NAME_LEN, "%c_0x%p", + snprintf(ebuf, MAX_EVENT_NAME_LEN, "%c_0x%p", is_return ? 'r' : 'p', addr); - sanitize_event_name(buf); - event =3D buf; + sanitize_event_name(ebuf); + event =3D ebuf; } =20 + abuf =3D kmalloc(MAX_BTF_ARGS_LEN, GFP_KERNEL); + if (!abuf) + return -ENOMEM; argc -=3D 2; argv +=3D 2; ctx->funcname =3D symbol; new_argv =3D traceprobe_expand_meta_args(argc, argv, &new_argc, From nobody Mon Oct 6 15:13:24 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3B7191ADC90; Sun, 20 Jul 2025 06:22:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752992542; cv=none; b=l3x/PV8CME7DVokuhcqim8V7mEPifCWJYGGMeR2vmGklMJcCkNuGHz/qOTRxDt0/BnvQA08LWoqK3egLHyxebF/zsy5WZATLM8q+FhQn7nNS7CVR6K0B7ztIUS2K2WAK3lMqkWWwGdfpCbl+1HRW6V6OJHz2oM/shvkS4U39ydI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752992542; c=relaxed/simple; bh=Y6eWHhRzvLS7UKVCubfUp6ykDh2zGXNc/JAUTrUqM5Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=T6cgpDshUH7iRldSez5wiApI3l8CcR0Ru1Kp3cYRFhOm/63zb1C5B2AYq4Cp5JgZjOnJ/26yT41mMPgjtZ42aM47fXHBCGBRZJQo1HwI41WEhIXNBDwjeswK//a5ezEcpQ3UWdUoOfuUIkV1zSW9K65AD6oa93VvkVZ37hQn2t4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CcJMwfzn; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="CcJMwfzn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5CD64C4CEE7; Sun, 20 Jul 2025 06:22:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752992540; bh=Y6eWHhRzvLS7UKVCubfUp6ykDh2zGXNc/JAUTrUqM5Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CcJMwfzn1M6VkNvsfzlJF5gkm8hGFVoCqaZFhPInsThhdF20ewdhWRnbHwuvN16K/ yn5OgV4ZzokICOAS2PLAkaxE9cv/g0h9UyiV3sI7yI8jQyGMQFh8ECMhV8M6yMPZeE SRrcyc7y+njKzgkZQKsjpii81HM5fC4j4D39axCfW1oL0CMLueZHKoCOuqY/GFg8KE VJgjhTfJJMgttzLPtmcI/xy2vmzXVWu9siiqM0N5iPXuRUtwMwJCsl6BD+gbcB5Svj uo0tDWpIG4wobzm8YaLZN1HIKcDocjZubkvb9ac8LGCQ7BX1KYSg3bWoxPXxvGmfUy gF/+VbXGUR12A== From: "Masami Hiramatsu (Google)" To: Steven Rostedt , Masami Hiramatsu Cc: Mathieu Desnoyers , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH v2 4/6] tracing: eprobe-event: Allocate string buffers from heap Date: Sun, 20 Jul 2025 15:22:16 +0900 Message-ID: <175299253643.418723.5944624119162360742.stgit@devnote2> X-Mailer: git-send-email 2.43.0 In-Reply-To: <175299249728.418723.17799706394466693180.stgit@devnote2> References: <175299249728.418723.17799706394466693180.stgit@devnote2> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Masami Hiramatsu (Google) Allocate temporary string buffers for parsing eprobe-events from heap instead of stack. Signed-off-by: Masami Hiramatsu (Google) Reviewed-by: Steven Rostedt (Google) --- Changes in v2: - Use new label for returning -ENOMEM. - Sort #include alphabetically. --- kernel/trace/trace_eprobe.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/kernel/trace/trace_eprobe.c b/kernel/trace/trace_eprobe.c index 1e18a8619b40..f16a0ab0b001 100644 --- a/kernel/trace/trace_eprobe.c +++ b/kernel/trace/trace_eprobe.c @@ -9,14 +9,15 @@ * Copyright (C) 2021, VMware Inc, Tzvetomir Stoyanov tz.stoyanov@gmail.co= m> * */ +#include +#include #include #include -#include =20 #include "trace_dynevent.h" #include "trace_probe.h" -#include "trace_probe_tmpl.h" #include "trace_probe_kernel.h" +#include "trace_probe_tmpl.h" =20 #define EPROBE_EVENT_SYSTEM "eprobes" =20 @@ -871,10 +872,10 @@ static int __trace_eprobe_create(int argc, const char= *argv[]) const char *event =3D NULL, *group =3D EPROBE_EVENT_SYSTEM; const char *sys_event =3D NULL, *sys_name =3D NULL; struct trace_event_call *event_call; + char *buf1 __free(kfree) =3D NULL; + char *buf2 __free(kfree) =3D NULL; + char *gbuf __free(kfree) =3D NULL; struct trace_eprobe *ep =3D NULL; - char buf1[MAX_EVENT_NAME_LEN]; - char buf2[MAX_EVENT_NAME_LEN]; - char gbuf[MAX_EVENT_NAME_LEN]; int ret =3D 0, filter_idx =3D 0; int i, filter_cnt; =20 @@ -885,6 +886,9 @@ static int __trace_eprobe_create(int argc, const char *= argv[]) =20 event =3D strchr(&argv[0][1], ':'); if (event) { + gbuf =3D kmalloc(MAX_EVENT_NAME_LEN, GFP_KERNEL); + if (!gbuf) + goto mem_error; event++; ret =3D traceprobe_parse_event_name(&event, &group, gbuf, event - argv[0]); @@ -894,6 +898,11 @@ static int __trace_eprobe_create(int argc, const char = *argv[]) =20 trace_probe_log_set_index(1); sys_event =3D argv[1]; + + buf2 =3D kmalloc(MAX_EVENT_NAME_LEN, GFP_KERNEL); + if (!buf2) + goto mem_error; + ret =3D traceprobe_parse_event_name(&sys_event, &sys_name, buf2, 0); if (ret || !sys_event || !sys_name) { trace_probe_log_err(0, NO_EVENT_INFO); @@ -901,7 +910,9 @@ static int __trace_eprobe_create(int argc, const char *= argv[]) } =20 if (!event) { - strscpy(buf1, sys_event, MAX_EVENT_NAME_LEN); + buf1 =3D kstrdup(sys_event, GFP_KERNEL); + if (!buf1) + goto mem_error; event =3D buf1; } =20 @@ -974,6 +985,9 @@ static int __trace_eprobe_create(int argc, const char *= argv[]) trace_probe_log_clear(); return ret; =20 +mem_error: + ret =3D -ENOMEM; + goto error; parse_error: ret =3D -EINVAL; error: From nobody Mon Oct 6 15:13:24 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0CFCD1C84A6; Sun, 20 Jul 2025 06:22:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752992551; cv=none; b=d3jWeTVieirROSSqeuge+Yk6U26g3BtKyj5pnW2GU5Tl1SYvQfrYl1KchYDJq3CPwhyikYYmE/CF7zERUlt6szGpbYSqx4hE04xAeDEiiS261+cC02TJqPj+AsjuJa0kV2j1CEw2+Exk13xYSpToe6jCrOgLEr8sWQuXCfYNlsY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752992551; c=relaxed/simple; bh=ruSnIaoyUzmF4Iq1fSxbSDMwjdBan9AVWbkD9IZkaOM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Omnp3iGZ/ADbC2nxz9hH0eU5orGXMXoe8wC8VJj6Gc+G4eOqw5G3i1hCBu1NwVsiTNGTModGq0ssPJ5H1XTgV/0cRWxj7lrp6qvovd8NYGpD0BmT0lCgBEZxVB9n02IH7q7J7v54eipiywoO5mt6kpo7eZnWXxjgBpNJJqecXLQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rKcZ0JK7; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="rKcZ0JK7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4BE29C4CEE7; Sun, 20 Jul 2025 06:22:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752992550; bh=ruSnIaoyUzmF4Iq1fSxbSDMwjdBan9AVWbkD9IZkaOM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rKcZ0JK7zrDs3SYpxlnP863cTASEzvH4olgZk9CDmLxk4nkvpsfwAgoOsf/YQndlP k8WkkA07jtGlYoNe+W1Tz1J0u9MRq8gsDWq30a36h+yG4VHCJs55Q6vuOe9fJ/UooP 9h7NeZq4+fgiaQryplcQ0ktEa4NUDR4hWkMP1nkWCLEE1QJcPsT7LbURF+8RpSy2qY QNupP6E2mpMwynH54RC35xS9rIXxHye9wtnnX4rQxkLogNZq645A2U5MWkS4tfeGaV jtDCZYyB5wynjwxL0JnH8So2tNXK7Ofe6xMiCfZmlPLT6OJHp9MGrPvcMvg5OkvYQD QWIftzT+uepnA== From: "Masami Hiramatsu (Google)" To: Steven Rostedt , Masami Hiramatsu Cc: Mathieu Desnoyers , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH v2 5/6] tracing: uprobe-event: Allocate string buffers from heap Date: Sun, 20 Jul 2025 15:22:26 +0900 Message-ID: <175299254616.418723.15582800834785477413.stgit@devnote2> X-Mailer: git-send-email 2.43.0 In-Reply-To: <175299249728.418723.17799706394466693180.stgit@devnote2> References: <175299249728.418723.17799706394466693180.stgit@devnote2> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Masami Hiramatsu (Google) Allocate temporary string buffers for parsing uprobe-events from heap instead of stack. Signed-off-by: Masami Hiramatsu (Google) --- Changes in v2: - Sort #include alphabetically. - Add fail_mem label for handling ENOMEM error. --- kernel/trace/trace_uprobe.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c index 797ac1250956..8b0bcc0d8f41 100644 --- a/kernel/trace/trace_uprobe.c +++ b/kernel/trace/trace_uprobe.c @@ -8,17 +8,19 @@ #define pr_fmt(fmt) "trace_uprobe: " fmt =20 #include -#include +#include #include +#include #include -#include -#include #include -#include -#include -#include #include +#include +#include +#include +#include +#include =20 +#include "trace.h" #include "trace_dynevent.h" #include "trace_probe.h" #include "trace_probe_tmpl.h" @@ -537,15 +539,15 @@ static int register_trace_uprobe(struct trace_uprobe = *tu) */ static int __trace_uprobe_create(int argc, const char **argv) { - struct trace_uprobe *tu; const char *event =3D NULL, *group =3D UPROBE_EVENT_SYSTEM; char *arg, *filename, *rctr, *rctr_end, *tmp; - char buf[MAX_EVENT_NAME_LEN]; - char gbuf[MAX_EVENT_NAME_LEN]; - enum probe_print_type ptype; - struct path path; unsigned long offset, ref_ctr_offset; + char *gbuf __free(kfree) =3D NULL; + char *buf __free(kfree) =3D NULL; + enum probe_print_type ptype; + struct trace_uprobe *tu; bool is_return =3D false; + struct path path; int i, ret; =20 ref_ctr_offset =3D 0; @@ -653,6 +655,10 @@ static int __trace_uprobe_create(int argc, const char = **argv) /* setup a probe */ trace_probe_log_set_index(0); if (event) { + gbuf =3D kmalloc(MAX_EVENT_NAME_LEN, GFP_KERNEL); + if (!gbuf) + goto fail_mem; + ret =3D traceprobe_parse_event_name(&event, &group, gbuf, event - argv[0]); if (ret) @@ -664,15 +670,16 @@ static int __trace_uprobe_create(int argc, const char= **argv) char *ptr; =20 tail =3D kstrdup(kbasename(filename), GFP_KERNEL); - if (!tail) { - ret =3D -ENOMEM; - goto fail_address_parse; - } + if (!tail) + goto fail_mem; =20 ptr =3D strpbrk(tail, ".-_"); if (ptr) *ptr =3D '\0'; =20 + buf =3D kmalloc(MAX_EVENT_NAME_LEN, GFP_KERNEL); + if (!buf) + goto fail_mem; snprintf(buf, MAX_EVENT_NAME_LEN, "%c_%s_0x%lx", 'p', tail, offset); event =3D buf; kfree(tail); @@ -724,6 +731,9 @@ static int __trace_uprobe_create(int argc, const char *= *argv) trace_probe_log_clear(); return ret; =20 +fail_mem: + ret =3D -ENOMEM; + fail_address_parse: trace_probe_log_clear(); path_put(&path); From nobody Mon Oct 6 15:13:24 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4C4261C4A17; Sun, 20 Jul 2025 06:22:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752992562; cv=none; b=WELlxb+zhT8Rek/WoIDUgH0r/fW9vRamKZbtV93fkq+Yc2WORNB7NcKdjy9/ZbwWQb5feqYIeGNW9HECPIPvo7DaDAw0p5qKH9H2tty+7Z5WCCc4OO3AoPxgD3krAWzBoHcKi0k3X61XUiRzLT+vcKSKV6/gucBR0brT3NZci0w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752992562; c=relaxed/simple; bh=hpsFt4kAWZBfDMi50YQCwG8A9W+7Ajj8ewsnZeWqOFU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Q9h+c+MrEFBYKnOe778MU0mPKeKQzxh4NT4B+E2hFrvsubV6S24poXrWCnQF0fUIBbAgJKrE1jqqrkM6yK3O29r6l9vlBgs5DcV8IHMraQGe9OWLmvn1yykF7m/O5rsL49OTKik1Dlu5P0D7o15XwSTvZJ6GyX+SQY7lMOUR1hA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=P4ieRLN2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="P4ieRLN2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D6FFC4CEE7; Sun, 20 Jul 2025 06:22:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752992560; bh=hpsFt4kAWZBfDMi50YQCwG8A9W+7Ajj8ewsnZeWqOFU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P4ieRLN2s9ZFB/85pCxisLwz5mm/Xuhs34F6EbOr1kW0RPjos1Nwm0dSfjphPku+j 0f6Vsgk/VRMJW5FuR+SEPiaExFkHsPgyrcLa6+FnafYh1w970dpwNyOIexzfwr/jtx Ftscbsh9sSPE5Wb9b44OAJMH1fZeKcS+FTsAI+Ef/mKORbnQH1dR//GjwVB5R11Zj4 jXqvfM72xO6p3g1MQT14wGAKpixiY+Vxn529XhMPm1drXDKds052sX5liWrtmsbicF Qt8LCYsjRsl/RgMseqIDsfJRMTDuEM3hTSyixQk4WSv9qHke0NtwcSFGhFbQFmXYeo d820YuIRhne1g== From: "Masami Hiramatsu (Google)" To: Steven Rostedt , Masami Hiramatsu Cc: Mathieu Desnoyers , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH v2 6/6] tracing: probes: Add a kerneldoc for traceprobe_parse_event_name() Date: Sun, 20 Jul 2025 15:22:36 +0900 Message-ID: <175299255609.418723.7661338110074622016.stgit@devnote2> X-Mailer: git-send-email 2.43.0 In-Reply-To: <175299249728.418723.17799706394466693180.stgit@devnote2> References: <175299249728.418723.17799706394466693180.stgit@devnote2> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Masami Hiramatsu (Google) Since traceprobe_parse_event_name() is a bit complicated, add a kerneldoc for explaining the behavior. Suggested-by: Steven Rostedt Signed-off-by: Masami Hiramatsu (Google) --- kernel/trace/trace_probe.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c index abfab8957a6c..72bf430a3804 100644 --- a/kernel/trace/trace_probe.c +++ b/kernel/trace/trace_probe.c @@ -247,7 +247,22 @@ int traceprobe_split_symbol_offset(char *symbol, long = *offset) return 0; } =20 -/* @buf must has MAX_EVENT_NAME_LEN size */ +/** + * traceprobe_parse_event_name - Parse a string into group and event names + * @pevent: A pointer to the string to be parsed. On return, this is updat= ed + * to point to the event name part of the string. + * @pgroup: A pointer to the group name. This is updated to point to the p= arsed + * group name, which is stored in @buf. + * @buf: A buffer to store the parsed group name. + * @offset: The offset of the string in the original user command, for log= ging. + * + * Description: This parses a string with the format `[GROUP/][EVENT]` or + * `[GROUP.][EVENT]` (either GROUP or EVENT or both must be speci= fied). + * The parsed group name is stored in @buf. + * The caller must ensure @buf is at least MAX_EVENT_NAME_LEN byt= es. + * + * Return: 0 on success, or -EINVAL on failure. + */ int traceprobe_parse_event_name(const char **pevent, const char **pgroup, char *buf, int offset) {