Commit 70a66320 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'probes-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace 

Pull probes updates from Masami Hiramatsu:

 - tracing/probes: Add new pseudo-types %pd and %pD support for dumping
   dentry name from 'struct dentry *' and file name from 'struct file *'

 - uprobes performance optimizations:
    - Speed up the BPF uprobe event by delaying the fetching of the
      uprobe event arguments that are not used in BPF
    - Avoid locking by speculatively checking whether uprobe event is
      valid
    - Reduce lock contention by using read/write_lock instead of
      spinlock for uprobe list operation. This improved BPF uprobe
      benchmark result 43% on average

 - rethook: Remove non-fatal warning messages when tracing stack from
   BPF and skip rcu_is_watching() validation in rethook if possible

 - objpool: Optimize objpool (which is used by kretprobes and fprobe as
   rethook backend storage) by inlining functions and avoid caching
   nr_cpu_ids because it is a const value

 - fprobe: Add entry/exit callbacks types (code cleanup)

 - kprobes: Check ftrace was killed in kprobes if it uses ftrace

* tag 'probes-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  kprobe/ftrace: bail out if ftrace was killed
  selftests/ftrace: Fix required features for VFS type test case
  objpool: cache nr_possible_cpus() and avoid caching nr_cpu_ids
  objpool: enable inlining objpool_push() and objpool_pop() operations
  rethook: honor CONFIG_FTRACE_VALIDATE_RCU_IS_WATCHING in rethook_try_get()
  ftrace: make extra rcu_is_watching() validation check optional
  uprobes: reduce contention on uprobes_tree access
  rethook: Remove warning messages printed for finding return address of a frame.
  fprobe: Add entry/exit callbacks types
  selftests/ftrace: add fprobe test cases for VFS type "%pd" and "%pD"
  selftests/ftrace: add kprobe test cases for VFS type "%pd" and "%pD"
  Documentation: tracing: add new type '%pd' and '%pD' for kprobe
  tracing/probes: support '%pD' type for print struct file's name
  tracing/probes: support '%pd' type for print struct dentry's name
  uprobes: add speculative lockless system-wide uprobe filter check
  uprobes: prepare uprobe args buffer lazily
  uprobes: encapsulate preparation of uprobe args buffer
parents e9d68251 1a7d0890

Documentation/trace/kprobetrace.rst

+6 −2
Original line number Diff line number Diff line
@@ -58,8 +58,9 @@ Synopsis of kprobe_events 
  NAME=FETCHARG : Set NAME as the argument name of FETCHARG.

  FETCHARG:TYPE : Set TYPE as the type of FETCHARG. Currently, basic types

		  (u8/u16/u32/u64/s8/s16/s32/s64), hexadecimal types

		  (x8/x16/x32/x64), "char", "string", "ustring", "symbol", "symstr"

                  and bitfield are supported.

		  (x8/x16/x32/x64), VFS layer common type(%pd/%pD), "char",

                  "string", "ustring", "symbol", "symstr" and bitfield are

                  supported.



  (\*1) only for the probe on function entry (offs == 0). Note, this argument access

        is best effort, because depending on the argument type, it may be passed on
@@ -122,6 +123,9 @@ With 'symstr' type, you can filter the event with wildcard pattern of the 
symbols, and you don't need to solve symbol name by yourself.

For $comm, the default type is "string"; any other type is invalid.



VFS layer common type(%pd/%pD) is a special type, which fetches dentry's or

file's name from struct dentry's address or struct file's address.



.. _user_mem_access:



User Memory Access

arch/csky/kernel/probes/ftrace.c

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip, 
	struct kprobe_ctlblk *kcb;

	struct pt_regs *regs;



	if (unlikely(kprobe_ftrace_disabled))

		return;



	bit = ftrace_test_recursion_trylock(ip, parent_ip);

	if (bit < 0)

		return;

arch/loongarch/kernel/ftrace_dyn.c

+3 −0
Original line number Diff line number Diff line
@@ -287,6 +287,9 @@ void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip, 
	struct kprobe *p;

	struct kprobe_ctlblk *kcb;



	if (unlikely(kprobe_ftrace_disabled))

		return;



	bit = ftrace_test_recursion_trylock(ip, parent_ip);

	if (bit < 0)

		return;

arch/parisc/kernel/ftrace.c

+3 −0
Original line number Diff line number Diff line
@@ -206,6 +206,9 @@ void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip, 
	struct kprobe *p;

	int bit;



	if (unlikely(kprobe_ftrace_disabled))

		return;



	bit = ftrace_test_recursion_trylock(ip, parent_ip);

	if (bit < 0)

		return;

arch/powerpc/kernel/kprobes-ftrace.c

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ void kprobe_ftrace_handler(unsigned long nip, unsigned long parent_nip, 
	struct pt_regs *regs;

	int bit;



	if (unlikely(kprobe_ftrace_disabled))

		return;



	bit = ftrace_test_recursion_trylock(nip, parent_nip);

	if (bit < 0)

		return;