libbpf: Export bpf_program__attach_kprobe_opts function
Subsystems (6)
cover libbpf: Export bpf_program__attach_kprobe_opts function
hi,
making bpf_program__attach_kprobe_opts function exported, and other fixes suggested by Andrii in recent review [1][2].
thanks,
jirka
[1] https://lore.kernel.org/bpf/CAEf4BzYELMgTv_RhW7qWNgOYc_mCyh8-VX0FUYabi_TU3OiGKw@mail.gmail.com/
[2] https://lore.kernel.org/bpf/CAEf4Bzbk-nyenpc86jtEShset_ZSkapvpy3fG2gYKZEOY7uAQg@mail.gmail.com/
---
Jiri Olsa (3):
libbpf: Fix func leak in attach_kprobe
libbpf: Allow decimal offset for kprobes
libbpf: Export bpf_program__attach_kprobe_opts function
tools/lib/bpf/libbpf.c | 34 +++++++++++++++++++--------------- tools/lib/bpf/libbpf.h | 14 ++++++++++++++ tools/lib/bpf/libbpf.map | 1 + tools/testing/selftests/bpf/prog_tests/get_func_ip_test.c | 2 ++ tools/testing/selftests/bpf/progs/get_func_ip_test.c | 11 +++++++++++ 5 files changed, 47 insertions(+), 15 deletions(-)
PATCH 1/3 libbpf: Fix func leak in attach_kprobe
Adding missing free for func pointer in attach_kprobe function.
--- tools/lib/bpf/libbpf.c | 1 + 1 file changed, 1 insertion(+)
tools/lib/bpf/libbpf.c +1 -0
@@ -10431,6 +10431,7 @@ static struct bpf_link *attach_kprobe(const struct bpf_sec_def *sec,return libbpf_err_ptr (err); }if (opts.retprobe && offset !=0 ) { +free (func); err = -EINVAL ;pr_warn ("kretprobes do not support offset specification\n" );return libbpf_err_ptr (err);
Signature · 1 line
2.31.1
Re: [PATCH bpf-next 1/3] libbpf: Fix func leak in attach_kprobe
Quoted 2 lines · Jiri Olsa
Adding missing free for func pointer in
attach_kprobefunction.
and of course..
jirka
Quoted 21 lines
Reported-by Andrii Nakryiko <[email protected]>Signed-off-by Jiri Olsa <[email protected]>--- tools/lib/bpf/libbpf.c | 1 + 1 file changed, 1 insertion(+)tools/lib/bpf/libbpf.c +1
-0@@ -10431,6 +10431,7 @@ static struct bpf_link *attach_kprobe(const struct bpf_sec_def *sec,return libbpf_err_ptr (err); }if (opts.retprobe && offset !=0 ) { +free (func); err = -EINVAL ;pr_warn ("kretprobes do not support offset specification\n" );return libbpf_err_ptr (err);Signature · 1 line
2.31.1
PATCH 2/3 libbpf: Allow decimal offset for kprobes
In reply to Jiri OlsaAllow to specify decimal offset in SEC macro, like:
SEC("kprobe/bpf_fentry_test7+5")
Adding selftest for that.
--- tools/lib/bpf/libbpf.c | 2 +- .../selftests/bpf/prog_tests/get_func_ip_test.c | 2 ++ tools/testing/selftests/bpf/progs/get_func_ip_test.c | 11 +++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-)
tools/lib/bpf/libbpf.c +1 -1
@@ -10424,7 +10424,7 @@ static struct bpf_link *attach_kprobe(const struct bpf_sec_def *sec, func_name = prog->sec_name + sec->len; opts.retprobe =strcmp (sec->sec,"kretprobe/" ) ==0 ; - n =sscanf (func_name,"%m[a-zA-Z0-9_.]+%lx" , &func, &offset); + n =sscanf (func_name,"%m[a-zA-Z0-9_.]+%li" , &func, &offset);if (n <1 ) { err = -EINVAL ;pr_warn ("kprobe name is invalid: %s\n" , func_name);
tools/testing/selftests/bpf/prog_tests/get_func_ip_test.c +2 -0
@@ -17,6 +17,7 @@ void test_get_func_ip_test(void)*/ #ifndef __x86_64__bpf_program__set_autoload (skel->progs.test6, false); +bpf_program__set_autoload (skel->progs.test7, false);#endif err =get_func_ip_test__load (skel);
@@ -46,6 +47,7 @@ void test_get_func_ip_test(void)ASSERT_EQ (skel->bss->test5_result,1 ,"test5_result" );#ifdef __x86_64__ASSERT_EQ (skel->bss->test6_result,1 ,"test6_result" ); +ASSERT_EQ (skel->bss->test7_result,1 ,"test7_result" );#endif cleanup:
tools/testing/selftests/bpf/progs/get_func_ip_test.c +11 -0
@@ -11,6 +11,7 @@ extern const void bpf_fentry_test3 __ksym; extern const void bpf_fentry_test4 __ksym; extern const void bpf_modify_return_test __ksym; extern const void bpf_fentry_test6 __ksym; +extern const void bpf_fentry_test7 __ksym;__u64 test1_result =0 ;SEC ("fentry/bpf_fentry_test1" )
@@ -71,3 +72,13 @@ int test6(struct pt_regs *ctx) test6_result = (const void *) addr == &bpf_fentry_test6 +5 ;return 0 ; } + +__u64 test7_result =0 ; +SEC("kprobe/bpf_fentry_test7+5") +int test7 (struct pt_regs *ctx) +{ +__u64 addr =bpf_get_func_ip (ctx); + + test7_result = (const void *) addr == &bpf_fentry_test7 +5 ; +return 0 ; +}
Signature · 1 line
2.31.1
PATCH 3/3 libbpf: Export bpf_program__attach_kprobe_opts function
In reply to Jiri OlsaExporting bpf_program__attach_kprobe_opts function.
Renaming bpf_program_attach_kprobe_opts to bpf_kprobe_opts and adding 'sz' field for forward/backward compatiblity.
--- tools/lib/bpf/libbpf.c | 31 +++++++++++++++++-------------- tools/lib/bpf/libbpf.h | 14 ++++++++++++++ tools/lib/bpf/libbpf.map | 1 + 3 files changed, 32 insertions(+), 14 deletions(-)
tools/lib/bpf/libbpf.c +17 -14
@@ -10366,25 +10366,28 @@ static int perf_event_open_probe(bool uprobe, bool retprobe, const char *name,return pfd; } -struct bpf_program_attach_kprobe_opts { -bool retprobe; -unsigned long offset; -}; - -static struct bpf_link * +struct bpf_link *bpf_program__attach_kprobe_opts (struct bpf_program *prog,const char *func_name, -struct bpf_program_attach_kprobe_opts *opts) +struct bpf_kprobe_opts *opts) {char errmsg[STRERR_BUFSIZE ];struct bpf_link *link; +unsigned long offset; +bool retprobe;int pfd, err; - pfd =perf_event_open_probe (false/* uprobe */ , opts->retprobe, func_name, - opts->offset,-1 /* pid */ ); +if (!OPTS_VALID (opts, bpf_kprobe_opts)) +return libbpf_err_ptr (-EINVAL ); + + retprobe =OPTS_GET (opts, retprobe, false); + offset =OPTS_GET (opts, offset,0 ); + + pfd =perf_event_open_probe (false/* uprobe */ , retprobe, func_name, + offset,-1 /* pid */ );if (pfd <0 ) {pr_warn ("prog '%s': failed to create %s '%s' perf event: %s\n" , - prog->name, opts->retprobe ?"kretprobe" :"kprobe" , func_name, + prog->name, retprobe ?"kretprobe" :"kprobe" , func_name,libbpf_strerror_r (pfd, errmsg,sizeof (errmsg)));return libbpf_err_ptr (pfd); }
@@ -10393,7 +10396,7 @@ bpf_program__attach_kprobe_opts(struct bpf_program *prog,if (err) {close (pfd);pr_warn ("prog '%s': failed to attach to %s '%s': %s\n" , - prog->name, opts->retprobe ?"kretprobe" :"kprobe" , func_name, + prog->name, retprobe ?"kretprobe" :"kprobe" , func_name,libbpf_strerror_r (err, errmsg,sizeof (errmsg)));return libbpf_err_ptr (err); }
@@ -10404,9 +10407,9 @@ struct bpf_link *bpf_program__attach_kprobe(struct bpf_program *prog,bool retprobe, const char *func_name) { - struct bpf_program_attach_kprobe_opts opts = { +DECLARE_LIBBPF_OPTS (bpf_kprobe_opts ,opts , .retprobe = retprobe, - }; + );return bpf_program__attach_kprobe_opts (prog, func_name, &opts); }
@@ -10414,7 +10417,7 @@ struct bpf_link *bpf_program__attach_kprobe(struct bpf_program *prog,static struct bpf_link *attach_kprobe (const struct bpf_sec_def *sec,struct bpf_program *prog) { -struct bpf_program_attach_kprobe_opts opts; +DECLARE_LIBBPF_OPTS (bpf_kprobe_opts, opts);unsigned long offset =0 ;struct bpf_link *link;const char *func_name;
tools/lib/bpf/libbpf.h +14 -0
@@ -104,6 +104,16 @@ struct bpf_object_open_opts { };#define bpf_object_open_opts__last_field btf_custom_path +struct bpf_kprobe_opts { +/* size of this struct, for forward/backward compatiblity */ +size_t sz; +/* kprobe is return probe */ +bool retprobe; +/* function's offset to install kprobe to */ +unsigned long offset; +}; +#define bpf_kprobe_opts__last_field offset + LIBBPF_API struct bpf_object *bpf_object__open(const char *path); LIBBPF_API struct bpf_object *bpf_object__open_file (const char *path,const struct bpf_object_open_opts *opts);
@@ -249,6 +259,10 @@ bpf_program__attach_perf_event(struct bpf_program *prog, int pfd); LIBBPF_API struct bpf_link *bpf_program__attach_kprobe (struct bpf_program *prog,bool retprobe,const char *func_name); +LIBBPF_API struct bpf_link* +bpf_program__attach_kprobe_opts (struct bpf_program *prog, +const char *func_name, +struct bpf_kprobe_opts *opts); LIBBPF_API struct bpf_link * bpf_program__attach_uprobe(struct bpf_program *prog, bool retprobe, pid_t pid, const char *binary_path,
tools/lib/bpf/libbpf.map +1 -0
@@ -372,6 +372,7 @@ LIBBPF_0.5.0 { global: bpf_map__initial_value; bpf_map_lookup_and_delete_elem_flags; + bpf_program__attach_kprobe_opts; bpf_object__gen_loader; btf_dump__dump_type_data; libbpf_set_strict_mode;
Signature · 1 line
2.31.1
Andrii Nakryiko
AppliedQuoted 2 lines · Jiri Olsa
Exporting
bpf_program__attach_kprobe_optsfunction.
I've updated all commits to use more customary imperative language ("export" instead of "exporting", "add" instead of "adding"). Also fixed a few styling issues and changed the order of kprobe_opts field (offset first, bool retprobe next), so that we don't have unnecessary internal padding.
Pushed to bpf-next, thanks!
Quoted 12 lines
Renaming
bpf_program_attach_kprobe_optstobpf_kprobe_optsand adding 'sz' field for forward/backward compatiblity.Suggested-by Andrii Nakryiko <[email protected]>Signed-off-by Jiri Olsa <[email protected]>--- tools/lib/bpf/libbpf.c | 31 +++++++++++++++++-------------- tools/lib/bpf/libbpf.h | 14 ++++++++++++++ tools/lib/bpf/libbpf.map | 1 + 3 files changed, 32 insertions(+), 14 deletions(-)
[...]
Quoted 4 lines · Jiri Olsa
hi,
makingbpf_program__attach_kprobe_optsfunction exported, and other fixes suggested by Andrii in recent review [1][2].
Looks great! Feel free to add
Quoted 21 lines
thanks,
jirka[1] https://lore.kernel.org/bpf/CAEf4BzYELMgTv_RhW7qWNgOYc_mCyh8-VX0FUYabi_TU3OiGKw@mail.gmail.com/
[2] https://lore.kernel.org/bpf/CAEf4Bzbk-nyenpc86jtEShset_ZSkapvpy3fG2gYKZEOY7uAQg@mail.gmail.com/---
Jiri Olsa (3):
libbpf: Fix func leak inattach_kprobe
libbpf: Allow decimal offset for kprobes
libbpf: Exportbpf_program__attach_kprobe_optsfunctiontools/lib/bpf/libbpf.c | 34 +++++++++++++++++++--------------- tools/lib/bpf/libbpf.h | 14 ++++++++++++++ tools/lib/bpf/libbpf.map | 1 + tools/testing/selftests/bpf/prog_tests/get_func_ip_test.c | 2 ++ tools/testing/selftests/bpf/progs/get_func_ip_test.c | 11 +++++++++++ 5 files changed, 47 insertions(+), 15 deletions(-)