From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 26 Sep 2024 15:55:36 +0000 (-0700)
Subject: Merge tag 'probes-v6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux... 
X-Git-Tag: v6.12-rc1~45
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=5159938e10d876fd23d3a5474689a9f6e18a446e;p=linux-2.6-block.git

Merge tag 'probes-v6.12' of git://git./linux/kernel/git/trace/linux-trace

Pull probes updates from Masami Hiramatsu:

 - uprobes: make trace_uprobe->nhit counter a per-CPU one

   This makes uprobe event's hit counter per-CPU for improving
   scalability on multi-core environment

 - kprobes: Remove obsoleted declaration for init_test_probes

   Remove unused init_test_probes() from header

 - Raw tracepoint probe supports raw tracepoint events on modules:
     - add a function for iterating over all tracepoints in all modules
     - add a function for iterating over tracepoints in a module
     - support raw tracepoint events on modules
     - support raw tracepoints on future loaded modules
     - add a test for tracepoint events on modules"

* tag 'probes-v6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  sefltests/tracing: Add a test for tracepoint events on modules
  tracing/fprobe: Support raw tracepoints on future loaded modules
  tracing/fprobe: Support raw tracepoint events on modules
  tracepoint: Support iterating tracepoints in a loading module
  tracepoint: Support iterating over tracepoints on modules
  kprobes: Remove obsoleted declaration for init_test_probes
  uprobes: turn trace_uprobe's nhit counter to be per-CPU one
---

5159938e10d876fd23d3a5474689a9f6e18a446e
diff --cc kernel/trace/trace_uprobe.c
index f7443e996b1b,c3df411a2684..c40531d2cbad
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@@ -58,11 -59,11 +59,11 @@@ struct trace_uprobe 
  	struct dyn_event		devent;
  	struct uprobe_consumer		consumer;
  	struct path			path;
 -	struct inode			*inode;
  	char				*filename;
 +	struct uprobe			*uprobe;
  	unsigned long			offset;
  	unsigned long			ref_ctr_offset;
- 	unsigned long			nhit;
+ 	unsigned long __percpu		*nhits;
  	struct trace_probe		tp;
  };