| Message ID | 20220712145850.599666-7-benjamin.tissoires@redhat.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Introduce eBPF support for HID devices | expand |
On 7/12/22 7:58 AM, Benjamin Tissoires wrote: > We add 2 new kfuncs that are following the RET_PTR_TO_MEM > capability from the previous commit. > Then we test them in selftests: > the first tests are testing valid case, and are not failing, > and the later ones are actually preventing the program to be loaded > because they are wrong. > > To work around that, we mark the failing ones as not autoloaded > (with SEC("?tc")), and we manually enable them one by one, ensuring > the verifier rejects them. > > To be able to use bpf_program__set_autoload() from libbpf, we need > to use a plain skeleton, not a light-skeleton, and this is why we > also change the Makefile to generate both for kfunc_call_test.c > > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> > > --- > > new in v6 > --- > include/linux/btf.h | 4 +- > net/bpf/test_run.c | 22 +++++ > tools/testing/selftests/bpf/Makefile | 5 +- > .../selftests/bpf/prog_tests/kfunc_call.c | 48 ++++++++++ > .../selftests/bpf/progs/kfunc_call_test.c | 89 +++++++++++++++++++ > 5 files changed, 165 insertions(+), 3 deletions(-) > > diff --git a/include/linux/btf.h b/include/linux/btf.h > index 31da4273c2ec..6f46ff2128ae 100644 > --- a/include/linux/btf.h > +++ b/include/linux/btf.h > @@ -422,7 +422,9 @@ static inline int register_btf_id_dtor_kfuncs(const struct btf_id_dtor_kfunc *dt > > static inline bool btf_type_is_struct_ptr(struct btf *btf, const struct btf_type *t) > { > - /* t comes in already as a pointer */ > + if (!btf_type_is_ptr(t)) > + return false; Why we have a change here? > + > t = btf_type_by_id(btf, t->type); > > /* allow const */ > diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c > index 9da2a42811e8..0b4026ea4652 100644 > --- a/net/bpf/test_run.c > +++ b/net/bpf/test_run.c > @@ -606,6 +606,24 @@ noinline void bpf_kfunc_call_memb1_release(struct prog_test_member1 *p) > WARN_ON_ONCE(1); > } > > +static int *__bpf_kfunc_call_test_get_mem(struct prog_test_ref_kfunc *p, const int size) > +{ > + if (size > 2 * sizeof(int)) > + return NULL; > + > + return (int *)p; > +} > + > +noinline int *bpf_kfunc_call_test_get_rdwr_mem(struct prog_test_ref_kfunc *p, const int rdwr_buf_size) > +{ > + return __bpf_kfunc_call_test_get_mem(p, rdwr_buf_size); > +} > + > +noinline int *bpf_kfunc_call_test_get_rdonly_mem(struct prog_test_ref_kfunc *p, const int rdonly_buf_size) > +{ > + return __bpf_kfunc_call_test_get_mem(p, rdonly_buf_size); > +} > + > noinline struct prog_test_ref_kfunc * > bpf_kfunc_call_test_kptr_get(struct prog_test_ref_kfunc **pp, int a, int b) > { > @@ -704,6 +722,8 @@ BTF_ID(func, bpf_kfunc_call_memb_acquire) > BTF_ID(func, bpf_kfunc_call_test_release) > BTF_ID(func, bpf_kfunc_call_memb_release) > BTF_ID(func, bpf_kfunc_call_memb1_release) > +BTF_ID(func, bpf_kfunc_call_test_get_rdwr_mem) > +BTF_ID(func, bpf_kfunc_call_test_get_rdonly_mem) > BTF_ID(func, bpf_kfunc_call_test_kptr_get) > BTF_ID(func, bpf_kfunc_call_test_pass_ctx) > BTF_ID(func, bpf_kfunc_call_test_pass1) > @@ -731,6 +751,8 @@ BTF_SET_END(test_sk_release_kfunc_ids) > BTF_SET_START(test_sk_ret_null_kfunc_ids) > BTF_ID(func, bpf_kfunc_call_test_acquire) > BTF_ID(func, bpf_kfunc_call_memb_acquire) > +BTF_ID(func, bpf_kfunc_call_test_get_rdwr_mem) > +BTF_ID(func, bpf_kfunc_call_test_get_rdonly_mem) > BTF_ID(func, bpf_kfunc_call_test_kptr_get) > BTF_SET_END(test_sk_ret_null_kfunc_ids) > [...]
On Sat, Jul 16, 2022 at 6:34 AM Yonghong Song <yhs@fb.com> wrote: > > > > On 7/12/22 7:58 AM, Benjamin Tissoires wrote: > > We add 2 new kfuncs that are following the RET_PTR_TO_MEM > > capability from the previous commit. > > Then we test them in selftests: > > the first tests are testing valid case, and are not failing, > > and the later ones are actually preventing the program to be loaded > > because they are wrong. > > > > To work around that, we mark the failing ones as not autoloaded > > (with SEC("?tc")), and we manually enable them one by one, ensuring > > the verifier rejects them. > > > > To be able to use bpf_program__set_autoload() from libbpf, we need > > to use a plain skeleton, not a light-skeleton, and this is why we > > also change the Makefile to generate both for kfunc_call_test.c > > > > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> > > > > --- > > > > new in v6 > > --- > > include/linux/btf.h | 4 +- > > net/bpf/test_run.c | 22 +++++ > > tools/testing/selftests/bpf/Makefile | 5 +- > > .../selftests/bpf/prog_tests/kfunc_call.c | 48 ++++++++++ > > .../selftests/bpf/progs/kfunc_call_test.c | 89 +++++++++++++++++++ > > 5 files changed, 165 insertions(+), 3 deletions(-) > > > > diff --git a/include/linux/btf.h b/include/linux/btf.h > > index 31da4273c2ec..6f46ff2128ae 100644 > > --- a/include/linux/btf.h > > +++ b/include/linux/btf.h > > @@ -422,7 +422,9 @@ static inline int register_btf_id_dtor_kfuncs(const struct btf_id_dtor_kfunc *dt > > > > static inline bool btf_type_is_struct_ptr(struct btf *btf, const struct btf_type *t) > > { > > - /* t comes in already as a pointer */ > > + if (!btf_type_is_ptr(t)) > > + return false; > > Why we have a change here? Definitely a mistake while fixing/rebasing the series. Will bring this hunk in the previous patch in the next revision. Thanks for the review! Cheers, Benjamin > > > + > > t = btf_type_by_id(btf, t->type); > > > > /* allow const */ > > diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c > > index 9da2a42811e8..0b4026ea4652 100644 > > --- a/net/bpf/test_run.c > > +++ b/net/bpf/test_run.c > > @@ -606,6 +606,24 @@ noinline void bpf_kfunc_call_memb1_release(struct prog_test_member1 *p) > > WARN_ON_ONCE(1); > > } > > > > +static int *__bpf_kfunc_call_test_get_mem(struct prog_test_ref_kfunc *p, const int size) > > +{ > > + if (size > 2 * sizeof(int)) > > + return NULL; > > + > > + return (int *)p; > > +} > > + > > +noinline int *bpf_kfunc_call_test_get_rdwr_mem(struct prog_test_ref_kfunc *p, const int rdwr_buf_size) > > +{ > > + return __bpf_kfunc_call_test_get_mem(p, rdwr_buf_size); > > +} > > + > > +noinline int *bpf_kfunc_call_test_get_rdonly_mem(struct prog_test_ref_kfunc *p, const int rdonly_buf_size) > > +{ > > + return __bpf_kfunc_call_test_get_mem(p, rdonly_buf_size); > > +} > > + > > noinline struct prog_test_ref_kfunc * > > bpf_kfunc_call_test_kptr_get(struct prog_test_ref_kfunc **pp, int a, int b) > > { > > @@ -704,6 +722,8 @@ BTF_ID(func, bpf_kfunc_call_memb_acquire) > > BTF_ID(func, bpf_kfunc_call_test_release) > > BTF_ID(func, bpf_kfunc_call_memb_release) > > BTF_ID(func, bpf_kfunc_call_memb1_release) > > +BTF_ID(func, bpf_kfunc_call_test_get_rdwr_mem) > > +BTF_ID(func, bpf_kfunc_call_test_get_rdonly_mem) > > BTF_ID(func, bpf_kfunc_call_test_kptr_get) > > BTF_ID(func, bpf_kfunc_call_test_pass_ctx) > > BTF_ID(func, bpf_kfunc_call_test_pass1) > > @@ -731,6 +751,8 @@ BTF_SET_END(test_sk_release_kfunc_ids) > > BTF_SET_START(test_sk_ret_null_kfunc_ids) > > BTF_ID(func, bpf_kfunc_call_test_acquire) > > BTF_ID(func, bpf_kfunc_call_memb_acquire) > > +BTF_ID(func, bpf_kfunc_call_test_get_rdwr_mem) > > +BTF_ID(func, bpf_kfunc_call_test_get_rdonly_mem) > > BTF_ID(func, bpf_kfunc_call_test_kptr_get) > > BTF_SET_END(test_sk_ret_null_kfunc_ids) > > > [...] >
diff --git a/include/linux/btf.h b/include/linux/btf.h index 31da4273c2ec..6f46ff2128ae 100644 --- a/include/linux/btf.h +++ b/include/linux/btf.h @@ -422,7 +422,9 @@ static inline int register_btf_id_dtor_kfuncs(const struct btf_id_dtor_kfunc *dt static inline bool btf_type_is_struct_ptr(struct btf *btf, const struct btf_type *t) { - /* t comes in already as a pointer */ + if (!btf_type_is_ptr(t)) + return false; + t = btf_type_by_id(btf, t->type); /* allow const */ diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c index 9da2a42811e8..0b4026ea4652 100644 --- a/net/bpf/test_run.c +++ b/net/bpf/test_run.c @@ -606,6 +606,24 @@ noinline void bpf_kfunc_call_memb1_release(struct prog_test_member1 *p) WARN_ON_ONCE(1); } +static int *__bpf_kfunc_call_test_get_mem(struct prog_test_ref_kfunc *p, const int size) +{ + if (size > 2 * sizeof(int)) + return NULL; + + return (int *)p; +} + +noinline int *bpf_kfunc_call_test_get_rdwr_mem(struct prog_test_ref_kfunc *p, const int rdwr_buf_size) +{ + return __bpf_kfunc_call_test_get_mem(p, rdwr_buf_size); +} + +noinline int *bpf_kfunc_call_test_get_rdonly_mem(struct prog_test_ref_kfunc *p, const int rdonly_buf_size) +{ + return __bpf_kfunc_call_test_get_mem(p, rdonly_buf_size); +} + noinline struct prog_test_ref_kfunc * bpf_kfunc_call_test_kptr_get(struct prog_test_ref_kfunc **pp, int a, int b) { @@ -704,6 +722,8 @@ BTF_ID(func, bpf_kfunc_call_memb_acquire) BTF_ID(func, bpf_kfunc_call_test_release) BTF_ID(func, bpf_kfunc_call_memb_release) BTF_ID(func, bpf_kfunc_call_memb1_release) +BTF_ID(func, bpf_kfunc_call_test_get_rdwr_mem) +BTF_ID(func, bpf_kfunc_call_test_get_rdonly_mem) BTF_ID(func, bpf_kfunc_call_test_kptr_get) BTF_ID(func, bpf_kfunc_call_test_pass_ctx) BTF_ID(func, bpf_kfunc_call_test_pass1) @@ -731,6 +751,8 @@ BTF_SET_END(test_sk_release_kfunc_ids) BTF_SET_START(test_sk_ret_null_kfunc_ids) BTF_ID(func, bpf_kfunc_call_test_acquire) BTF_ID(func, bpf_kfunc_call_memb_acquire) +BTF_ID(func, bpf_kfunc_call_test_get_rdwr_mem) +BTF_ID(func, bpf_kfunc_call_test_get_rdonly_mem) BTF_ID(func, bpf_kfunc_call_test_kptr_get) BTF_SET_END(test_sk_ret_null_kfunc_ids) diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index 8d59ec7f4c2d..0905315ff86d 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -350,11 +350,12 @@ LINKED_SKELS := test_static_linked.skel.h linked_funcs.skel.h \ test_subskeleton.skel.h test_subskeleton_lib.skel.h \ test_usdt.skel.h -LSKELS := kfunc_call_test.c fentry_test.c fexit_test.c fexit_sleep.c \ +LSKELS := fentry_test.c fexit_test.c fexit_sleep.c \ test_ringbuf.c atomics.c trace_printk.c trace_vprintk.c \ map_ptr_kern.c core_kern.c core_kern_overflow.c # Generate both light skeleton and libbpf skeleton for these -LSKELS_EXTRA := test_ksyms_module.c test_ksyms_weak.c kfunc_call_test_subprog.c +LSKELS_EXTRA := test_ksyms_module.c test_ksyms_weak.c kfunc_call_test.c \ + kfunc_call_test_subprog.c SKEL_BLACKLIST += $$(LSKELS) test_static_linked.skel.h-deps := test_static_linked1.o test_static_linked2.o diff --git a/tools/testing/selftests/bpf/prog_tests/kfunc_call.c b/tools/testing/selftests/bpf/prog_tests/kfunc_call.c index 22547aafdd60..021ec38562d2 100644 --- a/tools/testing/selftests/bpf/prog_tests/kfunc_call.c +++ b/tools/testing/selftests/bpf/prog_tests/kfunc_call.c @@ -2,6 +2,7 @@ /* Copyright (c) 2021 Facebook */ #include <test_progs.h> #include <network_helpers.h> +#include "kfunc_call_test.skel.h" #include "kfunc_call_test.lskel.h" #include "kfunc_call_test_subprog.skel.h" #include "kfunc_call_test_subprog.lskel.h" @@ -50,10 +51,12 @@ static void test_main(void) prog_fd = skel->progs.kfunc_syscall_test.prog_fd; err = bpf_prog_test_run_opts(prog_fd, &syscall_topts); ASSERT_OK(err, "bpf_prog_test_run(syscall_test)"); + ASSERT_EQ(syscall_topts.retval, 0, "syscall_test-retval"); prog_fd = skel->progs.kfunc_syscall_test_fail.prog_fd; err = bpf_prog_test_run_opts(prog_fd, &syscall_topts); ASSERT_ERR(err, "bpf_prog_test_run(syscall_test_fail)"); + ASSERT_EQ(syscall_topts.retval, 0, "syscall_test_fail-retval"); kfunc_call_test_lskel__destroy(skel); } @@ -106,6 +109,48 @@ static void test_subprog_lskel(void) kfunc_call_test_subprog_lskel__destroy(skel); } +static void test_get_mem(void) +{ + struct kfunc_call_test *skel; + int prog_fd, err; + LIBBPF_OPTS(bpf_test_run_opts, topts, + .data_in = &pkt_v4, + .data_size_in = sizeof(pkt_v4), + .repeat = 1, + ); + + skel = kfunc_call_test__open_and_load(); + if (!ASSERT_OK_PTR(skel, "skel")) + return; + + prog_fd = bpf_program__fd(skel->progs.kfunc_call_test_get_mem); + err = bpf_prog_test_run_opts(prog_fd, &topts); + ASSERT_OK(err, "bpf_prog_test_run(test_get_mem)"); + ASSERT_EQ(topts.retval, 42, "test_get_mem-retval"); + + kfunc_call_test__destroy(skel); + + /* start the various failing tests */ + skel = kfunc_call_test__open(); + if (!ASSERT_OK_PTR(skel, "skel")) + return; + + bpf_program__set_autoload(skel->progs.kfunc_call_test_get_mem_fail1, true); + err = kfunc_call_test__load(skel); + ASSERT_ERR(err, "load(kfunc_call_test_get_mem_fail1)"); + kfunc_call_test__destroy(skel); + + skel = kfunc_call_test__open(); + if (!ASSERT_OK_PTR(skel, "skel")) + return; + + bpf_program__set_autoload(skel->progs.kfunc_call_test_get_mem_fail2, true); + err = kfunc_call_test__load(skel); + ASSERT_ERR(err, "load(kfunc_call_test_get_mem_fail2)"); + + kfunc_call_test__destroy(skel); +} + void test_kfunc_call(void) { if (test__start_subtest("main")) @@ -116,4 +161,7 @@ void test_kfunc_call(void) if (test__start_subtest("subprog_lskel")) test_subprog_lskel(); + + if (test__start_subtest("get_mem")) + test_get_mem(); } diff --git a/tools/testing/selftests/bpf/progs/kfunc_call_test.c b/tools/testing/selftests/bpf/progs/kfunc_call_test.c index 0978834e22ad..e865f8db26a3 100644 --- a/tools/testing/selftests/bpf/progs/kfunc_call_test.c +++ b/tools/testing/selftests/bpf/progs/kfunc_call_test.c @@ -14,6 +14,8 @@ extern void bpf_kfunc_call_test_pass1(struct prog_test_pass1 *p) __ksym; extern void bpf_kfunc_call_test_pass2(struct prog_test_pass2 *p) __ksym; extern void bpf_kfunc_call_test_mem_len_pass1(void *mem, int len) __ksym; extern void bpf_kfunc_call_test_mem_len_fail2(__u64 *mem, int len) __ksym; +extern int *bpf_kfunc_call_test_get_rdwr_mem(struct prog_test_ref_kfunc *p, const int rdwr_buf_size) __ksym; +extern int *bpf_kfunc_call_test_get_rdonly_mem(struct prog_test_ref_kfunc *p, const int rdonly_buf_size) __ksym; SEC("tc") int kfunc_call_test2(struct __sk_buff *skb) @@ -119,4 +121,91 @@ int kfunc_syscall_test_fail(struct syscall_test_args *args) return 0; } +SEC("tc") +int kfunc_call_test_get_mem(struct __sk_buff *skb) +{ + struct prog_test_ref_kfunc *pt; + unsigned long s = 0; + int *p = NULL; + int ret = 0; + + pt = bpf_kfunc_call_test_acquire(&s); + if (pt) { + if (pt->a != 42 || pt->b != 108) + ret = -1; + + p = bpf_kfunc_call_test_get_rdwr_mem(pt, 2 * sizeof(int)); + if (p) { + p[0] = 42; + ret = p[1]; /* 108 */ + } else { + ret = -1; + } + + if (ret >= 0) { + p = bpf_kfunc_call_test_get_rdonly_mem(pt, 2 * sizeof(int)); + if (p) + ret = p[0]; /* 42 */ + else + ret = -1; + } + + bpf_kfunc_call_test_release(pt); + } + return ret; +} + +SEC("?tc") +int kfunc_call_test_get_mem_fail1(struct __sk_buff *skb) +{ + struct prog_test_ref_kfunc *pt; + unsigned long s = 0; + int *p = NULL; + int ret = 0; + + pt = bpf_kfunc_call_test_acquire(&s); + if (pt) { + if (pt->a != 42 || pt->b != 108) + ret = -1; + + p = bpf_kfunc_call_test_get_rdonly_mem(pt, 2 * sizeof(int)); + if (p) + p[0] = 42; /* this is a read-only buffer, so -EACCES */ + else + ret = -1; + + bpf_kfunc_call_test_release(pt); + } + return ret; +} + +SEC("?tc") +int kfunc_call_test_get_mem_fail2(struct __sk_buff *skb) +{ + struct prog_test_ref_kfunc *pt; + unsigned long s = 0; + int *p = NULL; + int ret = 0; + + pt = bpf_kfunc_call_test_acquire(&s); + if (pt) { + if (pt->a != 42 || pt->b != 108) + ret = -1; + + p = bpf_kfunc_call_test_get_rdwr_mem(pt, 2 * sizeof(int)); + if (p) { + p[0] = 42; + ret = p[1]; /* 108 */ + } else { + ret = -1; + } + + bpf_kfunc_call_test_release(pt); + } + if (p) + ret = p[0]; /* p is not valid anymore */ + + return ret; +} + char _license[] SEC("license") = "GPL";
We add 2 new kfuncs that are following the RET_PTR_TO_MEM capability from the previous commit. Then we test them in selftests: the first tests are testing valid case, and are not failing, and the later ones are actually preventing the program to be loaded because they are wrong. To work around that, we mark the failing ones as not autoloaded (with SEC("?tc")), and we manually enable them one by one, ensuring the verifier rejects them. To be able to use bpf_program__set_autoload() from libbpf, we need to use a plain skeleton, not a light-skeleton, and this is why we also change the Makefile to generate both for kfunc_call_test.c Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> --- new in v6 --- include/linux/btf.h | 4 +- net/bpf/test_run.c | 22 +++++ tools/testing/selftests/bpf/Makefile | 5 +- .../selftests/bpf/prog_tests/kfunc_call.c | 48 ++++++++++ .../selftests/bpf/progs/kfunc_call_test.c | 89 +++++++++++++++++++ 5 files changed, 165 insertions(+), 3 deletions(-)