Commit 3ca112b7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'probes-fixes-v6.7-rc1' of... 

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

Pull probes fixes from Masami Hiramatsu:

 - Documentation update: Add a note about argument and return value
   fetching is the best effort because it depends on the type.

 - objpool: Fix to make internal global variables static in
   test_objpool.c.

 - kprobes: Unify kprobes_exceptions_nofify() prototypes. There are the
   same prototypes in asm/kprobes.h for some architectures, but some of
   them are missing the prototype and it causes a warning. So move the
   prototype into linux/kprobes.h.

 - tracing: Fix to check the tracepoint event and return event at
   parsing stage. The tracepoint event doesn't support %return but if
   $retval exists, it will be converted to %return silently. This finds
   that case and rejects it.

 - tracing: Fix the order of the descriptions about the parameters of
   __kprobe_event_gen_cmd_start() to be consistent with the argument
   list of the function.

* tag 'probes-fixes-v6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  tracing/kprobes: Fix the order of argument descriptions
  tracing: fprobe-event: Fix to check tracepoint event and return
  kprobes: unify kprobes_exceptions_nofify() prototypes
  lib: test_objpool: make global variables static
  Documentation: tracing: Add a note about argument and retval access
parents 18553507 f032c53b

Documentation/trace/fprobetrace.rst

+6 −2
Original line number Diff line number Diff line
@@ -59,8 +59,12 @@ Synopsis of fprobe-events 
                  and bitfield are supported.



  (\*1) This is available only when BTF is enabled.

  (\*2) only for the probe on function entry (offs == 0).

  (\*3) only for return probe.

  (\*2) 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

        the stack. But this only support the arguments via registers.

  (\*3) only for return probe. Note that this is also best effort. Depending on the

        return value type, it might be passed via a pair of registers. But this only

        accesses one register.

  (\*4) this is useful for fetching a field of data structures.

  (\*5) "u" means user-space dereference.

Documentation/trace/kprobetrace.rst

+6 −2
Original line number Diff line number Diff line
@@ -61,8 +61,12 @@ Synopsis of kprobe_events 
		  (x8/x16/x32/x64), "char", "string", "ustring", "symbol", "symstr"

                  and bitfield are supported.



  (\*1) only for the probe on function entry (offs == 0).

  (\*2) only for return probe.

  (\*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

        the stack. But this only support the arguments via registers.

  (\*2) only for return probe. Note that this is also best effort. Depending on the

        return value type, it might be passed via a pair of registers. But this only

        accesses one register.

  (\*3) this is useful for fetching a field of data structures.

  (\*4) "u" means user-space dereference. See :ref:`user_mem_access`.

arch/arc/include/asm/kprobes.h

+0 −3
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ struct kprobe; 


void arch_remove_kprobe(struct kprobe *p);



int kprobe_exceptions_notify(struct notifier_block *self,

			     unsigned long val, void *data);



struct prev_kprobe {

	struct kprobe *kp;

	unsigned long status;

arch/arm/include/asm/kprobes.h

+0 −2
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ struct kprobe_ctlblk { 


void arch_remove_kprobe(struct kprobe *);

int kprobe_fault_handler(struct pt_regs *regs, unsigned int fsr);

int kprobe_exceptions_notify(struct notifier_block *self,

			     unsigned long val, void *data);



/* optinsn template addresses */

extern __visible kprobe_opcode_t optprobe_template_entry[];

arch/arm64/include/asm/kprobes.h

+0 −2
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ struct kprobe_ctlblk { 


void arch_remove_kprobe(struct kprobe *);

int kprobe_fault_handler(struct pt_regs *regs, unsigned int fsr);

int kprobe_exceptions_notify(struct notifier_block *self,

			     unsigned long val, void *data);

void __kretprobe_trampoline(void);

void __kprobes *trampoline_probe_handler(struct pt_regs *regs);