From patchwork Fri Jan 3 23:01:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 13925984 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 4EB351C07EA; Fri, 3 Jan 2025 23:01:42 +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=1735945302; cv=none; b=jDOEEEM4YscDEoQV8fWkMUxL1cROScsLoERR3lagkp5AOsVK+KeY66BRWuVm5Q0GfkMyqEavbVYOjQ7LVeLYLUF+4cNDVn531vRTJwKXo3XZsL1kXCO4GLWnl5zJJeePXPfbXnblomqD/OIRuR9IXWuHJzpAFW+PdEd6AMwUL+8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735945302; c=relaxed/simple; bh=SUhZ7GEHZtJZaDdirrowKcn0d6YjA73MGwSKIo7qoU4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=sMuPogPH59C6x8/qDaCR6bKEY23hGoQ+R+2VnDhhlrfx58om0mMUBPn1TXpldjF+/+K1dzaHqNUzXtwrKzgdpsLnawhIvh43XyQ8PpoOyetrPEMOAUQfJxsLcadUkumq+zBfZrvx6L05Zwz5lzOv9mpFC/WWEn7Eo35l+CZiSzo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=g2Vo6wI/; 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="g2Vo6wI/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 164CBC4CEDD; Fri, 3 Jan 2025 23:01:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1735945302; bh=SUhZ7GEHZtJZaDdirrowKcn0d6YjA73MGwSKIo7qoU4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g2Vo6wI/o/4FyczW/0eIxJl7gSDk3PiJ6e3i3FAhU8qQGmNhWTc1smzDviyK3+RV8 1GULX+Xr3uaZGLusvoGPvIwNq6f/Cc6WdKGHdqVoar/VVZAJAH9afA1KfjwBrwslbs zJq/2RPqnBGgPriCbcYqlE1AZjfp/AH13eziQGgCxAmuixwE3QFg5iSX0P1DmM+yTX VkGZBOao12QgPTrHKCTu/mb/Avi6tFxlOo2qI/c6ULJ9kt0eHKMOff0YuMX3nlYLQU P2Rz07R8nlESJXuarEA71gvjS4x/2UVhMEX03Chx8hSz0zVALYuZj0LcsWQa8Y/gVN HtWZteKGHDPbw== 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 1/6] tracing/kprobes: Fix to free objects when failed to copy a symbol Date: Sat, 4 Jan 2025 08:01:36 +0900 Message-ID: <173594529646.1055889.13864553873741821054.stgit@devnote2> X-Mailer: git-send-email 2.43.0 In-Reply-To: <173594528527.1055889.2175884987203674189.stgit@devnote2> References: <173594528527.1055889.2175884987203674189.stgit@devnote2> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Masami Hiramatsu (Google) In __trace_kprobe_create(), if something fails it must goto error block to free objects. But when strdup() a symbol, it returns without that. Fix it to goto the error block to free objects correctly. Fixes: 6212dd29683e ("tracing/kprobes: Use dyn_event framework for kprobe events") Signed-off-by: Masami Hiramatsu (Google) --- kernel/trace/trace_kprobe.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index bae26eb14449..4c3e316454a0 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -935,8 +935,10 @@ static int __trace_kprobe_create(int argc, const char *argv[]) } /* a symbol specified */ symbol = kstrdup(argv[1], GFP_KERNEL); - if (!symbol) - return -ENOMEM; + if (!symbol) { + ret = -ENOMEM; + goto error; + } tmp = strchr(symbol, '%'); if (tmp) { From patchwork Fri Jan 3 23:01:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 13925985 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 8803D1C4A02; Fri, 3 Jan 2025 23:01:53 +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=1735945313; cv=none; b=E5w9uapzWuO5w5dmnv3hQxgyxTgyifcg7A22f4QVbrThDPEsXl01/IeQdFKNhjVvXj98frBwolOHzhHA9jUN9cXHJ/o97Jl9/+X4OvSOoVJVLLXA0C5wbtR8wwVGvWwrNDCmi7WXUckIUbX+Kq2kdl6C1FGH5IbN0Eg4aQ/pHgM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735945313; c=relaxed/simple; bh=nBsW1PeI3OP/lLYs9nJsYVbukmOo0tvnLZw5SKjKRpg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ekReR2hAHPv6AsOrYy0EaCI+6GYyzILA8x4eAvFPPk/cGVkywcrbtyypSJDyLLGmiZ0ddjcApRnfq6FwqpE036Mwvfjhs+0OFNnyIh3k4TQPEualD/L1L/wr5QFyR9kfLOuTDRSe1MSOWb4QP6V+gPttD7RIZNhKQsW5KqCm8NA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HCEj83PU; 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="HCEj83PU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E7665C4CEDD; Fri, 3 Jan 2025 23:01:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1735945313; bh=nBsW1PeI3OP/lLYs9nJsYVbukmOo0tvnLZw5SKjKRpg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HCEj83PUxzk+UhLcMHOo9UdYXbVI1/nVh4/fLY7eU+CkSbldg/5U4xtD11q2CS9hD PJOlZIfFuZhvWvqFH9HPhX4aetViPxBSn8zrb0tZrAGMFVBASb/N1CJhV3ktLV3078 aE4TjcjH6FPop63Z7SgcetddaG7vGmjqdJQr+Ta+sR0ekQ5lnuP6i07OzMoyNEgYQ2 skYaYzWHhxJVtekv9NFc0VrIo42kJXxTDAsfyVYk0f+Bt5bQyhj4mn4TTNgVpTNMzH UmIRTNZyHqdLQhcdXxnQXHZtlCB86V2r7XDARYr2cxtPVx5e3uKGDf7GZZ3laGlqaO 1iSiCAYcXClMA== 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 2/6] Provide __free(argv) for argv_split() users Date: Sat, 4 Jan 2025 08:01:47 +0900 Message-ID: <173594530753.1055889.17844868397124331132.stgit@devnote2> X-Mailer: git-send-email 2.43.0 In-Reply-To: <173594528527.1055889.2175884987203674189.stgit@devnote2> References: <173594528527.1055889.2175884987203674189.stgit@devnote2> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Masami Hiramatsu (Google) Provide __free(argv) macro for argv_split() users so that they can avoid gotos. Signed-off-by: Masami Hiramatsu (Google) --- include/linux/string.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/linux/string.h b/include/linux/string.h index 493ac4862c77..7035a70e30be 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -312,6 +312,8 @@ extern void *kmemdup_array(const void *src, size_t count, size_t element_size, g extern char **argv_split(gfp_t gfp, const char *str, int *argcp); extern void argv_free(char **argv); +DEFINE_FREE(argv, char **, argv_free(_T)) + /* lib/cmdline.c */ extern int get_option(char **str, int *pint); extern char *get_options(const char *str, int nints, int *ints); From patchwork Fri Jan 3 23:01:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 13925986 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 79CC71C1738; Fri, 3 Jan 2025 23:02:04 +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=1735945324; cv=none; b=u7adaXwBO+xoRh20XehFYAC4obCltyD8YW+08+egxb5Wjwpmi2A8FceP8hOc4SqXb7XMrghnZqIxYvr1edvhFr34B1jX0w7aV5VH2/4So84ctLUch1fR+KjrB1mb4+Ost2yy22+S2GRHexCNvgVKrXzAqVRI57fcSW1m98qZoCw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735945324; c=relaxed/simple; bh=etnA2SO279t5hWq6UUbJo8a9gsTJwE59MSfhjDJAKQU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=fWfjN1eoNsG5sYTYOwkl0IDyJFJzAyNyFlbwW4KbCP1ofqx6fo2INTiq9Ok5obyqZQ5nZj7QJgXfcSYTjZMjlT9U/CQ7N1H8GUiz/rYYcxHZIwDpj8hOqZhgtCz1FLC5sOuqAhs8MFFNIG2z6Cg3svLEGwdsDclE1r6jIhPieC4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gMwDDDKF; 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="gMwDDDKF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A6DDC4CEDD; Fri, 3 Jan 2025 23:02:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1735945324; bh=etnA2SO279t5hWq6UUbJo8a9gsTJwE59MSfhjDJAKQU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gMwDDDKFUiHyiUXPVzIFrYU4ITY6vzLvqXzGcyy2lHpQrRgNC8KZ57f+QR+5LIO08 4ZClUdA+128T10v049QHrWmzM4gYxtBICDxnm1g9gue9CshiZienp0/JJ/AULyEoh1 cOfFS1+q698gDWIJy2RpKvn7i6y77FmucH52KUt31m0smlqFCz+CwCvsW1CS9rUGkS YGoiOQAK1Ne9WmRFvWX8KuCJiRoaAMY0Cft+UeaRAay23bnnhpQIlLpPkkLAnFXUDn CFS12h7O0SXM6+ADzeFu7QwjqDLgTe2r1siPbSHwjGrS6u503F64ohBvZ6wpiyJ00G S5dHPUFpfodZQ== 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 3/6] tracing: Use __free() for argv in dynevent Date: Sat, 4 Jan 2025 08:01:58 +0900 Message-ID: <173594531843.1055889.15079784465215693664.stgit@devnote2> X-Mailer: git-send-email 2.43.0 In-Reply-To: <173594528527.1055889.2175884987203674189.stgit@devnote2> References: <173594528527.1055889.2175884987203674189.stgit@devnote2> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Masami Hiramatsu (Google) Use __free() for the args allocated by argv_split() in dynevent. Signed-off-by: Masami Hiramatsu (Google) --- kernel/trace/trace_dynevent.c | 47 +++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/kernel/trace/trace_dynevent.c b/kernel/trace/trace_dynevent.c index eb8f669c15e1..ec8fa7b143e2 100644 --- a/kernel/trace/trace_dynevent.c +++ b/kernel/trace/trace_dynevent.c @@ -73,24 +73,20 @@ int dyn_event_release(const char *raw_command, struct dyn_event_operations *type struct dyn_event *pos, *n; char *system = NULL, *event, *p; int argc, ret = -ENOENT; - char **argv; + char **argv __free(argv) = NULL; argv = argv_split(GFP_KERNEL, raw_command, &argc); if (!argv) return -ENOMEM; if (argv[0][0] == '-') { - if (argv[0][1] != ':') { - ret = -EINVAL; - goto out; - } + if (argv[0][1] != ':') + return -EINVAL; event = &argv[0][2]; } else { event = strchr(argv[0], ':'); - if (!event) { - ret = -EINVAL; - goto out; - } + if (!event) + return -EINVAL; event++; } @@ -100,27 +96,22 @@ int dyn_event_release(const char *raw_command, struct dyn_event_operations *type event = p + 1; *p = '\0'; } - if (!system && event[0] == '\0') { - ret = -EINVAL; - goto out; - } + if (!system && event[0] == '\0') + return -EINVAL; - scoped_guard(mutex, &event_mutex) { - for_each_dyn_event_safe(pos, n) { - if (type && type != pos->ops) - continue; - if (!pos->ops->match(system, event, - argc - 1, (const char **)argv + 1, pos)) - continue; - - ret = pos->ops->free(pos); - if (ret) - break; - } - tracing_reset_all_online_cpus(); + guard(mutex)(&event_mutex); + for_each_dyn_event_safe(pos, n) { + if (type && type != pos->ops) + continue; + if (!pos->ops->match(system, event, + argc - 1, (const char **)argv + 1, pos)) + continue; + + ret = pos->ops->free(pos); + if (ret) + break; } -out: - argv_free(argv); + tracing_reset_all_online_cpus(); return ret; } From patchwork Fri Jan 3 23:02:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 13925987 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 AF29A1BD9D3; Fri, 3 Jan 2025 23:02:15 +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=1735945335; cv=none; b=Zy9EPWlA+yyseYZk10rE4i3TeGq/p4x716ePgmyaPNJ/JhLfEZIfDQo0YgU6uMUQamL5wTXLh39v7KKFzFoX6Hx/KIsOduRirnDiHXNse8cCFPVFcCS9oLafQ0VKWoDbw2vYjDOrGonjvQ6kXp+bwQDrEYDm8xSZE83RwLF/YR8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735945335; c=relaxed/simple; bh=BcADqpQVIfcOvYJDWh5fJTXzfcEJmhMIEhtchptg8lU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Zqj4q7nBsyctFmbyHQ8PoJfLVbUp9Do4ACM8RUq11U12enzo6ictffexg8fE8ojUaX9LpRngPM8Dj1kfwvcqeRy/CkJs1CIdsETZsjL1YlDP+v7LeKM/lyMQjXeH+ADLvU2iHSwftEE5T2YFeP22bqC4S3tTzExDkfKsTb1O6Ec= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QzQQLuBk; 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="QzQQLuBk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0FF7EC4CEDD; Fri, 3 Jan 2025 23:02:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1735945335; bh=BcADqpQVIfcOvYJDWh5fJTXzfcEJmhMIEhtchptg8lU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QzQQLuBkgiU/de/kjZ2FpLpZNt8jwaHdqxyGQPlBgAYvRqqNuCqUsWC5N6UJclBo8 dMydqQu2Trx4K5rFiure9OoQGtNsCizZrL80Z7Jfhe6/L8/o83eHrzXZbz6NX2OyrC 2BtELKVqAr3ioqm90m0KPn/0GKBNAJH4l2gwb3mgldSNH4vJERWOUMCEeG89DMoAAL vuswtrpHaXQejswmOhTyZfzktN4pHUEY2b7m19eDokqW2NhQVC5eH80hSuLaRju0Eg ZtxAgaL+9MNeAl7YLwbz01gf/PKjPdsrdKOU+UtlCg1LxGLhLDUQ2jZ0C2cRDH16CT VtlxpPGxGzeSw== 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 4/6] tracing: Use __free() in trace_probe for cleanup Date: Sat, 4 Jan 2025 08:02:09 +0900 Message-ID: <173594532943.1055889.15559781281734742703.stgit@devnote2> X-Mailer: git-send-email 2.43.0 In-Reply-To: <173594528527.1055889.2175884987203674189.stgit@devnote2> References: <173594528527.1055889.2175884987203674189.stgit@devnote2> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Masami Hiramatsu (Google) Use __free() in trace_probe to cleanup some gotos. Signed-off-by: Masami Hiramatsu (Google) --- kernel/trace/trace_probe.c | 52 +++++++++++++++----------------------------- 1 file changed, 18 insertions(+), 34 deletions(-) diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c index 16a5e368e7b7..bf6a7b81ae95 100644 --- a/kernel/trace/trace_probe.c +++ b/kernel/trace/trace_probe.c @@ -1409,7 +1409,7 @@ static int traceprobe_parse_probe_arg_body(const char *argv, ssize_t *size, struct traceprobe_parse_context *ctx) { struct fetch_insn *code, *tmp = NULL; - char *type, *arg; + char *type, *arg __free(kfree) = NULL; int ret, len; len = strlen(argv); @@ -1426,22 +1426,16 @@ static int traceprobe_parse_probe_arg_body(const char *argv, ssize_t *size, return -ENOMEM; parg->comm = kstrdup(arg, GFP_KERNEL); - if (!parg->comm) { - ret = -ENOMEM; - goto out; - } + if (!parg->comm) + return -ENOMEM; type = parse_probe_arg_type(arg, parg, ctx); - if (IS_ERR(type)) { - ret = PTR_ERR(type); - goto out; - } + if (IS_ERR(type)) + return PTR_ERR(type); code = tmp = kcalloc(FETCH_INSN_MAX, sizeof(*code), GFP_KERNEL); - if (!code) { - ret = -ENOMEM; - goto out; - } + if (!code) + return -ENOMEM; code[FETCH_INSN_MAX - 1].op = FETCH_OP_END; ctx->last_type = NULL; @@ -1497,8 +1491,6 @@ static int traceprobe_parse_probe_arg_body(const char *argv, ssize_t *size, kfree(code->data); } kfree(tmp); -out: - kfree(arg); return ret; } @@ -1668,7 +1660,7 @@ const char **traceprobe_expand_meta_args(int argc, const char *argv[], { const struct btf_param *params = NULL; int i, j, n, used, ret, args_idx = -1; - const char **new_argv = NULL; + const char **new_argv __free(kfree) = NULL; ret = argv_has_var_arg(argc, argv, &args_idx, ctx); if (ret < 0) @@ -1707,7 +1699,7 @@ const char **traceprobe_expand_meta_args(int argc, const char *argv[], ret = sprint_nth_btf_arg(n, "", buf + used, bufsize - used, ctx); if (ret < 0) - goto error; + return ERR_PTR(ret); new_argv[j++] = buf + used; used += ret + 1; @@ -1721,25 +1713,20 @@ const char **traceprobe_expand_meta_args(int argc, const char *argv[], n = simple_strtoul(argv[i] + 4, &type, 10); if (type && !(*type == ':' || *type == '\0')) { trace_probe_log_err(0, BAD_VAR); - ret = -ENOENT; - goto error; + return ERR_PTR(-ENOENT); } /* Note: $argN starts from $arg1 */ ret = sprint_nth_btf_arg(n - 1, type, buf + used, bufsize - used, ctx); if (ret < 0) - goto error; + return ERR_PTR(ret); new_argv[j++] = buf + used; used += ret + 1; } else new_argv[j++] = argv[i]; } - return new_argv; - -error: - kfree(new_argv); - return ERR_PTR(ret); + return_ptr(new_argv); } /* @buf: *buf must be equal to NULL. Caller must to free *buf */ @@ -1747,14 +1734,14 @@ int traceprobe_expand_dentry_args(int argc, const char *argv[], char **buf) { int i, used, ret; const int bufsize = MAX_DENTRY_ARGS_LEN; - char *tmpbuf = NULL; + char *tmpbuf __free(kfree) = NULL; if (*buf) return -EINVAL; used = 0; for (i = 0; i < argc; i++) { - char *tmp; + char *tmp __free(kfree) = NULL; char *equal; size_t arg_len; @@ -1769,7 +1756,7 @@ int traceprobe_expand_dentry_args(int argc, const char *argv[], char **buf) tmp = kstrdup(argv[i], GFP_KERNEL); if (!tmp) - goto nomem; + return -ENOMEM; equal = strchr(tmp, '='); if (equal) @@ -1790,18 +1777,15 @@ int traceprobe_expand_dentry_args(int argc, const char *argv[], char **buf) offsetof(struct file, f_path.dentry), equal ? equal + 1 : tmp); - kfree(tmp); + kfree(no_free_ptr(tmp)); if (ret >= bufsize - used) - goto nomem; + return -ENOMEM; argv[i] = tmpbuf + used; used += ret + 1; } - *buf = tmpbuf; + *buf = no_free_ptr(tmpbuf); return 0; -nomem: - kfree(tmpbuf); - return -ENOMEM; } void traceprobe_finish_parse(struct traceprobe_parse_context *ctx) From patchwork Fri Jan 3 23:02:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 13925988 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 653DE1BEF73; Fri, 3 Jan 2025 23:02:26 +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=1735945346; cv=none; b=XS+2X8UYtj5mo4VSnU5jtSqRo1Z7aALnlmfDtCtU5f6HOqhyKRFJZqNLAAUUkGR+efosYboERm5plhp2BNfOkHiV3F73fyzcCNy2PgATvmGzJOoHvuhkaTHI7SODmxvBaJRRWdnn3iXT5uuu6gqOxXOfghi0TudBehwSjL14C8o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735945346; c=relaxed/simple; bh=x4kabNr8G2/lX849M4airJHXsAaRvHSFPtZzf267JBQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tmsvNH+xJzNVHE+IcPvddG27gD+jUY4jwKuavxttDPAEKkW6D2YSlCAFlJLLFccuPvzbYAZu4Qr09Wt99HeXDeC51ZyppAejogAg0gWXGuNa5SXqMi6HznxylWS83xhRvDBrnSPvOA/0MQ9Io5Lo6pFbc2widyB2I31zYkbSNWs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=B4IG9z6L; 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="B4IG9z6L" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E0D4BC4CEDD; Fri, 3 Jan 2025 23:02:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1735945346; bh=x4kabNr8G2/lX849M4airJHXsAaRvHSFPtZzf267JBQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B4IG9z6L/i4+iORu/LAyMgKFwr7megOyLHnF22ztY2E70BsxaCaWwD1lsUVxQH9wB BT5NYvS9uvDQ5BlEdNqso4AghWB3tRfdzc4SZ7m+1uqdSD6k5NhRibyu7BPEc3Hycg yyueyMGciqY+dmQPoz2gm0mLafcMbWabH/p/EFU/tEhwrZXBh+/uzB4vFCn8q9o7v/ 3xbfK1Rae3pkpotIIO5vXpSAHuh0c0RegB7z2GPRCj2gH5g0Fq6tRy1R4jA7EzFFct CR3K3pIU2IbaQ/oXofhCc6erWIAPPnYIa78i43z2vEfCj2uqIVzCIOWfceNUzCX0cR XvgZ1AiqwEfaQ== 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 5/6] tracing: Use __free() for kprobe events to cleanup Date: Sat, 4 Jan 2025 08:02:20 +0900 Message-ID: <173594534060.1055889.15132206436919221336.stgit@devnote2> X-Mailer: git-send-email 2.43.0 In-Reply-To: <173594528527.1055889.2175884987203674189.stgit@devnote2> References: <173594528527.1055889.2175884987203674189.stgit@devnote2> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Masami Hiramatsu (Google) Use __free() in trace_kprobe.c to cleanup code. Signed-off-by: Masami Hiramatsu (Google) --- kernel/trace/trace_kprobe.c | 53 ++++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 31 deletions(-) diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 4c3e316454a0..c5fd4471c137 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -8,6 +8,7 @@ #define pr_fmt(fmt) "trace_kprobe: " fmt #include +#include #include #include #include @@ -257,6 +258,8 @@ static void free_trace_kprobe(struct trace_kprobe *tk) } } +DEFINE_FREE(trace_kprobe, struct trace_kprobe *, free_trace_kprobe(_T)) + /* * Allocate new trace_probe and initialize it (including kprobes). */ @@ -268,7 +271,7 @@ static struct trace_kprobe *alloc_trace_kprobe(const char *group, int maxactive, int nargs, bool is_return) { - struct trace_kprobe *tk; + struct trace_kprobe *tk __free(trace_kprobe) = NULL; int ret = -ENOMEM; tk = kzalloc(struct_size(tk, tp.args, nargs), GFP_KERNEL); @@ -277,12 +280,12 @@ static struct trace_kprobe *alloc_trace_kprobe(const char *group, tk->nhit = alloc_percpu(unsigned long); if (!tk->nhit) - goto error; + return ERR_PTR(ret); if (symbol) { tk->symbol = kstrdup(symbol, GFP_KERNEL); if (!tk->symbol) - goto error; + return ERR_PTR(ret); tk->rp.kp.symbol_name = tk->symbol; tk->rp.kp.offset = offs; } else @@ -299,13 +302,10 @@ static struct trace_kprobe *alloc_trace_kprobe(const char *group, ret = trace_probe_init(&tk->tp, event, group, false, nargs); if (ret < 0) - goto error; + return ERR_PTR(ret); dyn_event_init(&tk->devent, &trace_kprobe_ops); - return tk; -error: - free_trace_kprobe(tk); - return ERR_PTR(ret); + return_ptr(tk); } static struct trace_kprobe *find_trace_kprobe(const char *event, @@ -861,11 +861,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 = NULL; + struct trace_kprobe *tk __free(trace_kprobe) = NULL; int i, len, new_argc = 0, ret = 0; bool is_return = false; - char *symbol = NULL, *tmp = NULL; - const char **new_argv = NULL; + char *symbol __free(kfree) = NULL; + char *tmp = NULL; + const char **new_argv __free(kfree) = NULL; const char *event = NULL, *group = KPROBE_EVENT_SYSTEM; enum probe_print_type ptype; int maxactive = 0; @@ -874,7 +875,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 = NULL; + char *dbuf __free(kfree) = NULL; struct traceprobe_parse_context ctx = { .flags = TPARG_FL_KERNEL }; switch (argv[0][0]) { @@ -931,7 +932,7 @@ static int __trace_kprobe_create(int argc, const char *argv[]) /* Check whether uprobe event specified */ if (strchr(argv[1], '/') && strchr(argv[1], ':')) { ret = -ECANCELED; - goto error; + goto out; } /* a symbol specified */ symbol = kstrdup(argv[1], GFP_KERNEL); @@ -1035,7 +1036,7 @@ static int __trace_kprobe_create(int argc, const char *argv[]) ctx.offset = 0; ret = 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) { @@ -1046,7 +1047,7 @@ static int __trace_kprobe_create(int argc, const char *argv[]) ptype = is_return ? PROBE_PRINT_RETURN : PROBE_PRINT_NORMAL; ret = traceprobe_set_print_fmt(&tk->tp, ptype); if (ret < 0) - goto error; + goto out; ret = register_trace_kprobe(tk); if (ret) { @@ -1057,21 +1058,16 @@ static int __trace_kprobe_create(int argc, const char *argv[]) trace_probe_log_err(0, BAD_PROBE_ADDR); else if (ret != -ENOMEM && ret != -EEXIST) trace_probe_log_err(0, FAIL_REG_PROBE); - goto error; - } + } else + no_free_ptr(tk); out: traceprobe_finish_parse(&ctx); trace_probe_log_clear(); - kfree(new_argv); - kfree(symbol); - kfree(dbuf); return ret; parse_error: ret = -EINVAL; -error: - free_trace_kprobe(tk); goto out; } @@ -1893,7 +1889,7 @@ create_local_trace_kprobe(char *func, void *addr, unsigned long offs, bool is_return) { enum probe_print_type ptype; - struct trace_kprobe *tk; + struct trace_kprobe *tk __free(trace_kprobe) = NULL; int ret; char *event; @@ -1924,19 +1920,14 @@ create_local_trace_kprobe(char *func, void *addr, unsigned long offs, ptype = trace_kprobe_is_return(tk) ? PROBE_PRINT_RETURN : PROBE_PRINT_NORMAL; - if (traceprobe_set_print_fmt(&tk->tp, ptype) < 0) { - ret = -ENOMEM; - goto error; - } + if (traceprobe_set_print_fmt(&tk->tp, ptype) < 0) + return ERR_PTR(-ENOMEM); ret = __register_trace_kprobe(tk); if (ret < 0) - goto error; + return ERR_PTR(ret); return trace_probe_event_call(&tk->tp); -error: - free_trace_kprobe(tk); - return ERR_PTR(ret); } void destroy_local_trace_kprobe(struct trace_event_call *event_call) From patchwork Fri Jan 3 23:02:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 13925989 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 E25D51BDAA1; Fri, 3 Jan 2025 23:02:37 +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=1735945358; cv=none; b=hGj1vQSCPImeGByoQsZInoF+lNtjioQBpm7RsUxh6mty1vChLIxbN6hybR/DrsWaqZja7rBonbqgGIQfxSFweNv4C20nOLExaFO/75D+LeHkcUViImPO41j7hfxK3O27OtPZr4r1Fy3cvS8nXmkydJqhOsHHG0myFROTU+0ZuJo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735945358; c=relaxed/simple; bh=yatn9LqYlxyIt0C+8FL70xDnDIAqvZMf9OHh0ydXtIg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=fwi600HL7mnQPyaeydx8lulZH4Zf4J4hqnCvb6KS4NR23I25elbeBviUFdN1gCzMLYmGev3U4TmtfkGc/UQt6jB7xniMIMn7xYcAJWuLcOX9on6mRmux+vJSoK+PqAYGhkV9AudRXnatF9aDcf6qtSFhF0Yu0mnmmmuy60UfVZM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=msVm3LWG; 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="msVm3LWG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EEC5DC4CEDD; Fri, 3 Jan 2025 23:02:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1735945357; bh=yatn9LqYlxyIt0C+8FL70xDnDIAqvZMf9OHh0ydXtIg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=msVm3LWGfsDrYAfEDDoPjhxcdahQYigUoi38TO6ZQXzjx7+gXIHiOtLbhDFaB194l +ld1jx8Wl44WyeI07lA5hnWVX9kIuG3G5UQTQLOoltdfso/4AjtevfniUXADe2cGOz ihHksw2HFlGLUlNeoF6uBnAZjbEyWcbP4OJMrrz99dxRIYxZlYIqzAmmBWzMNyOr9Z Ow0HJzE8lG553lg7tZJ0VTWciyzWEUKoOaXvr0aPiPMRl4IeUYP7vjo92nOdmHXhqu ERPJuDMLZ2DX4fuYjLaHtKjaM9RpJYiWYrjuNdIqZjQO0jxO1iQAHL6an7j+ZZh6yE r2RDnmKx7ekjg== 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 6/6] tracing/kprobes: Simplify __trace_kprobe_create() by removing gotos Date: Sat, 4 Jan 2025 08:02:31 +0900 Message-ID: <173594535136.1055889.14214708219941378205.stgit@devnote2> X-Mailer: git-send-email 2.43.0 In-Reply-To: <173594528527.1055889.2175884987203674189.stgit@devnote2> References: <173594528527.1055889.2175884987203674189.stgit@devnote2> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Masami Hiramatsu (Google) Simplify __trace_kprobe_create() by removing gotos. Signed-off-by: Masami Hiramatsu (Google) --- kernel/trace/trace_kprobe.c | 82 ++++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index c5fd4471c137..604eea2ed2fa 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -835,7 +835,8 @@ static int validate_probe_symbol(char *symbol) static int trace_kprobe_entry_handler(struct kretprobe_instance *ri, struct pt_regs *regs); -static int __trace_kprobe_create(int argc, const char *argv[]) +static int ___trace_kprobe_create(int argc, const char *argv[], + struct traceprobe_parse_context *ctx) { /* * Argument syntax: @@ -876,7 +877,6 @@ static int __trace_kprobe_create(int argc, const char *argv[]) char gbuf[MAX_EVENT_NAME_LEN]; char abuf[MAX_BTF_ARGS_LEN]; char *dbuf __free(kfree) = NULL; - struct traceprobe_parse_context ctx = { .flags = TPARG_FL_KERNEL }; switch (argv[0][0]) { case 'r': @@ -890,8 +890,6 @@ static int __trace_kprobe_create(int argc, const char *argv[]) if (argc < 2) return -ECANCELED; - trace_probe_log_init("trace_kprobe", argc, argv); - event = strchr(&argv[0][1], ':'); if (event) event++; @@ -899,7 +897,7 @@ static int __trace_kprobe_create(int argc, const char *argv[]) if (isdigit(argv[0][1])) { if (!is_return) { trace_probe_log_err(1, BAD_MAXACT_TYPE); - goto parse_error; + return -EINVAL; } if (event) len = event - &argv[0][1] - 1; @@ -907,21 +905,21 @@ static int __trace_kprobe_create(int argc, const char *argv[]) len = strlen(&argv[0][1]); if (len > MAX_EVENT_NAME_LEN - 1) { trace_probe_log_err(1, BAD_MAXACT); - goto parse_error; + return -EINVAL; } memcpy(buf, &argv[0][1], len); buf[len] = '\0'; ret = kstrtouint(buf, 0, &maxactive); if (ret || !maxactive) { trace_probe_log_err(1, BAD_MAXACT); - goto parse_error; + return -EINVAL; } /* kretprobes instances are iterated over via a list. The * maximum should stay reasonable. */ if (maxactive > KRETPROBE_MAXACTIVE_MAX) { trace_probe_log_err(1, MAXACT_TOO_BIG); - goto parse_error; + return -EINVAL; } } @@ -930,16 +928,13 @@ static int __trace_kprobe_create(int argc, const char *argv[]) if (kstrtoul(argv[1], 0, (unsigned long *)&addr)) { trace_probe_log_set_index(1); /* Check whether uprobe event specified */ - if (strchr(argv[1], '/') && strchr(argv[1], ':')) { - ret = -ECANCELED; - goto out; - } + if (strchr(argv[1], '/') && strchr(argv[1], ':')) + return -ECANCELED; + /* a symbol specified */ symbol = kstrdup(argv[1], GFP_KERNEL); - if (!symbol) { - ret = -ENOMEM; - goto error; - } + if (!symbol) + return -ENOMEM; tmp = strchr(symbol, '%'); if (tmp) { @@ -948,7 +943,7 @@ static int __trace_kprobe_create(int argc, const char *argv[]) is_return = true; } else { trace_probe_log_err(tmp - symbol, BAD_ADDR_SUFFIX); - goto parse_error; + return -EINVAL; } } @@ -956,7 +951,7 @@ static int __trace_kprobe_create(int argc, const char *argv[]) ret = traceprobe_split_symbol_offset(symbol, &offset); if (ret || offset < 0 || offset > UINT_MAX) { trace_probe_log_err(0, BAD_PROBE_ADDR); - goto parse_error; + return -EINVAL; } ret = validate_probe_symbol(symbol); if (ret) { @@ -964,17 +959,17 @@ static int __trace_kprobe_create(int argc, const char *argv[]) trace_probe_log_err(0, NON_UNIQ_SYMBOL); else trace_probe_log_err(0, BAD_PROBE_ADDR); - goto parse_error; + return -EINVAL; } if (is_return) - ctx.flags |= TPARG_FL_RETURN; + ctx->flags |= TPARG_FL_RETURN; ret = kprobe_on_func_entry(NULL, symbol, offset); if (ret == 0 && !is_return) - ctx.flags |= TPARG_FL_FENTRY; + ctx->flags |= TPARG_FL_FENTRY; /* Defer the ENOENT case until register kprobe */ if (ret == -EINVAL && is_return) { trace_probe_log_err(0, BAD_RETPROBE); - goto parse_error; + return -EINVAL; } } @@ -983,7 +978,7 @@ static int __trace_kprobe_create(int argc, const char *argv[]) ret = traceprobe_parse_event_name(&event, &group, gbuf, event - argv[0]); if (ret) - goto parse_error; + return ret; } if (!event) { @@ -999,26 +994,24 @@ static int __trace_kprobe_create(int argc, const char *argv[]) } argc -= 2; argv += 2; - ctx.funcname = symbol; + ctx->funcname = symbol; new_argv = traceprobe_expand_meta_args(argc, argv, &new_argc, - abuf, MAX_BTF_ARGS_LEN, &ctx); + abuf, MAX_BTF_ARGS_LEN, ctx); if (IS_ERR(new_argv)) { ret = PTR_ERR(new_argv); new_argv = NULL; - goto out; + return ret; } if (new_argv) { argc = new_argc; argv = new_argv; } - if (argc > MAX_TRACE_ARGS) { - ret = -E2BIG; - goto out; - } + if (argc > MAX_TRACE_ARGS) + return -E2BIG; ret = traceprobe_expand_dentry_args(argc, argv, &dbuf); if (ret) - goto out; + return ret; /* setup a probe */ tk = alloc_trace_kprobe(group, event, addr, symbol, offset, maxactive, @@ -1027,16 +1020,16 @@ static int __trace_kprobe_create(int argc, const char *argv[]) ret = PTR_ERR(tk); /* This must return -ENOMEM, else there is a bug */ WARN_ON_ONCE(ret != -ENOMEM); - goto out; /* We know tk is not allocated */ + return ret; /* We know tk is not allocated */ } /* parse arguments */ for (i = 0; i < argc; i++) { trace_probe_log_set_index(i + 2); - ctx.offset = 0; - ret = traceprobe_parse_probe_arg(&tk->tp, i, argv[i], &ctx); + ctx->offset = 0; + ret = traceprobe_parse_probe_arg(&tk->tp, i, argv[i], ctx); if (ret) - goto out; /* This can be -ENOMEM */ + return ret; /* This can be -ENOMEM */ } /* entry handler for kretprobe */ if (is_return && tk->tp.entry_arg) { @@ -1047,7 +1040,7 @@ static int __trace_kprobe_create(int argc, const char *argv[]) ptype = is_return ? PROBE_PRINT_RETURN : PROBE_PRINT_NORMAL; ret = traceprobe_set_print_fmt(&tk->tp, ptype); if (ret < 0) - goto out; + return ret; ret = register_trace_kprobe(tk); if (ret) { @@ -1061,14 +1054,21 @@ static int __trace_kprobe_create(int argc, const char *argv[]) } else no_free_ptr(tk); -out: + return ret; +} + +static int __trace_kprobe_create(int argc, const char *argv[]) +{ + struct traceprobe_parse_context ctx = { .flags = TPARG_FL_KERNEL }; + int ret; + + trace_probe_log_init("trace_kprobe", argc, argv); + + ret = ___trace_kprobe_create(argc, argv, &ctx); + traceprobe_finish_parse(&ctx); trace_probe_log_clear(); return ret; - -parse_error: - ret = -EINVAL; - goto out; } static int trace_kprobe_create(const char *raw_command)