From nobody Sun Feb 8 05:07:47 2026 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 D38091E3DCC; Tue, 7 Jan 2025 11:50:41 +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=1736250641; cv=none; b=Toy48syN/hUKAaQG0Wsk0MeTBC4hk6LxeiAXWNGttDL9SS1gQO2p/WdD0kPFjj7fEBVuSW5anx79QXm0PjhaAII5tV9we0Pc6GyLZDM8AO/aPiYJklwPtjHfOU18SYQUqXPJWb/d+ls0EVCGRMonH1TK+PNFzwj3cH8M0Q5v8ZY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736250641; c=relaxed/simple; bh=tV3TflQ8K5yeFK5RhAYb/HAmHfcz0UsjSC1mWs+Npcc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=YiJpaRxVKYmBG48CoKgLINoO3btdNo1CegYP0bWhYnc274TEgquIUsoTdPn892gv3BBvaL3hyHu+b84dvB6f19oa8LTb9jemCy1oxtYYWMVWb+m5Tp2Bi09NndZGWNXyQ4ixs+XaS5alG+jvWvlng5Lqrd4xX802e+LhwVv2HWM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rJZyTzjs; 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="rJZyTzjs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2C428C4CEDF; Tue, 7 Jan 2025 11:50:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1736250641; bh=tV3TflQ8K5yeFK5RhAYb/HAmHfcz0UsjSC1mWs+Npcc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rJZyTzjsvlx3JK3MI/MSBxAsX0TPR30jPQ5YkikUlac0PAQus8Zah+mCwtuBVWAXO dssazyMftxSIVcaZ01nv59rtI43cloCUdYq4nbiYepizeIvHLTS4pmXAxEZVmG11xD D2B2yg99yO8pOuFss4CPYn4tDVACqTFShUAANdm8f8KUqZE9h0qN4mxYN3sXMNsM76 HJ9PF1CGNqqKhM7FXrMVvXKL2n6K9btBx4YlhuEUM7gXulyrG5IHia2RwdyuDzWrM1 nDrA6ND8b6vP8hQdQQToviBdqUEl7rY8o5vpzem/MOLQWmyyt0b3wkt2n+itHj6E2T H52gKP90Km3RQ== From: "Masami Hiramatsu (Google)" To: Steven Rostedt , Peter Zijlstra Cc: Anil S Keshavamurthy , Masami Hiramatsu , "David S . Miller" , Mathieu Desnoyers , Oleg Nesterov , Tzvetomir Stoyanov , Naveen N Rao , Josh Poimboeuf , Jason Baron , Ard Biesheuvel , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH v3 3/5] tracing: Use __free() for kprobe events to cleanup Date: Tue, 7 Jan 2025 20:50:35 +0900 Message-ID: <173625063552.1375434.16867809967348842161.stgit@devnote2> X-Mailer: git-send-email 2.43.0 In-Reply-To: <173625060316.1375434.11048027439794595989.stgit@devnote2> References: <173625060316.1375434.11048027439794595989.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) Use __free() in trace_kprobe.c to cleanup code. Signed-off-by: Masami Hiramatsu (Google) --- Changes in v3: - Rename to __free(free_trace_kprobe) to clarify what function will be ca= lled. - Add !IS_ERR_OR_NULL() check because alloc_trace_kprobe() returns an err= or code. - Prevent freeing 'tk' in create_local_trace_kprobe() when succeeded to r= egister. Changes in v2: - Instead of using no_free_ptr(), just assign NULL to the registered poin= ter. --- kernel/trace/trace_kprobe.c | 63 +++++++++++++++++++++------------------= ---- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index fb9d4dffa66e..2d8b5ef47e96 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -8,6 +8,7 @@ #define pr_fmt(fmt) "trace_kprobe: " fmt =20 #include +#include #include #include #include @@ -257,6 +258,9 @@ static void free_trace_kprobe(struct trace_kprobe *tk) } } =20 +DEFINE_FREE(free_trace_kprobe, struct trace_kprobe *, + if (!IS_ERR_OR_NULL(_T)) free_trace_kprobe(_T)) + /* * Allocate new trace_probe and initialize it (including kprobes). */ @@ -268,7 +272,7 @@ static struct trace_kprobe *alloc_trace_kprobe(const ch= ar *group, int maxactive, int nargs, bool is_return) { - struct trace_kprobe *tk; + struct trace_kprobe *tk __free(free_trace_kprobe) =3D NULL; int ret =3D -ENOMEM; =20 tk =3D kzalloc(struct_size(tk, tp.args, nargs), GFP_KERNEL); @@ -277,12 +281,12 @@ static struct trace_kprobe *alloc_trace_kprobe(const = char *group, =20 tk->nhit =3D alloc_percpu(unsigned long); if (!tk->nhit) - goto error; + return ERR_PTR(ret); =20 if (symbol) { tk->symbol =3D kstrdup(symbol, GFP_KERNEL); if (!tk->symbol) - goto error; + return ERR_PTR(ret); tk->rp.kp.symbol_name =3D tk->symbol; tk->rp.kp.offset =3D offs; } else @@ -299,13 +303,10 @@ static struct trace_kprobe *alloc_trace_kprobe(const = char *group, =20 ret =3D trace_probe_init(&tk->tp, event, group, false, nargs); if (ret < 0) - goto error; + return ERR_PTR(ret); =20 dyn_event_init(&tk->devent, &trace_kprobe_ops); - return tk; -error: - free_trace_kprobe(tk); - return ERR_PTR(ret); + return_ptr(tk); } =20 static struct trace_kprobe *find_trace_kprobe(const char *event, @@ -866,11 +867,12 @@ static int __trace_kprobe_create(int argc, const char= *argv[]) * Type of args: * FETCHARG:TYPE : use TYPE instead of unsigned long. */ - struct trace_kprobe *tk =3D NULL; + struct trace_kprobe *tk __free(free_trace_kprobe) =3D NULL; int i, len, new_argc =3D 0, ret =3D 0; bool is_return =3D false; - char *symbol =3D NULL, *tmp =3D NULL; - const char **new_argv =3D NULL; + 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; enum probe_print_type ptype; int maxactive =3D 0; @@ -879,7 +881,7 @@ static int __trace_kprobe_create(int argc, const char *= argv[]) char buf[MAX_EVENT_NAME_LEN]; char gbuf[MAX_EVENT_NAME_LEN]; char abuf[MAX_BTF_ARGS_LEN]; - char *dbuf =3D NULL; + char *dbuf __free(kfree) =3D NULL; struct traceprobe_parse_context ctx =3D { .flags =3D TPARG_FL_KERNEL }; =20 switch (argv[0][0]) { @@ -936,7 +938,7 @@ static int __trace_kprobe_create(int argc, const char *= argv[]) /* Check whether uprobe event specified */ if (strchr(argv[1], '/') && strchr(argv[1], ':')) { ret =3D -ECANCELED; - goto error; + goto out; } /* a symbol specified */ symbol =3D kstrdup(argv[1], GFP_KERNEL); @@ -1040,7 +1042,7 @@ static int __trace_kprobe_create(int argc, const char= *argv[]) ctx.offset =3D 0; ret =3D traceprobe_parse_probe_arg(&tk->tp, i, argv[i], &ctx); if (ret) - goto error; /* This can be -ENOMEM */ + goto out; /* This can be -ENOMEM */ } /* entry handler for kretprobe */ if (is_return && tk->tp.entry_arg) { @@ -1051,7 +1053,7 @@ static int __trace_kprobe_create(int argc, const char= *argv[]) ptype =3D is_return ? PROBE_PRINT_RETURN : PROBE_PRINT_NORMAL; ret =3D traceprobe_set_print_fmt(&tk->tp, ptype); if (ret < 0) - goto error; + goto out; =20 ret =3D register_trace_kprobe(tk); if (ret) { @@ -1062,21 +1064,20 @@ static int __trace_kprobe_create(int argc, const ch= ar *argv[]) trace_probe_log_err(0, BAD_PROBE_ADDR); else if (ret !=3D -ENOMEM && ret !=3D -EEXIST) trace_probe_log_err(0, FAIL_REG_PROBE); - goto error; - } + } else + /* + * Here, 'tk' has been registered to the list successfully, + * so we don't need to free it. + */ + tk =3D NULL; =20 out: traceprobe_finish_parse(&ctx); trace_probe_log_clear(); - kfree(new_argv); - kfree(symbol); - kfree(dbuf); return ret; =20 parse_error: ret =3D -EINVAL; -error: - free_trace_kprobe(tk); goto out; } =20 @@ -1898,7 +1899,8 @@ create_local_trace_kprobe(char *func, void *addr, uns= igned long offs, bool is_return) { enum probe_print_type ptype; - struct trace_kprobe *tk; + struct trace_kprobe *tk __free(free_trace_kprobe) =3D NULL; + struct trace_probe *tp; int ret; char *event; =20 @@ -1929,19 +1931,16 @@ create_local_trace_kprobe(char *func, void *addr, u= nsigned long offs, =20 ptype =3D trace_kprobe_is_return(tk) ? PROBE_PRINT_RETURN : PROBE_PRINT_NORMAL; - if (traceprobe_set_print_fmt(&tk->tp, ptype) < 0) { - ret =3D -ENOMEM; - goto error; - } + if (traceprobe_set_print_fmt(&tk->tp, ptype) < 0) + return ERR_PTR(-ENOMEM); =20 ret =3D __register_trace_kprobe(tk); if (ret < 0) - goto error; + return ERR_PTR(ret); =20 - return trace_probe_event_call(&tk->tp); -error: - free_trace_kprobe(tk); - return ERR_PTR(ret); + tp =3D &tk->tp; + tk =3D NULL; /* 'tk' is registered successfully, so do not free. */ + return trace_probe_event_call(tp); } =20 void destroy_local_trace_kprobe(struct trace_event_call *event_call)