Message ID | 20220414135902.100914-4-liujian56@huawei.com (mailing list archive) |
---|---|
State | Superseded |
Delegated to: | BPF |
Headers | show |
Series | Enlarge offset check value in bpf_skb_load_bytes | expand |
> On Apr 14, 2022, at 6:59 AM, Liu Jian <liujian56@huawei.com> wrote: > > Use bpf_prog_test_run_opts to test the skb_load_bytes function. > Tests the behavior when offset is greater than INT_MAX or a normal value. > > Signed-off-by: Liu Jian <liujian56@huawei.com> Acked-by: Song Liu <songliubraving@fb.com> > --- > v2->v3: Change patch prefix to bpf-next. Use ASSERT_* calls > .../selftests/bpf/prog_tests/skb_load_bytes.c | 45 +++++++++++++++++++ > .../selftests/bpf/progs/skb_load_bytes.c | 19 ++++++++ > 2 files changed, 64 insertions(+) > create mode 100644 tools/testing/selftests/bpf/prog_tests/skb_load_bytes.c > create mode 100644 tools/testing/selftests/bpf/progs/skb_load_bytes.c > > diff --git a/tools/testing/selftests/bpf/prog_tests/skb_load_bytes.c b/tools/testing/selftests/bpf/prog_tests/skb_load_bytes.c > new file mode 100644 > index 000000000000..d7f83c0a40a5 > --- /dev/null > +++ b/tools/testing/selftests/bpf/prog_tests/skb_load_bytes.c > @@ -0,0 +1,45 @@ > +// SPDX-License-Identifier: GPL-2.0 > +#include <test_progs.h> > +#include <network_helpers.h> > +#include "skb_load_bytes.skel.h" > + > +void test_skb_load_bytes(void) > +{ > + struct skb_load_bytes *skel; > + int err, prog_fd, test_result; > + struct __sk_buff skb = { 0 }; > + > + LIBBPF_OPTS(bpf_test_run_opts, tattr, > + .data_in = &pkt_v4, > + .data_size_in = sizeof(pkt_v4), > + .ctx_in = &skb, > + .ctx_size_in = sizeof(skb), > + ); > + > + skel = skb_load_bytes__open_and_load(); > + if (!ASSERT_OK_PTR(skel, "skel_open_and_load")) > + return; > + > + prog_fd = bpf_program__fd(skel->progs.skb_process); > + if (!ASSERT_GE(prog_fd, 0, "prog_fd")) > + goto out; > + > + skel->bss->load_offset = (uint32_t)(-1); > + err = bpf_prog_test_run_opts(prog_fd, &tattr); > + if (!ASSERT_OK(err, "bpf_prog_test_run_opts")) > + goto out; > + test_result = skel->bss->test_result; > + if (!ASSERT_EQ(test_result, -EFAULT, "offset -1")) > + goto out; > + > + skel->bss->load_offset = (uint32_t)10; > + err = bpf_prog_test_run_opts(prog_fd, &tattr); > + if (!ASSERT_OK(err, "bpf_prog_test_run_opts")) > + goto out; > + test_result = skel->bss->test_result; > + if (!ASSERT_EQ(test_result, 0, "offset 10")) > + goto out; > + > +out: > + skb_load_bytes__destroy(skel); > +} > diff --git a/tools/testing/selftests/bpf/progs/skb_load_bytes.c b/tools/testing/selftests/bpf/progs/skb_load_bytes.c > new file mode 100644 > index 000000000000..e4252fd973be > --- /dev/null > +++ b/tools/testing/selftests/bpf/progs/skb_load_bytes.c > @@ -0,0 +1,19 @@ > +// SPDX-License-Identifier: GPL-2.0 > + > +#include <linux/bpf.h> > +#include <bpf/bpf_helpers.h> > + > +char _license[] SEC("license") = "GPL"; > + > +__u32 load_offset = 0; > +int test_result = 0; > + > +SEC("tc") > +int skb_process(struct __sk_buff *skb) > +{ > + char buf[16]; > + > + test_result = bpf_skb_load_bytes(skb, load_offset, buf, 10); > + > + return 0; > +} > -- > 2.17.1 >
diff --git a/tools/testing/selftests/bpf/prog_tests/skb_load_bytes.c b/tools/testing/selftests/bpf/prog_tests/skb_load_bytes.c new file mode 100644 index 000000000000..d7f83c0a40a5 --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/skb_load_bytes.c @@ -0,0 +1,45 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <test_progs.h> +#include <network_helpers.h> +#include "skb_load_bytes.skel.h" + +void test_skb_load_bytes(void) +{ + struct skb_load_bytes *skel; + int err, prog_fd, test_result; + struct __sk_buff skb = { 0 }; + + LIBBPF_OPTS(bpf_test_run_opts, tattr, + .data_in = &pkt_v4, + .data_size_in = sizeof(pkt_v4), + .ctx_in = &skb, + .ctx_size_in = sizeof(skb), + ); + + skel = skb_load_bytes__open_and_load(); + if (!ASSERT_OK_PTR(skel, "skel_open_and_load")) + return; + + prog_fd = bpf_program__fd(skel->progs.skb_process); + if (!ASSERT_GE(prog_fd, 0, "prog_fd")) + goto out; + + skel->bss->load_offset = (uint32_t)(-1); + err = bpf_prog_test_run_opts(prog_fd, &tattr); + if (!ASSERT_OK(err, "bpf_prog_test_run_opts")) + goto out; + test_result = skel->bss->test_result; + if (!ASSERT_EQ(test_result, -EFAULT, "offset -1")) + goto out; + + skel->bss->load_offset = (uint32_t)10; + err = bpf_prog_test_run_opts(prog_fd, &tattr); + if (!ASSERT_OK(err, "bpf_prog_test_run_opts")) + goto out; + test_result = skel->bss->test_result; + if (!ASSERT_EQ(test_result, 0, "offset 10")) + goto out; + +out: + skb_load_bytes__destroy(skel); +} diff --git a/tools/testing/selftests/bpf/progs/skb_load_bytes.c b/tools/testing/selftests/bpf/progs/skb_load_bytes.c new file mode 100644 index 000000000000..e4252fd973be --- /dev/null +++ b/tools/testing/selftests/bpf/progs/skb_load_bytes.c @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <linux/bpf.h> +#include <bpf/bpf_helpers.h> + +char _license[] SEC("license") = "GPL"; + +__u32 load_offset = 0; +int test_result = 0; + +SEC("tc") +int skb_process(struct __sk_buff *skb) +{ + char buf[16]; + + test_result = bpf_skb_load_bytes(skb, load_offset, buf, 10); + + return 0; +}
Use bpf_prog_test_run_opts to test the skb_load_bytes function. Tests the behavior when offset is greater than INT_MAX or a normal value. Signed-off-by: Liu Jian <liujian56@huawei.com> --- v2->v3: Change patch prefix to bpf-next. Use ASSERT_* calls .../selftests/bpf/prog_tests/skb_load_bytes.c | 45 +++++++++++++++++++ .../selftests/bpf/progs/skb_load_bytes.c | 19 ++++++++ 2 files changed, 64 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/skb_load_bytes.c create mode 100644 tools/testing/selftests/bpf/progs/skb_load_bytes.c