Commit da09a9e0 authored by Jiri Olsa's avatar Jiri Olsa Committed by Peter Zijlstra
Browse files

uprobe: Add data pointer to consumer handlers 



Adding data pointer to both entry and exit consumer handlers and all
its users. The functionality itself is coming in following change.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarOleg Nesterov <oleg@redhat.com>
Acked-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/r/20241018202252.693462-2-jolsa@kernel.org
parent de20037e

include/linux/uprobes.h

+2 −2
Original line number Diff line number Diff line
@@ -37,10 +37,10 @@ struct uprobe_consumer { 
	 * for the current process. If filter() is omitted or returns true,

	 * UPROBE_HANDLER_REMOVE is effectively ignored.

	 */

	int (*handler)(struct uprobe_consumer *self, struct pt_regs *regs);

	int (*handler)(struct uprobe_consumer *self, struct pt_regs *regs, __u64 *data);

	int (*ret_handler)(struct uprobe_consumer *self,

				unsigned long func,

				struct pt_regs *regs);

				struct pt_regs *regs, __u64 *data);

	bool (*filter)(struct uprobe_consumer *self, struct mm_struct *mm);



	struct list_head cons_node;

kernel/events/uprobes.c

+2 −2
Original line number Diff line number Diff line
@@ -2090,7 +2090,7 @@ static void handler_chain(struct uprobe *uprobe, struct pt_regs *regs) 
		int rc = 0;



		if (uc->handler) {

			rc = uc->handler(uc, regs);

			rc = uc->handler(uc, regs, NULL);

			WARN(rc & ~UPROBE_HANDLER_MASK,

				"bad rc=0x%x from %ps()\n", rc, uc->handler);

		}
@@ -2128,7 +2128,7 @@ handle_uretprobe_chain(struct return_instance *ri, struct pt_regs *regs) 
	rcu_read_lock_trace();

	list_for_each_entry_rcu(uc, &uprobe->consumers, cons_node, rcu_read_lock_trace_held()) {

		if (uc->ret_handler)

			uc->ret_handler(uc, ri->func, regs);

			uc->ret_handler(uc, ri->func, regs, NULL);

	}

	rcu_read_unlock_trace();

}

kernel/trace/bpf_trace.c

+4 −2
Original line number Diff line number Diff line
@@ -3244,7 +3244,8 @@ uprobe_multi_link_filter(struct uprobe_consumer *con, struct mm_struct *mm) 
}



static int

uprobe_multi_link_handler(struct uprobe_consumer *con, struct pt_regs *regs)

uprobe_multi_link_handler(struct uprobe_consumer *con, struct pt_regs *regs,

			  __u64 *data)

{

	struct bpf_uprobe *uprobe;
@@ -3253,7 +3254,8 @@ uprobe_multi_link_handler(struct uprobe_consumer *con, struct pt_regs *regs) 
}



static int

uprobe_multi_link_ret_handler(struct uprobe_consumer *con, unsigned long func, struct pt_regs *regs)

uprobe_multi_link_ret_handler(struct uprobe_consumer *con, unsigned long func, struct pt_regs *regs,

			      __u64 *data)

{

	struct bpf_uprobe *uprobe;

kernel/trace/trace_uprobe.c

+8 −4
Original line number Diff line number Diff line
@@ -89,9 +89,11 @@ static struct trace_uprobe *to_trace_uprobe(struct dyn_event *ev) 
static int register_uprobe_event(struct trace_uprobe *tu);

static int unregister_uprobe_event(struct trace_uprobe *tu);



static int uprobe_dispatcher(struct uprobe_consumer *con, struct pt_regs *regs);

static int uprobe_dispatcher(struct uprobe_consumer *con, struct pt_regs *regs,

			     __u64 *data);

static int uretprobe_dispatcher(struct uprobe_consumer *con,

				unsigned long func, struct pt_regs *regs);

				unsigned long func, struct pt_regs *regs,

				__u64 *data);



#ifdef CONFIG_STACK_GROWSUP

static unsigned long adjust_stack_addr(unsigned long addr, unsigned int n)
@@ -1517,7 +1519,8 @@ trace_uprobe_register(struct trace_event_call *event, enum trace_reg type, 
	}

}



static int uprobe_dispatcher(struct uprobe_consumer *con, struct pt_regs *regs)

static int uprobe_dispatcher(struct uprobe_consumer *con, struct pt_regs *regs,

			     __u64 *data)

{

	struct trace_uprobe *tu;

	struct uprobe_dispatch_data udd;
@@ -1548,7 +1551,8 @@ static int uprobe_dispatcher(struct uprobe_consumer *con, struct pt_regs *regs) 
}



static int uretprobe_dispatcher(struct uprobe_consumer *con,

				unsigned long func, struct pt_regs *regs)

				unsigned long func, struct pt_regs *regs,

				__u64 *data)

{

	struct trace_uprobe *tu;

	struct uprobe_dispatch_data udd;

tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ static struct bin_attribute bin_attr_bpf_testmod_file __ro_after_init = { 


static int

uprobe_ret_handler(struct uprobe_consumer *self, unsigned long func,

		   struct pt_regs *regs)

		   struct pt_regs *regs, __u64 *data)



{

	regs->ax  = 0x12345678deadbeef;