ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

tracing/probes: Avoid setting TPARG_FL_FENTRY and TPARG_FL_RETURN

Browse Source 
When parsing a kprobe event, the return probe always sets both
TPARG_FL_RETURN and TPARG_FL_FENTRY, but this is not useful because
some fetchargs are only for return probe and some others only for
function entry. Make it obviously mutual exclusive.

Link: https://lore.kernel.org/all/168507468731.913472.11354553441385410734.stgit@mhiramat.roam.corp.google.com/

Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
This commit is contained in:
Masami Hiramatsu (Google)
2023-06-06 21:39:55 +09:00
parent cb16330d12
commit 30460c21ed
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/trace/trace_kprobe.c
View File

@@ -825,7 +825,7 @@ static int __trace_kprobe_create(int argc, const char *argv[])
if (is_return) if (is_return)
flags |= TPARG_FL_RETURN; flags |= TPARG_FL_RETURN;
ret = kprobe_on_func_entry(NULL, symbol, offset); ret = kprobe_on_func_entry(NULL, symbol, offset);
if (ret == 0) if (ret == 0 && !is_return)
flags |= TPARG_FL_FENTRY; flags |= TPARG_FL_FENTRY;
/* Defer the ENOENT case until register kprobe */ /* Defer the ENOENT case until register kprobe */
if (ret == -EINVAL && is_return) { if (ret == -EINVAL && is_return) {

5
kernel/trace/trace_probe.h
View File

@@ -357,6 +357,11 @@ int trace_probe_print_args(struct trace_seq *s, struct probe_arg *args, int nr_a
#define trace_probe_for_each_link_rcu(pos, tp) \ #define trace_probe_for_each_link_rcu(pos, tp) \
list_for_each_entry_rcu(pos, &(tp)->event->files, list) list_for_each_entry_rcu(pos, &(tp)->event->files, list)
/*
* The flags used for parsing trace_probe arguments.
* TPARG_FL_RETURN, TPARG_FL_FENTRY and TPARG_FL_TPOINT are mutually exclusive.
* TPARG_FL_KERNEL and TPARG_FL_USER are also mutually exclusive.
*/
#define TPARG_FL_RETURN BIT(0) #define TPARG_FL_RETURN BIT(0)
#define TPARG_FL_KERNEL BIT(1) #define TPARG_FL_KERNEL BIT(1)
#define TPARG_FL_FENTRY BIT(2) #define TPARG_FL_FENTRY BIT(2)