bpf: Support bpf_get_func_ip helper in uprobes
Subsystems (7)
Jiri Olsa
reviewerv3 cover bpf: Support bpf_get_func_ip helper in uprobes
hi,
adding support for bpf_get_func_ip helper for uprobe program to return probed address for both uprobe and return uprobe as suggested by Andrii in [1].
We agreed that uprobe can have special use of bpf_get_func_ip helper that differs from kprobe.
The kprobe bpf_get_func_ip returns:
- address of the function if probe is attach on function entry for both kprobe and return kprobe
- 0 if the probe is not attach on function entry
The uprobe bpf_get_func_ip returns:
- address of the probe for both uprobe and return uprobe
The reason for this semantic change is that kernel can't really tell if the probe user space address is function entry.
v3 changes:
- removed bpf_get_func_ip_uprobe helper function [Yonghong]
Also available at:
https://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git
uprobe_get_func_ip
thanks,
jirka
[1] https://lore.kernel.org/bpf/CAEf4BzZ=xLVkG5eurEuvLU79wAMtwho7ReR+XJAgwhFF4M-7Cg@mail.gmail.com/
---
Jiri Olsa (3):
bpf: Add support for bpf_get_func_ip helper for uprobe program
selftests/bpf: Add bpf_get_func_ip tests for uprobe on function entry selftests/bpf: Add bpf_get_func_ip test for uprobe inside function
include/linux/bpf.h | 9 +++++++-- include/uapi/linux/bpf.h | 7 ++++++- kernel/trace/bpf_trace.c | 11 ++++++++++- kernel/trace/trace_probe.h | 5 +++++ kernel/trace/trace_uprobe.c | 7 +------ tools/include/uapi/linux/bpf.h | 7 ++++++- tools/testing/selftests/bpf/prog_tests/get_func_ip_test.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- tools/testing/selftests/bpf/progs/get_func_ip_test.c | 25 +++++++++++++++++++++++-- tools/testing/selftests/bpf/progs/get_func_ip_uprobe_test.c | 18 ++++++++++++++++++ 9 files changed, 129 insertions(+), 17 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/get_func_ip_uprobe_test.c
Jiri Olsa
reviewerPATCH v3 1/3 bpf: Add support for bpf_get_func_ip helper for uprobe program
Adding support for bpf_get_func_ip helper for uprobe program to return probed address for both uprobe and return uprobe.
We discussed this in [1] and agreed that uprobe can have special use of bpf_get_func_ip helper that differs from kprobe.
The kprobe bpf_get_func_ip returns:
- address of the function if probe is attach on function entry for both kprobe and return kprobe
- 0 if the probe is not attach on function entry
The uprobe bpf_get_func_ip returns:
- address of the probe for both uprobe and return uprobe
The reason for this semantic change is that kernel can't really tell if the probe user space address is function entry.
The uprobe program is actually kprobe type program attached as uprobe. One of the consequences of this design is that uprobes do not have its own set of helpers, but share them with kprobes.
As we need different functionality for bpf_get_func_ip helper for uprobe, I'm adding the bool value to the bpf_trace_run_ctx, so the helper can detect that it's executed in uprobe context and call specific code.
The is_uprobe bool is set as true in bpf_prog_run_array_sleepable, which is currently used only for executing bpf programs in uprobe.
Renaming bpf_prog_run_array_sleepable to bpf_prog_run_array_uprobe to address that it's only used for uprobes and that it sets the run_ctx.is_uprobe as suggested by Yafang Shao.
[1] https://lore.kernel.org/bpf/CAEf4BzZ=xLVkG5eurEuvLU79wAMtwho7ReR+XJAgwhFF4M-7Cg@mail.gmail.com/
--- include/linux/bpf.h | 9 +++++++-- include/uapi/linux/bpf.h | 7 ++++++- kernel/trace/bpf_trace.c | 11 ++++++++++- kernel/trace/trace_probe.h | 5 +++++ kernel/trace/trace_uprobe.c | 7 +------ tools/include/uapi/linux/bpf.h | 7 ++++++- 6 files changed, 35 insertions(+), 11 deletions(-)
include/linux/bpf.h +7 -2
@@ -1819,6 +1819,7 @@ struct bpf_cg_run_ctx {struct bpf_trace_run_ctx {struct bpf_run_ctx run_ctx;u64 bpf_cookie; +bool is_uprobe; };struct bpf_tramp_run_ctx {
@@ -1867,6 +1868,8 @@ bpf_prog_run_array(const struct bpf_prog_array *array,if (unlikely (!array))return ret; + run_ctx.is_uprobe = false; +migrate_disable (); old_run_ctx =bpf_set_run_ctx (&run_ctx.run_ctx); item = &array->items[0 ];
@@ -1891,8 +1894,8 @@ bpf_prog_run_array(const struct bpf_prog_array *array,* rcu-protected dynamically sized maps. */ static __always_inline u32 -bpf_prog_run_array_sleepable (const struct bpf_prog_array __rcu *array_rcu, -const void *ctx,bpf_prog_run_fn run_prog) +bpf_prog_run_array_uprobe (const struct bpf_prog_array __rcu *array_rcu, +const void *ctx,bpf_prog_run_fn run_prog) {const struct bpf_prog_array_item *item;const struct bpf_prog *prog;
@@ -1906,6 +1909,8 @@ bpf_prog_run_array_sleepable(const struct bpf_prog_array __rcu *array_rcu,rcu_read_lock_trace ();migrate_disable (); + run_ctx.is_uprobe = true; + array =rcu_dereference_check (array_rcu,rcu_read_lock_trace_held ());if (unlikely (!array)) goto out;
include/uapi/linux/bpf.h +6 -1
@@ -5086,9 +5086,14 @@ union bpf_attr {* u64 bpf_get_func_ip(void *ctx) * Description * Get address of the traced function (for tracing and kprobe programs). +* +* When called for kprobe program attached as uprobe it returns +* probe address for both entry and return uprobe. +* * Return -* Address of the traced function. +* Address of the traced function for kprobe. * 0 for kprobes placed within the function (not at the entry). +* Address of the probe for uprobe and return uprobe. * * u64 bpf_get_attach_cookie(void *ctx) * Description
kernel/trace/bpf_trace.c +10 -1
@@ -1055,7 +1055,16 @@ static unsigned long get_entry_ip(unsigned long fentry_ip) BPF_CALL_1(bpf_get_func_ip_kprobe, struct pt_regs *, regs) { -struct kprobe *kp =kprobe_running (); +struct bpf_trace_run_ctx *run_ctx__maybe_unused ; +struct kprobe *kp; + +#ifdef CONFIG_UPROBES + run_ctx = container_of(current->bpf_ctx, struct bpf_trace_run_ctx, run_ctx); +if (run_ctx->is_uprobe) +return ((struct uprobe_dispatch_data *)current->utask->vaddr)->bp_addr; +#endif + + kp =kprobe_running ();if (!kp || !(kp->flags &KPROBE_FLAG_ON_FUNC_ENTRY ))return 0 ;
kernel/trace/trace_probe.h +5 -0
@@ -519,3 +519,8 @@ void __trace_probe_log_err(int offset, int err);#define trace_probe_log_err (offs, err) \ __trace_probe_log_err(offs, TP_ERR_##err) + +struct uprobe_dispatch_data { +struct trace_uprobe *tu; +unsigned long bp_addr; +};
kernel/trace/trace_uprobe.c +1 -6
@@ -88,11 +88,6 @@ 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); -struct uprobe_dispatch_data { -struct trace_uprobe *tu; -unsigned long bp_addr; -}; -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);
@@ -1352,7 +1347,7 @@ static void __uprobe_perf_func(struct trace_uprobe *tu,if (bpf_prog_array_valid (call)) {u32 ret; - ret =bpf_prog_run_array_sleepable (call->prog_array, regs, bpf_prog_run); + ret =bpf_prog_run_array_uprobe (call->prog_array, regs, bpf_prog_run);if (!ret)return ; }
tools/include/uapi/linux/bpf.h +6 -1
@@ -5086,9 +5086,14 @@ union bpf_attr {* u64 bpf_get_func_ip(void *ctx) * Description * Get address of the traced function (for tracing and kprobe programs). +* +* When called for kprobe program attached as uprobe it returns +* probe address for both entry and return uprobe. +* * Return -* Address of the traced function. +* Address of the traced function for kprobe. * 0 for kprobes placed within the function (not at the entry). +* Address of the probe for uprobe and return uprobe. * * u64 bpf_get_attach_cookie(void *ctx) * Description
Signature · 1 line
2.41.0
Re: [PATCHv3 bpf-next 1/3] bpf: Add support for bpf_get_func_ip helper for uprobe program
Quoted 2 lines · Jiri Olsa
Adding support for
bpf_get_func_iphelper for uprobe program to return probed address for both uprobe and return uprobe.
Works nicely with bpftrace (after small tweaks to the tool).
# cat test.c
#include <unistd.h>
int fun2() { return 42; }
int fun1() { return fun2(); }
int main() { fun1(); usleep(1000000); } # cat uprobe.bt
uprobe:./test:fun* { printf("-> %s\n", func) }
uretprobe:./test:fun* { printf("<- %s\n", func) }Before ('func' was obtained from IP):
# bpftrace uprobe.bt -c ./test
-> fun1
-> fun2
<- fun1
<- mainAfter ('func' is obtained from the bpf_get_func_ip helper):
# bpftrace uprobe.bt -c ./test
-> fun1
-> fun2
<- fun2
<- fun1Quoted 183 lines
We discussed this in [1] and agreed that uprobe can have special use of
bpf_get_func_iphelper that differs from kprobe.The kprobe
bpf_get_func_ipreturns:
- address of the function if probe is attach on function entry for both kprobe and return kprobe
- 0 if the probe is not attach on function entryThe uprobe
bpf_get_func_ipreturns:
- address of the probe for both uprobe and return uprobeThe reason for this semantic change is that kernel can't really tell if the probe user space address is function entry.
The uprobe program is actually kprobe type program attached as uprobe. One of the consequences of this design is that uprobes do not have its own set of helpers, but share them with kprobes.
As we need different functionality for
bpf_get_func_iphelper for uprobe, I'm adding the bool value to thebpf_trace_run_ctx, so the helper can detect that it's executed in uprobe context and call specific code.The
is_uprobebool is set as true inbpf_prog_run_array_sleepable, which is currently used only for executing bpf programs in uprobe.Renaming
bpf_prog_run_array_sleepabletobpf_prog_run_array_uprobeto address that it's only used for uprobes and that it sets the run_ctx.is_uprobe as suggested by Yafang Shao.Suggested-by Andrii Nakryiko <[email protected]>Tested-by Alan Maguire <[email protected]>[1] https://lore.kernel.org/bpf/CAEf4BzZ=xLVkG5eurEuvLU79wAMtwho7ReR+XJAgwhFF4M-7Cg@mail.gmail.com/
Signed-off-by Jiri Olsa <[email protected]>--- include/linux/bpf.h | 9 +++++++-- include/uapi/linux/bpf.h | 7 ++++++- kernel/trace/bpf_trace.c | 11 ++++++++++- kernel/trace/trace_probe.h | 5 +++++ kernel/trace/trace_uprobe.c | 7 +------ tools/include/uapi/linux/bpf.h | 7 ++++++- 6 files changed, 35 insertions(+), 11 deletions(-)include/linux/bpf.h +7
-2@@ -1819,6 +1819,7 @@ struct bpf_cg_run_ctx {struct bpf_trace_run_ctx {struct bpf_run_ctx run_ctx;u64 bpf_cookie; +bool is_uprobe; };struct bpf_tramp_run_ctx {@@ -1867,6 +1868,8 @@ bpf_prog_run_array(const struct bpf_prog_array *array,if (unlikely (!array))return ret; + run_ctx.is_uprobe = false; +migrate_disable (); old_run_ctx =bpf_set_run_ctx (&run_ctx.run_ctx); item = &array->items[0 ];@@ -1891,8 +1894,8 @@ bpf_prog_run_array(const struct bpf_prog_array *array,* rcu-protected dynamically sized maps. */ static __always_inline u32 -bpf_prog_run_array_sleepable (const struct bpf_prog_array __rcu *array_rcu, -const void *ctx,bpf_prog_run_fn run_prog) +bpf_prog_run_array_uprobe (const struct bpf_prog_array __rcu *array_rcu, +const void *ctx,bpf_prog_run_fn run_prog) {const struct bpf_prog_array_item *item;const struct bpf_prog *prog;@@ -1906,6 +1909,8 @@ bpf_prog_run_array_sleepable(const struct bpf_prog_array __rcu *array_rcu,rcu_read_lock_trace ();migrate_disable (); + run_ctx.is_uprobe = true; + array =rcu_dereference_check (array_rcu,rcu_read_lock_trace_held ());if (unlikely (!array)) goto out;include/uapi/linux/bpf.h +6
-1@@ -5086,9 +5086,14 @@ union bpf_attr {* u64 bpf_get_func_ip(void *ctx) * Description * Get address of the traced function (for tracing and kprobe programs). +* +* When called for kprobe program attached as uprobe it returns +* probe address for both entry and return uprobe. +* * Return -* Address of the traced function. +* Address of the traced function for kprobe. * 0 for kprobes placed within the function (not at the entry). +* Address of the probe for uprobe and return uprobe. * * u64 bpf_get_attach_cookie(void *ctx) * Description kernel/trace/bpf_trace.c +10
-1@@ -1055,7 +1055,16 @@ static unsigned long get_entry_ip(unsigned long fentry_ip) BPF_CALL_1(bpf_get_func_ip_kprobe, struct pt_regs *, regs) { -struct kprobe *kp =kprobe_running (); +struct bpf_trace_run_ctx *run_ctx__maybe_unused ; +struct kprobe *kp; + +#ifdef CONFIG_UPROBES + run_ctx = container_of(current->bpf_ctx, struct bpf_trace_run_ctx, run_ctx); +if (run_ctx->is_uprobe) +return ((struct uprobe_dispatch_data *)current->utask->vaddr)->bp_addr; +#endif + + kp =kprobe_running ();if (!kp || !(kp->flags &KPROBE_FLAG_ON_FUNC_ENTRY ))return 0 ;kernel/trace/trace_probe.h +5
-0@@ -519,3 +519,8 @@ void __trace_probe_log_err(int offset, int err);#define trace_probe_log_err (offs, err) \ __trace_probe_log_err(offs, TP_ERR_##err) + +struct uprobe_dispatch_data { +struct trace_uprobe *tu; +unsigned long bp_addr; +};kernel/trace/trace_uprobe.c +1
-6@@ -88,11 +88,6 @@ 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); -struct uprobe_dispatch_data { -struct trace_uprobe *tu; -unsigned long bp_addr; -}; -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);@@ -1352,7 +1347,7 @@ static void __uprobe_perf_func(struct trace_uprobe *tu,if (bpf_prog_array_valid (call)) {u32 ret; - ret =bpf_prog_run_array_sleepable (call->prog_array, regs, bpf_prog_run); + ret =bpf_prog_run_array_uprobe (call->prog_array, regs, bpf_prog_run);if (!ret)return ; }tools/include/uapi/linux/bpf.h +6
-1@@ -5086,9 +5086,14 @@ union bpf_attr {* u64 bpf_get_func_ip(void *ctx) * Description * Get address of the traced function (for tracing and kprobe programs). +* +* When called for kprobe program attached as uprobe it returns +* probe address for both entry and return uprobe. +* * Return -* Address of the traced function. +* Address of the traced function for kprobe. * 0 for kprobes placed within the function (not at the entry). +* Address of the probe for uprobe and return uprobe. * * u64 bpf_get_attach_cookie(void *ctx) * Description
Re: [PATCHv3 bpf-next 1/3] bpf: Add support for bpf_get_func_ip helper for uprobe program
In reply to Jiri OlsaQuoted 28 lines · Jiri Olsa
Adding support for
bpf_get_func_iphelper for uprobe program to return probed address for both uprobe and return uprobe.We discussed this in [1] and agreed that uprobe can have special use of
bpf_get_func_iphelper that differs from kprobe.The kprobe
bpf_get_func_ipreturns:
- address of the function if probe is attach on function entry for both kprobe and return kprobe
- 0 if the probe is not attach on function entryThe uprobe
bpf_get_func_ipreturns:
- address of the probe for both uprobe and return uprobeThe reason for this semantic change is that kernel can't really tell if the probe user space address is function entry.
The uprobe program is actually kprobe type program attached as uprobe. One of the consequences of this design is that uprobes do not have its own set of helpers, but share them with kprobes.
As we need different functionality for
bpf_get_func_iphelper for uprobe, I'm adding the bool value to thebpf_trace_run_ctx, so the helper can detect that it's executed in uprobe context and call specific code.The
is_uprobebool is set as true inbpf_prog_run_array_sleepable, which is currently used only for executing bpf programs in uprobe.
Quoted 8 lines
Renaming
bpf_prog_run_array_sleepabletobpf_prog_run_array_uprobeto address that it's only used for uprobes and that it sets the run_ctx.is_uprobe as suggested by Yafang Shao.Suggested-by Andrii Nakryiko <[email protected]>Tested-by Alan Maguire <[email protected]>[1] https://lore.kernel.org/bpf/CAEf4BzZ=xLVkG5eurEuvLU79wAMtwho7ReR+XJAgwhFF4M-7Cg@mail.gmail.com/
Signed-off-by Jiri Olsa <[email protected]>
Jiri Olsa
reviewerPATCH v3 2/3 selftests/bpf: Add bpf_get_func_ip tests for uprobe on function entry
In reply to Jiri OlsaAdding get_func_ip tests for uprobe on function entry that validates that bpf_get_func_ip returns proper values from both uprobe and return uprobe.
--- .../bpf/prog_tests/get_func_ip_test.c | 11 ++++++++ .../selftests/bpf/progs/get_func_ip_test.c | 25 +++++++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/prog_tests/get_func_ip_test.c +11 -0
@@ -1,6 +1,11 @@// SPDX-License-Identifier: GPL-2.0 #include <test_progs.h> #include "get_func_ip_test.skel.h" +#include "get_func_ip_uprobe_test.skel.h" + +static noinline void uprobe_trigger(void) +{ +}static void test_function_entry (void ) {
@@ -20,6 +25,8 @@ static void test_function_entry(void)if (!ASSERT_OK (err,"get_func_ip_test__attach" )) goto cleanup; + skel->bss->uprobe_trigger = (unsigned long ) uprobe_trigger; + prog_fd =bpf_program__fd (skel->progs.test1); err =bpf_prog_test_run_opts (prog_fd, &topts);ASSERT_OK (err,"test_run" );
@@ -30,11 +37,15 @@ static void test_function_entry(void)ASSERT_OK (err,"test_run" ); +uprobe_trigger (); +ASSERT_EQ (skel->bss->test1_result,1 ,"test1_result" );ASSERT_EQ (skel->bss->test2_result,1 ,"test2_result" );ASSERT_EQ (skel->bss->test3_result,1 ,"test3_result" );ASSERT_EQ (skel->bss->test4_result,1 ,"test4_result" );ASSERT_EQ (skel->bss->test5_result,1 ,"test5_result" ); +ASSERT_EQ (skel->bss->test7_result,1 ,"test7_result" ); +ASSERT_EQ (skel->bss->test8_result,1 ,"test8_result" ); cleanup:get_func_ip_test__destroy (skel);
tools/testing/selftests/bpf/progs/get_func_ip_test.c +23 -2
@@ -1,8 +1,7 @@// SPDX-License-Identifier: GPL-2.0 -#include <linux/bpf.h> +#include "vmlinux.h" #include <bpf/bpf_helpers.h> #include <bpf/bpf_tracing.h> -#include <stdbool.h> char _license[] SEC("license") = "GPL";
@@ -83,3 +82,25 @@ int test6(struct pt_regs *ctx) test6_result = (const void *) addr ==0 ;return 0 ; } + +unsigned long uprobe_trigger; + +__u64 test7_result =0 ; +SEC("uprobe//proc/self/exe:uprobe_trigger") +int BPF_UPROBE (test7 ) +{ +__u64 addr =bpf_get_func_ip (ctx); + + test7_result = (const void *) addr == (const void *) uprobe_trigger; +return 0 ; +} + +__u64 test8_result =0 ; +SEC("uretprobe//proc/self/exe:uprobe_trigger") +int BPF_URETPROBE (test8 ,int ret) +{ +__u64 addr =bpf_get_func_ip (ctx); + + test8_result = (const void *) addr == (const void *) uprobe_trigger; +return 0 ; +}
Signature · 1 line
2.41.0
Re: [PATCHv3 bpf-next 2/3] selftests/bpf: Add bpf_get_func_ip tests for uprobe on function entry
Quoted 6 lines · Jiri Olsa
Adding
get_func_iptests for uprobe on function entry that validates thatbpf_get_func_ipreturns proper values from both uprobe and return uprobe.Tested-by Alan Maguire <[email protected]>Signed-off-by Jiri Olsa <[email protected]>
Jiri Olsa
reviewerPATCH v3 3/3 selftests/bpf: Add bpf_get_func_ip test for uprobe inside function
In reply to Jiri OlsaAdding get_func_ip test for uprobe inside function that validates the get_func_ip helper returns correct probe address value.
--- .../bpf/prog_tests/get_func_ip_test.c | 46 +++++++++++++++++-- .../bpf/progs/get_func_ip_uprobe_test.c | 18 ++++++++ 2 files changed, 60 insertions(+), 4 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/get_func_ip_uprobe_test.c
tools/testing/selftests/bpf/prog_tests/get_func_ip_test.c +42 -4
@@ -51,11 +51,17 @@ static void test_function_entry(void)get_func_ip_test__destroy (skel); } -/* test6 is x86_64 specific because of the instruction -* offset, disabling it for all other archs -*/ #ifdef __x86_64__ -static void test_function_body (void ) +extern void uprobe_trigger_body (void ); +asm( +".globl uprobe_trigger_body\n" +".type uprobe_trigger_body, @function\n" +"uprobe_trigger_body:\n" +" nop\n" +" ret\n" +); + +static void test_function_body_kprobe (void ) {struct get_func_ip_test *skel =NULL ;LIBBPF_OPTS (bpf_test_run_opts, topts);
@@ -67,6 +73,9 @@ static void test_function_body(void)if (!ASSERT_OK_PTR (skel,"get_func_ip_test__open" ))return ; +/* test6 is x86_64 specific and is disabled by default, +* enable it for body test. +*/ bpf_program__set_autoload (skel->progs.test6, true); err =get_func_ip_test__load (skel);
@@ -90,6 +99,35 @@ static void test_function_body(void)bpf_link__destroy (link6); get_func_ip_test__destroy(skel); } + +static void test_function_body_uprobe (void ) +{ +struct get_func_ip_uprobe_test *skel =NULL ; +int err; + + skel =get_func_ip_uprobe_test__open_and_load (); +if (!ASSERT_OK_PTR (skel,"get_func_ip_uprobe_test__open_and_load" )) +return ; + + err =get_func_ip_uprobe_test__attach (skel); +if (!ASSERT_OK (err,"get_func_ip_test__attach" )) + goto cleanup; + + skel->bss->uprobe_trigger_body = (unsigned long ) uprobe_trigger_body; + +uprobe_trigger_body (); + +ASSERT_EQ (skel->bss->test1_result,1 ,"test1_result" ); + +cleanup: +get_func_ip_uprobe_test__destroy (skel); +} + +static void test_function_body (void ) +{ +test_function_body_kprobe (); +test_function_body_uprobe (); +}#else #define test_function_body ()#endif
tools/testing/selftests/bpf/progs/get_func_ip_uprobe_test.c new file +18 -0
@@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "vmlinux.h" +#include <bpf/bpf_helpers.h> +#include <bpf/bpf_tracing.h> + +char _license[] SEC("license") = "GPL"; + +unsigned long uprobe_trigger_body; + +__u64 test1_result =0 ; +SEC("uprobe//proc/self/exe:uprobe_trigger_body+1") +int BPF_UPROBE (test1 ) +{ +__u64 addr =bpf_get_func_ip (ctx); + + test1_result = (const void *) addr == (const void *) uprobe_trigger_body +1 ; +return 0 ; +}
Signature · 1 line
2.41.0
Re: [PATCHv3 bpf-next 3/3] selftests/bpf: Add bpf_get_func_ip test for uprobe inside function
Quoted 5 lines · Jiri Olsa
Adding
get_func_iptest for uprobe inside function that validates theget_func_iphelper returns correct probe address value.Tested-by Alan Maguire <[email protected]>Signed-off-by Jiri Olsa <[email protected]>
This series was applied to bpf/bpf-next.git (master) by Martin KaFai Lau <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Martin KaFai Lau <[email protected]>:
Quoted 9 lines · On Mon, 7 Aug 2023 10:59:53 +0200 you wrote:
hi,
adding support forbpf_get_func_iphelper for uprobe program to return probed address for both uprobe and return uprobe as suggested by Andrii in [1].We agreed that uprobe can have special use of
bpf_get_func_iphelper that differs from kprobe.[...]
Here is the summary with links:
- [PATCHv3,bpf-next,1/3] bpf: Add support for bpf_get_func_ip helper for uprobe program
https://git.kernel.org/bpf/bpf-next/c/a3c485a5d8d4 - [PATCHv3,bpf-next,2/3] selftests/bpf: Add bpf_get_func_ip tests for uprobe on function entry https://git.kernel.org/bpf/bpf-next/c/e43163ed1c0a - [PATCHv3,bpf-next,3/3] selftests/bpf: Add bpf_get_func_ip test for uprobe inside function https://git.kernel.org/bpf/bpf-next/c/7febf573a58b
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html