Commit 01888b35 authored Oct 31, 2023 by Yujie Liu Committed by sanglipeng Apr 03, 2024

tracing/kprobes: Fix the order of argument descriptions

stable inclusion
from stable-v5.10.201
commit 3b092dfdabf21c4d580a2077d2a666d6e1e3fbd2
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9DFT4

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=3b092dfdabf21c4d580a2077d2a666d6e1e3fbd2

--------------------------------

[ Upstream commit f032c53bea6d2057c14553832d846be2f151cfb2 ]

The order of descriptions should be consistent with the argument list of
the function, so "kretprobe" should be the second one.

int __kprobe_event_gen_cmd_start(struct dynevent_cmd *cmd, bool kretprobe,
                                 const char *name, const char *loc, ...)

Link: https://lore.kernel.org/all/20231031041305.3363712-1-yujie.liu@intel.com/



Fixes: 2a588dd1 ("tracing: Add kprobe event command generation functions")
Suggested-by: Mukesh Ojha <quic_mojha@quicinc.com>
Signed-off-by: Yujie Liu <yujie.liu@intel.com>
Reviewed-by: Mukesh Ojha <quic_mojha@quicinc.com>
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: sanglipeng <sanglipeng1@jd.com>

parent c8c4b3f2

kernel/trace/trace_kprobe.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -949,9 +949,9 @@ EXPORT_SYMBOL_GPL(kprobe_event_cmd_init);
		/**
		* __kprobe_event_gen_cmd_start - Generate a kprobe event command from arg list
		* @cmd: A pointer to the dynevent_cmd struct representing the new event
		* @kretprobe: Is this a return probe?
		* @name: The name of the kprobe event
		* @loc: The location of the kprobe event
		* @kretprobe: Is this a return probe?
		* @...: Variable number of arg (pairs), one pair for each field
		*
		* NOTE: Users normally won't want to call this function directly, but