[PATCH perf/core] uprobes: fix WARN() inside hprobe_consume()
From: Andrii Nakryiko <andrii@kernel.org>
Date: 2024-10-30 16:02:18
Also in:
bpf, lkml
Subsystem:
performance events subsystem, the rest, uprobes · Maintainers:
Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo, Namhyung Kim, Linus Torvalds, Masami Hiramatsu, Oleg Nesterov
Use proper `*hstate` to print unexpected hprobe state. And drop unused local `state` variable. Reported-by: kernel test robot <redacted> Reported-by: Dan Carpenter <redacted> Closes: https://lore.kernel.org/r/202410302020.1jHBLfss-lkp@intel.com/ (local) Fixes: 72a27524a493 ("uprobes: SRCU-protect uretprobe lifetime (with timeout)") Signed-off-by: Andrii Nakryiko <andrii@kernel.org> --- kernel/events/uprobes.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index 998a9726b80f..f2beb4b3f5c5 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c@@ -704,8 +704,6 @@ static void hprobe_init_stable(struct hprobe *hprobe, struct uprobe *uprobe) */ static inline struct uprobe *hprobe_consume(struct hprobe *hprobe, enum hprobe_state *hstate) { - enum hprobe_state state; - *hstate = xchg(&hprobe->state, HPROBE_CONSUMED); switch (*hstate) { case HPROBE_LEASED:
@@ -715,7 +713,7 @@ static inline struct uprobe *hprobe_consume(struct hprobe *hprobe, enum hprobe_s case HPROBE_CONSUMED: /* uprobe was finalized already, do nothing */ return NULL; default: - WARN(1, "hprobe invalid state %d", state); + WARN(1, "hprobe invalid state %d", *hstate); return NULL; } }
--
2.43.5