[GIT PULL] probes: Fixes for v6.18-rc4

[Google]

Hi Linus,

Probes fixes for v6.18-rc4

- tprobe-events: Fix to register tracepoint correctly
  tprobe-events missed to set tracepoint data structure before
  registering callback when enabling it. This sets it correctly.
- tprobe-events: Fix to put tracepoint_user when disable the event.
  tprobe-events missed to unregister tracepoint callback when the
  event is disabled. This ensures to unregister it.


Please pull the latest probes-fixes-v6.18-rc4 tree, which can be found at:


  git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
probes-fixes-v6.18-rc4

Tag SHA1: f0e218db626a4af0f5a6e8ee7fefabb7deeb5370
Head SHA1: c91afa7610235f89a5e8f5686aac23892ab227ed


Masami Hiramatsu (Google) (2):
      tracing: tprobe-events: Fix to register tracepoint correctly
      tracing: tprobe-events: Fix to put tracepoint_user when disable the tprobe

----
 kernel/trace/trace_fprobe.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
---------------------------
diff --git a/kernel/trace/trace_fprobe.c b/kernel/trace/trace_fprobe.c
index ad9d6347b5fa..8001dbf16891 100644
--- a/kernel/trace/trace_fprobe.c
+++ b/kernel/trace/trace_fprobe.c
@@ -106,13 +106,14 @@ static struct tracepoint_user *__tracepoint_user_init(const char *name, struct t
 	if (!tuser->name)
 		return NULL;
 
+	/* Register tracepoint if it is loaded. */
 	if (tpoint) {
+		tuser->tpoint = tpoint;
 		ret = tracepoint_user_register(tuser);
 		if (ret)
 			return ERR_PTR(ret);
 	}
 
-	tuser->tpoint = tpoint;
 	tuser->refcount = 1;
 	INIT_LIST_HEAD(&tuser->list);
 	list_add(&tuser->list, &tracepoint_user_list);
@@ -1513,6 +1514,10 @@ static int disable_trace_fprobe(struct trace_event_call *call,
 	if (!trace_probe_is_enabled(tp)) {
 		list_for_each_entry(tf, trace_probe_probe_list(tp), tp.list) {
 			unregister_fprobe(&tf->fp);
+			if (tf->tuser) {
+				tracepoint_user_put(tf->tuser);
+				tf->tuser = NULL;
+			}
 		}
 	}
 
-- 
Masami Hiramatsu (Google) <mhiramat@xxxxxxxxxx>