Retire progs/test_sock_addr.c
Subsystems (3)
cover Retire progs/test_sock_addr.c
This patch series migrates remaining tests from bpf/test_sock_addr.c to prog_tests/sock_addr.c and progs/verifier_sock_addr.c in order to fully retire the old-style test program and expands test coverage to test previously untested scenarios related to sockaddr hooks.
This is a continuation of the work started recently during the expansion of prog_tests/sock_addr.c.
=======
Patches
=======
* Patch 1 moves tests that check valid return values for recvmsg hooks into progs/verifier_sock_addr.c, a new addition to the verifier test suite.
* Patches 2-5 lay the groundwork for test migration, enabling prog_tests/sock_addr.c to handle more test dimensions.
* Patches 6-11 move existing tests to prog_tests/sock_addr.c.
* Patch 12 removes some redundant test cases.
* Patches 14-17 expand on existing test coverage.
Jordan Rife (17):
selftests/bpf: Migrate recvmsg* return code tests to
verifier_sock_addr.c
selftests/bpf: Use program name for skel load/destroy functions selftests/bpf: Handle LOAD_REJECT test cases selftests/bpf: Handle ATTACH_REJECT test cases selftests/bpf: Handle SYSCALL_EPERM and SYSCALL_ENOTSUPP test cases selftests/bpf: Migrate WILDCARD_IP test
selftests/bpf: Migrate sendmsg deny test cases selftests/bpf: Migrate sendmsg6 v4 mapped address tests selftests/bpf: Migrate wildcard destination rewrite test selftests/bpf: Migrate expected_attach_type tests selftests/bpf: Migrate ATTACH_REJECT test cases selftests/bpf: Remove redundant sendmsg test cases selftests/bpf: Retire test_sock_addr.(c|sh) selftests/bpf: Expand sockaddr program return value tests sefltests/bpf: Expand sockaddr hook deny tests selftests/bpf: Expand getsockname and getpeername tests selftests/bpf: Expand ATTACH_REJECT tests
tools/testing/selftests/bpf/.gitignore | 1 - tools/testing/selftests/bpf/Makefile | 4 +- .../selftests/bpf/prog_tests/sock_addr.c | 1821 +++++++++++++++-- .../selftests/bpf/prog_tests/verifier.c | 2 + .../testing/selftests/bpf/progs/bind4_prog.c | 6 + .../testing/selftests/bpf/progs/bind6_prog.c | 6 + .../selftests/bpf/progs/connect4_prog.c | 6 + .../selftests/bpf/progs/connect6_prog.c | 6 + .../selftests/bpf/progs/connect_unix_prog.c | 6 + .../selftests/bpf/progs/getpeername4_prog.c | 24 + .../selftests/bpf/progs/getpeername6_prog.c | 31 + .../selftests/bpf/progs/getsockname4_prog.c | 24 + .../selftests/bpf/progs/getsockname6_prog.c | 31 + .../selftests/bpf/progs/sendmsg4_prog.c | 6 + .../selftests/bpf/progs/sendmsg6_prog.c | 57 + .../selftests/bpf/progs/sendmsg_unix_prog.c | 6 + .../selftests/bpf/progs/verifier_sock_addr.c | 331 +++ tools/testing/selftests/bpf/test_sock_addr.c | 1140 ----------- tools/testing/selftests/bpf/test_sock_addr.sh | 58 - 19 files changed, 2142 insertions(+), 1424 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/getpeername4_prog.c create mode 100644 tools/testing/selftests/bpf/progs/getpeername6_prog.c create mode 100644 tools/testing/selftests/bpf/progs/getsockname4_prog.c create mode 100644 tools/testing/selftests/bpf/progs/getsockname6_prog.c create mode 100644 tools/testing/selftests/bpf/progs/verifier_sock_addr.c delete mode 100644 tools/testing/selftests/bpf/test_sock_addr.c delete mode 100755 tools/testing/selftests/bpf/test_sock_addr.sh
Signature · 1 line
2.45.0.118.g7fe29c98d7-goog
PATCH 1/17 selftests/bpf: Migrate recvmsg* return code tests to verifier_sock_addr.c
This set of tests check that the BPF verifier rejects programs with invalid return codes (recvmsg4 and recvmsg6 hooks can only return 1). This patch replaces the tests in test_sock_addr.c with verifier_sock_addr.c, a new verifier prog_tests for sockaddr hooks, in a step towards fully retiring test_sock_addr.c.
--- .../selftests/bpf/prog_tests/verifier.c | 2 + .../selftests/bpf/progs/verifier_sock_addr.c | 37 ++++++++++ tools/testing/selftests/bpf/test_sock_addr.c | 70 ------------------- 3 files changed, 39 insertions(+), 70 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/verifier_sock_addr.c
tools/testing/selftests/bpf/prog_tests/verifier.c +2 -0
@@ -66,6 +66,7 @@#include "verifier_sdiv.skel.h" #include "verifier_search_pruning.skel.h" #include "verifier_sock.skel.h" +#include "verifier_sock_addr.skel.h" #include "verifier_spill_fill.skel.h" #include "verifier_spin_lock.skel.h" #include "verifier_stack_ptr.skel.h"
@@ -181,6 +182,7 @@ void test_verifier_scalar_ids(void) { RUN(verifier_scalar_ids); }void test_verifier_sdiv (void ) {RUN (verifier_sdiv); }void test_verifier_search_pruning (void ) {RUN (verifier_search_pruning); }void test_verifier_sock (void ) {RUN (verifier_sock); } +void test_verifier_sock_addr (void ) {RUN (verifier_sock_addr); }void test_verifier_spill_fill (void ) {RUN (verifier_spill_fill); }void test_verifier_spin_lock (void ) {RUN (verifier_spin_lock); }void test_verifier_stack_ptr (void ) {RUN (verifier_stack_ptr); }
tools/testing/selftests/bpf/progs/verifier_sock_addr.c new file +37 -0
@@ -0,0 +1,37 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2024 Google LLC */ + +#include <linux/bpf.h> +#include <bpf/bpf_helpers.h> +#include <bpf_sockopt_helpers.h> +#include "bpf_misc.h" + +SEC("cgroup/recvmsg4") +__success +int recvmsg4_good_return_code (struct bpf_sock_addr *ctx) +{ +return 1 ; +} + +SEC("cgroup/recvmsg4") +__failure __msg("At program exit the register R0 has smin=0 smax=0 should have been in [1, 1]") +int recvmsg4_bad_return_code(struct bpf_sock_addr *ctx) +{ +return 0 ; +} + +SEC("cgroup/recvmsg6") +__success +int recvmsg6_good_return_code (struct bpf_sock_addr *ctx) +{ +return 1 ; +} + +SEC("cgroup/recvmsg6") +__failure __msg("At program exit the register R0 has smin=0 smax=0 should have been in [1, 1]") +int recvmsg6_bad_return_code(struct bpf_sock_addr *ctx) +{ +return 0 ; +} + +char _license[] SEC("license") = "GPL";
tools/testing/selftests/bpf/test_sock_addr.c +0 -70
88 lines not on this page · raw message
Signature · 1 line
2.45.0.118.g7fe29c98d7-goog
PATCH 2/17 selftests/bpf: Use program name for skel load/destroy functions
In reply to Jordan RifeIn preparation to migrate tests from bpf/test_sock_addr.c to sock_addr.c, update BPF_SKEL_FUNCS so that it generates functions based on prog_name instead of skel_name. This allows us to differentiate between programs in the same skeleton.
--- .../selftests/bpf/prog_tests/sock_addr.c | 96 ++++++++++--------- 1 file changed, 50 insertions(+), 46 deletions(-)
tools/testing/selftests/bpf/prog_tests/sock_addr.c +50 -46
@@ -357,7 +357,7 @@ struct sock_addr_test { };#define BPF_SKEL_FUNCS (skel_name, prog_name) \ -static void *skel_name##_load(int cgroup_fd) \ +static void *prog_name##_load(int cgroup_fd) \ { \ struct skel_name *skel; \ skel = skel_name##__open_and_load(); \
@@ -372,7 +372,7 @@ cleanup: \ skel_name##__destroy(skel); \return NULL ; \ } \ -static void skel_name##_destroy(void *skel) \ +static void prog_name##_destroy(void *skel) \ { \ skel_name##__destroy(skel); \ }
@@ -396,8 +396,8 @@ static struct sock_addr_test tests[] = { {SOCK_ADDR_TEST_BIND ,"bind4: bind (stream)" , - bind4_prog_load, - bind4_prog_destroy, + bind_v4_prog_load, + bind_v4_prog_destroy, &user_ops,AF_INET , SOCK_STREAM,
@@ -405,12 +405,13 @@ static struct sock_addr_test tests[] = {SERV4_PORT ,SERV4_REWRITE_IP ,SERV4_REWRITE_PORT , +NULL , }, {SOCK_ADDR_TEST_BIND ,"bind4: bind (dgram)" , - bind4_prog_load, - bind4_prog_destroy, + bind_v4_prog_load, + bind_v4_prog_destroy, &user_ops,AF_INET , SOCK_DGRAM,
@@ -418,12 +419,13 @@ static struct sock_addr_test tests[] = {SERV4_PORT ,SERV4_REWRITE_IP ,SERV4_REWRITE_PORT , +NULL , }, {SOCK_ADDR_TEST_BIND ,"bind6: bind (stream)" , - bind6_prog_load, - bind6_prog_destroy, + bind_v6_prog_load, + bind_v6_prog_destroy, &user_ops,AF_INET6 , SOCK_STREAM,
@@ -431,12 +433,13 @@ static struct sock_addr_test tests[] = {SERV6_PORT ,SERV6_REWRITE_IP ,SERV6_REWRITE_PORT , +NULL , }, {SOCK_ADDR_TEST_BIND ,"bind6: bind (dgram)" , - bind6_prog_load, - bind6_prog_destroy, + bind_v6_prog_load, + bind_v6_prog_destroy, &user_ops,AF_INET6 , SOCK_DGRAM,
@@ -444,14 +447,15 @@ static struct sock_addr_test tests[] = {SERV6_PORT ,SERV6_REWRITE_IP ,SERV6_REWRITE_PORT , +NULL , }, /* bind - kernel calls */ {SOCK_ADDR_TEST_BIND ,"bind4: kernel_bind (stream)" , - bind4_prog_load, - bind4_prog_destroy, + bind_v4_prog_load, + bind_v4_prog_destroy, &kern_ops_sock_sendmsg,AF_INET , SOCK_STREAM,
@@ -463,8 +467,8 @@ static struct sock_addr_test tests[] = { {SOCK_ADDR_TEST_BIND ,"bind4: kernel_bind (dgram)" , - bind4_prog_load, - bind4_prog_destroy, + bind_v4_prog_load, + bind_v4_prog_destroy, &kern_ops_sock_sendmsg,AF_INET , SOCK_DGRAM,
@@ -476,8 +480,8 @@ static struct sock_addr_test tests[] = { {SOCK_ADDR_TEST_BIND ,"bind6: kernel_bind (stream)" , - bind6_prog_load, - bind6_prog_destroy, + bind_v6_prog_load, + bind_v6_prog_destroy, &kern_ops_sock_sendmsg,AF_INET6 , SOCK_STREAM,
@@ -489,8 +493,8 @@ static struct sock_addr_test tests[] = { {SOCK_ADDR_TEST_BIND ,"bind6: kernel_bind (dgram)" , - bind6_prog_load, - bind6_prog_destroy, + bind_v6_prog_load, + bind_v6_prog_destroy, &kern_ops_sock_sendmsg,AF_INET6 , SOCK_DGRAM,
@@ -504,8 +508,8 @@ static struct sock_addr_test tests[] = { {SOCK_ADDR_TEST_CONNECT ,"connect4: connect (stream)" , - connect4_prog_load, - connect4_prog_destroy, + connect_v4_prog_load, + connect_v4_prog_destroy, &user_ops,AF_INET , SOCK_STREAM,
@@ -518,8 +522,8 @@ static struct sock_addr_test tests[] = { {SOCK_ADDR_TEST_CONNECT ,"connect4: connect (dgram)" , - connect4_prog_load, - connect4_prog_destroy, + connect_v4_prog_load, + connect_v4_prog_destroy, &user_ops,AF_INET , SOCK_DGRAM,
@@ -532,8 +536,8 @@ static struct sock_addr_test tests[] = { {SOCK_ADDR_TEST_CONNECT ,"connect6: connect (stream)" , - connect6_prog_load, - connect6_prog_destroy, + connect_v6_prog_load, + connect_v6_prog_destroy, &user_ops,AF_INET6 , SOCK_STREAM,
@@ -546,8 +550,8 @@ static struct sock_addr_test tests[] = { {SOCK_ADDR_TEST_CONNECT ,"connect6: connect (dgram)" , - connect6_prog_load, - connect6_prog_destroy, + connect_v6_prog_load, + connect_v6_prog_destroy, &user_ops,AF_INET6 , SOCK_DGRAM,
@@ -576,8 +580,8 @@ static struct sock_addr_test tests[] = { {SOCK_ADDR_TEST_CONNECT ,"connect4: kernel_connect (stream)" , - connect4_prog_load, - connect4_prog_destroy, + connect_v4_prog_load, + connect_v4_prog_destroy, &kern_ops_sock_sendmsg,AF_INET , SOCK_STREAM,
@@ -590,8 +594,8 @@ static struct sock_addr_test tests[] = { {SOCK_ADDR_TEST_CONNECT ,"connect4: kernel_connect (dgram)" , - connect4_prog_load, - connect4_prog_destroy, + connect_v4_prog_load, + connect_v4_prog_destroy, &kern_ops_sock_sendmsg,AF_INET , SOCK_DGRAM,
@@ -604,8 +608,8 @@ static struct sock_addr_test tests[] = { {SOCK_ADDR_TEST_CONNECT ,"connect6: kernel_connect (stream)" , - connect6_prog_load, - connect6_prog_destroy, + connect_v6_prog_load, + connect_v6_prog_destroy, &kern_ops_sock_sendmsg,AF_INET6 , SOCK_STREAM,
@@ -618,8 +622,8 @@ static struct sock_addr_test tests[] = { {SOCK_ADDR_TEST_CONNECT ,"connect6: kernel_connect (dgram)" , - connect6_prog_load, - connect6_prog_destroy, + connect_v6_prog_load, + connect_v6_prog_destroy, &kern_ops_sock_sendmsg,AF_INET6 , SOCK_DGRAM,
@@ -648,8 +652,8 @@ static struct sock_addr_test tests[] = { {SOCK_ADDR_TEST_SENDMSG ,"sendmsg4: sendmsg (dgram)" , - sendmsg4_prog_load, - sendmsg4_prog_destroy, + sendmsg_v4_prog_load, + sendmsg_v4_prog_destroy, &user_ops,AF_INET , SOCK_DGRAM,
@@ -662,8 +666,8 @@ static struct sock_addr_test tests[] = { {SOCK_ADDR_TEST_SENDMSG ,"sendmsg6: sendmsg (dgram)" , - sendmsg6_prog_load, - sendmsg6_prog_destroy, + sendmsg_v6_prog_load, + sendmsg_v6_prog_destroy, &user_ops,AF_INET6 , SOCK_DGRAM,
@@ -692,8 +696,8 @@ static struct sock_addr_test tests[] = { {SOCK_ADDR_TEST_SENDMSG ,"sendmsg4: sock_sendmsg (dgram)" , - sendmsg4_prog_load, - sendmsg4_prog_destroy, + sendmsg_v4_prog_load, + sendmsg_v4_prog_destroy, &kern_ops_sock_sendmsg,AF_INET , SOCK_DGRAM,
@@ -706,8 +710,8 @@ static struct sock_addr_test tests[] = { {SOCK_ADDR_TEST_SENDMSG ,"sendmsg6: sock_sendmsg (dgram)" , - sendmsg6_prog_load, - sendmsg6_prog_destroy, + sendmsg_v6_prog_load, + sendmsg_v6_prog_destroy, &kern_ops_sock_sendmsg,AF_INET6 , SOCK_DGRAM,
@@ -736,8 +740,8 @@ static struct sock_addr_test tests[] = { {SOCK_ADDR_TEST_SENDMSG ,"sendmsg4: kernel_sendmsg (dgram)" , - sendmsg4_prog_load, - sendmsg4_prog_destroy, + sendmsg_v4_prog_load, + sendmsg_v4_prog_destroy, &kern_ops_kernel_sendmsg,AF_INET , SOCK_DGRAM,
@@ -750,8 +754,8 @@ static struct sock_addr_test tests[] = { {SOCK_ADDR_TEST_SENDMSG ,"sendmsg6: kernel_sendmsg (dgram)" , - sendmsg6_prog_load, - sendmsg6_prog_destroy, + sendmsg_v6_prog_load, + sendmsg_v6_prog_destroy, &kern_ops_kernel_sendmsg,AF_INET6 , SOCK_DGRAM,
Signature · 1 line
2.45.0.118.g7fe29c98d7-goog
PATCH 3/17 selftests/bpf: Handle LOAD_REJECT test cases
In reply to Jordan RifeIn preparation to move test cases from bpf/test_sock_addr.c that expect LOAD_REJECT, this patch adds expected_attach_type and extends load_fn to accept an expected attach type and a flag indicating whether or not rejection is expected.
--- .../selftests/bpf/prog_tests/sock_addr.c | 103 +++++++++++++++++- 1 file changed, 98 insertions(+), 5 deletions(-)
tools/testing/selftests/bpf/prog_tests/sock_addr.c +98 -5
@@ -52,7 +52,9 @@ enum sock_addr_test_type { SOCK_ADDR_TEST_GETPEERNAME, }; -typedef void *(*load_fn )(int cgroup_fd); +typedef void *(*load_fn )(int cgroup_fd, +enum bpf_attach_type attach_type, +bool expect_reject);typedef void (*destroy_fn )(void *skel); static int cmp_addr(const struct sockaddr_storage *addr1, socklen_t addr1_len,
@@ -343,6 +345,7 @@ struct sock_addr_test {/* BPF prog properties */ load_fn loadfn;destroy_fn destroyfn; +enum bpf_attach_type attach_type;/* Socket operations */ struct sock_ops *ops;/* Socket properties */
@@ -354,15 +357,34 @@ struct sock_addr_test {const char *expected_addr;unsigned short expected_port;const char *expected_src_addr; +/* Expected test result */ +enum { +LOAD_REJECT , +ATTACH_REJECT , +SYSCALL_EPERM , +SYSCALL_ENOTSUPP , +SUCCESS , + } expected_result; };#define BPF_SKEL_FUNCS (skel_name, prog_name) \ -static void *prog_name##_load(int cgroup_fd) \ +static void *prog_name##_load(int cgroup_fd, \ + enum bpf_attach_type attach_type, \ + bool expect_reject) \ { \ - struct skel_name *skel; \ - skel = skel_name##__open_and_load(); \ + struct skel_name *skel = skel_name##__open(); \ if (!ASSERT_OK_PTR(skel, "skel_open")) \ goto cleanup; \ + if (!ASSERT_OK(bpf_program__set_expected_attach_type(skel->progs.prog_name, \ + attach_type), \ + "set_expected_attach_type")) \ + goto cleanup; \ + if (skel_name##__load(skel)) { \ + ASSERT_TRUE(expect_reject, "unexpected rejection"); \ + goto cleanup; \ + } \ + if (!ASSERT_FALSE(expect_reject, "expected rejection")) \ + goto cleanup; \ skel->links.prog_name = bpf_program__attach_cgroup( \ skel->progs.prog_name, cgroup_fd); \ if (!ASSERT_OK_PTR(skel->links.prog_name, "prog_attach")) \
@@ -398,6 +420,7 @@ static struct sock_addr_test tests[] = {"bind4: bind (stream)" , bind_v4_prog_load, bind_v4_prog_destroy, +BPF_CGROUP_INET4_BIND , &user_ops,AF_INET , SOCK_STREAM,
@@ -406,12 +429,14 @@ static struct sock_addr_test tests[] = {SERV4_REWRITE_IP ,SERV4_REWRITE_PORT ,NULL , +SUCCESS , }, {SOCK_ADDR_TEST_BIND ,"bind4: bind (dgram)" , bind_v4_prog_load, bind_v4_prog_destroy, +BPF_CGROUP_INET4_BIND , &user_ops,AF_INET , SOCK_DGRAM,
@@ -420,12 +445,14 @@ static struct sock_addr_test tests[] = {SERV4_REWRITE_IP ,SERV4_REWRITE_PORT ,NULL , +SUCCESS , }, {SOCK_ADDR_TEST_BIND ,"bind6: bind (stream)" , bind_v6_prog_load, bind_v6_prog_destroy, +BPF_CGROUP_INET6_BIND , &user_ops,AF_INET6 , SOCK_STREAM,
@@ -434,12 +461,14 @@ static struct sock_addr_test tests[] = {SERV6_REWRITE_IP ,SERV6_REWRITE_PORT ,NULL , +SUCCESS , }, {SOCK_ADDR_TEST_BIND ,"bind6: bind (dgram)" , bind_v6_prog_load, bind_v6_prog_destroy, +BPF_CGROUP_INET6_BIND , &user_ops,AF_INET6 , SOCK_DGRAM,
@@ -448,6 +477,7 @@ static struct sock_addr_test tests[] = {SERV6_REWRITE_IP ,SERV6_REWRITE_PORT ,NULL , + SUCCESS, },/* bind - kernel calls */
@@ -456,6 +486,7 @@ static struct sock_addr_test tests[] = {"bind4: kernel_bind (stream)" , bind_v4_prog_load, bind_v4_prog_destroy, +BPF_CGROUP_INET4_BIND , &kern_ops_sock_sendmsg,AF_INET , SOCK_STREAM,
@@ -463,12 +494,15 @@ static struct sock_addr_test tests[] = {SERV4_PORT ,SERV4_REWRITE_IP ,SERV4_REWRITE_PORT , +NULL , +SUCCESS , }, {SOCK_ADDR_TEST_BIND ,"bind4: kernel_bind (dgram)" , bind_v4_prog_load, bind_v4_prog_destroy, +BPF_CGROUP_INET4_BIND , &kern_ops_sock_sendmsg,AF_INET , SOCK_DGRAM,
@@ -476,12 +510,15 @@ static struct sock_addr_test tests[] = {SERV4_PORT ,SERV4_REWRITE_IP ,SERV4_REWRITE_PORT , +NULL , +SUCCESS , }, {SOCK_ADDR_TEST_BIND ,"bind6: kernel_bind (stream)" , bind_v6_prog_load, bind_v6_prog_destroy, +BPF_CGROUP_INET6_BIND , &kern_ops_sock_sendmsg,AF_INET6 , SOCK_STREAM,
@@ -489,12 +526,15 @@ static struct sock_addr_test tests[] = {SERV6_PORT ,SERV6_REWRITE_IP ,SERV6_REWRITE_PORT , +NULL , +SUCCESS , }, {SOCK_ADDR_TEST_BIND ,"bind6: kernel_bind (dgram)" , bind_v6_prog_load, bind_v6_prog_destroy, +BPF_CGROUP_INET6_BIND , &kern_ops_sock_sendmsg,AF_INET6 , SOCK_DGRAM,
@@ -502,6 +542,8 @@ static struct sock_addr_test tests[] = {SERV6_PORT ,SERV6_REWRITE_IP ,SERV6_REWRITE_PORT , +NULL , + SUCCESS, },/* connect - system calls */
@@ -510,6 +552,7 @@ static struct sock_addr_test tests[] = {"connect4: connect (stream)" , connect_v4_prog_load, connect_v4_prog_destroy, +BPF_CGROUP_INET4_CONNECT , &user_ops,AF_INET , SOCK_STREAM,
@@ -518,12 +561,14 @@ static struct sock_addr_test tests[] = {SERV4_REWRITE_IP ,SERV4_REWRITE_PORT ,SRC4_REWRITE_IP , +SUCCESS , }, {SOCK_ADDR_TEST_CONNECT ,"connect4: connect (dgram)" , connect_v4_prog_load, connect_v4_prog_destroy, +BPF_CGROUP_INET4_CONNECT , &user_ops,AF_INET , SOCK_DGRAM,
@@ -532,12 +577,14 @@ static struct sock_addr_test tests[] = {SERV4_REWRITE_IP ,SERV4_REWRITE_PORT ,SRC4_REWRITE_IP , +SUCCESS , }, {SOCK_ADDR_TEST_CONNECT ,"connect6: connect (stream)" , connect_v6_prog_load, connect_v6_prog_destroy, +BPF_CGROUP_INET6_CONNECT , &user_ops,AF_INET6 , SOCK_STREAM,
@@ -546,12 +593,14 @@ static struct sock_addr_test tests[] = {SERV6_REWRITE_IP ,SERV6_REWRITE_PORT ,SRC6_REWRITE_IP , +SUCCESS , }, {SOCK_ADDR_TEST_CONNECT ,"connect6: connect (dgram)" , connect_v6_prog_load, connect_v6_prog_destroy, +BPF_CGROUP_INET6_CONNECT , &user_ops,AF_INET6 , SOCK_DGRAM,
@@ -560,12 +609,14 @@ static struct sock_addr_test tests[] = {SERV6_REWRITE_IP ,SERV6_REWRITE_PORT ,SRC6_REWRITE_IP , +SUCCESS , }, {SOCK_ADDR_TEST_CONNECT ,"connect_unix: connect (stream)" , connect_unix_prog_load, connect_unix_prog_destroy, +BPF_CGROUP_UNIX_CONNECT , &user_ops,AF_UNIX , SOCK_STREAM,
@@ -574,6 +625,7 @@ static struct sock_addr_test tests[] = {SERVUN_REWRITE_ADDRESS ,0 ,NULL , + SUCCESS, },/* connect - kernel calls */
@@ -582,6 +634,7 @@ static struct sock_addr_test tests[] = {"connect4: kernel_connect (stream)" , connect_v4_prog_load, connect_v4_prog_destroy, +BPF_CGROUP_INET4_CONNECT , &kern_ops_sock_sendmsg,AF_INET , SOCK_STREAM,
@@ -590,12 +643,14 @@ static struct sock_addr_test tests[] = {SERV4_REWRITE_IP ,SERV4_REWRITE_PORT ,SRC4_REWRITE_IP , +SUCCESS , }, {SOCK_ADDR_TEST_CONNECT ,"connect4: kernel_connect (dgram)" , connect_v4_prog_load, connect_v4_prog_destroy, +BPF_CGROUP_INET4_CONNECT , &kern_ops_sock_sendmsg,AF_INET , SOCK_DGRAM,
@@ -604,12 +659,14 @@ static struct sock_addr_test tests[] = {SERV4_REWRITE_IP ,SERV4_REWRITE_PORT ,SRC4_REWRITE_IP , +SUCCESS , }, {SOCK_ADDR_TEST_CONNECT ,"connect6: kernel_connect (stream)" , connect_v6_prog_load, connect_v6_prog_destroy, +BPF_CGROUP_INET6_CONNECT , &kern_ops_sock_sendmsg,AF_INET6 , SOCK_STREAM,
@@ -618,12 +675,14 @@ static struct sock_addr_test tests[] = {SERV6_REWRITE_IP ,SERV6_REWRITE_PORT ,SRC6_REWRITE_IP , +SUCCESS , }, {SOCK_ADDR_TEST_CONNECT ,"connect6: kernel_connect (dgram)" , connect_v6_prog_load, connect_v6_prog_destroy, +BPF_CGROUP_INET6_CONNECT , &kern_ops_sock_sendmsg,AF_INET6 , SOCK_DGRAM,
@@ -632,12 +691,14 @@ static struct sock_addr_test tests[] = {SERV6_REWRITE_IP ,SERV6_REWRITE_PORT ,SRC6_REWRITE_IP , +SUCCESS , }, {SOCK_ADDR_TEST_CONNECT ,"connect_unix: kernel_connect (dgram)" , connect_unix_prog_load, connect_unix_prog_destroy, +BPF_CGROUP_UNIX_CONNECT , &kern_ops_sock_sendmsg,AF_UNIX , SOCK_STREAM,
@@ -646,6 +707,7 @@ static struct sock_addr_test tests[] = {SERVUN_REWRITE_ADDRESS ,0 ,NULL , + SUCCESS, },/* sendmsg - system calls */
@@ -654,6 +716,7 @@ static struct sock_addr_test tests[] = {"sendmsg4: sendmsg (dgram)" , sendmsg_v4_prog_load, sendmsg_v4_prog_destroy, +BPF_CGROUP_UDP4_SENDMSG , &user_ops,AF_INET , SOCK_DGRAM,
@@ -662,12 +725,14 @@ static struct sock_addr_test tests[] = {SERV4_REWRITE_IP ,SERV4_REWRITE_PORT ,SRC4_REWRITE_IP , +SUCCESS , }, {SOCK_ADDR_TEST_SENDMSG ,"sendmsg6: sendmsg (dgram)" , sendmsg_v6_prog_load, sendmsg_v6_prog_destroy, +BPF_CGROUP_UDP6_SENDMSG , &user_ops,AF_INET6 , SOCK_DGRAM,
@@ -676,12 +741,14 @@ static struct sock_addr_test tests[] = {SERV6_REWRITE_IP ,SERV6_REWRITE_PORT ,SRC6_REWRITE_IP , +SUCCESS , }, {SOCK_ADDR_TEST_SENDMSG ,"sendmsg_unix: sendmsg (dgram)" , sendmsg_unix_prog_load, sendmsg_unix_prog_destroy, +BPF_CGROUP_UNIX_SENDMSG , &user_ops,AF_UNIX , SOCK_DGRAM,
@@ -690,6 +757,7 @@ static struct sock_addr_test tests[] = {SERVUN_REWRITE_ADDRESS ,0 ,NULL , + SUCCESS, },/* sendmsg - kernel calls (sock_sendmsg) */
@@ -698,6 +766,7 @@ static struct sock_addr_test tests[] = {"sendmsg4: sock_sendmsg (dgram)" , sendmsg_v4_prog_load, sendmsg_v4_prog_destroy, +BPF_CGROUP_UDP4_SENDMSG , &kern_ops_sock_sendmsg,AF_INET , SOCK_DGRAM,
@@ -706,12 +775,14 @@ static struct sock_addr_test tests[] = {SERV4_REWRITE_IP ,SERV4_REWRITE_PORT ,SRC4_REWRITE_IP , +SUCCESS , }, {SOCK_ADDR_TEST_SENDMSG ,"sendmsg6: sock_sendmsg (dgram)" , sendmsg_v6_prog_load, sendmsg_v6_prog_destroy, +BPF_CGROUP_UDP6_SENDMSG , &kern_ops_sock_sendmsg,AF_INET6 , SOCK_DGRAM,
@@ -720,12 +791,14 @@ static struct sock_addr_test tests[] = {SERV6_REWRITE_IP ,SERV6_REWRITE_PORT ,SRC6_REWRITE_IP , +SUCCESS , }, {SOCK_ADDR_TEST_SENDMSG ,"sendmsg_unix: sock_sendmsg (dgram)" , sendmsg_unix_prog_load, sendmsg_unix_prog_destroy, +BPF_CGROUP_UNIX_SENDMSG , &kern_ops_sock_sendmsg,AF_UNIX , SOCK_DGRAM,
@@ -734,6 +807,7 @@ static struct sock_addr_test tests[] = {SERVUN_REWRITE_ADDRESS ,0 ,NULL , + SUCCESS, },/* sendmsg - kernel calls (kernel_sendmsg) */
@@ -742,6 +816,7 @@ static struct sock_addr_test tests[] = {"sendmsg4: kernel_sendmsg (dgram)" , sendmsg_v4_prog_load, sendmsg_v4_prog_destroy, +BPF_CGROUP_UDP4_SENDMSG , &kern_ops_kernel_sendmsg,AF_INET , SOCK_DGRAM,
@@ -750,12 +825,14 @@ static struct sock_addr_test tests[] = {SERV4_REWRITE_IP ,SERV4_REWRITE_PORT ,SRC4_REWRITE_IP , +SUCCESS , }, {SOCK_ADDR_TEST_SENDMSG ,"sendmsg6: kernel_sendmsg (dgram)" , sendmsg_v6_prog_load, sendmsg_v6_prog_destroy, +BPF_CGROUP_UDP6_SENDMSG , &kern_ops_kernel_sendmsg,AF_INET6 , SOCK_DGRAM,
@@ -764,12 +841,14 @@ static struct sock_addr_test tests[] = {SERV6_REWRITE_IP ,SERV6_REWRITE_PORT ,SRC6_REWRITE_IP , +SUCCESS , }, {SOCK_ADDR_TEST_SENDMSG ,"sendmsg_unix: sock_sendmsg (dgram)" , sendmsg_unix_prog_load, sendmsg_unix_prog_destroy, +BPF_CGROUP_UNIX_SENDMSG , &kern_ops_kernel_sendmsg,AF_UNIX , SOCK_DGRAM,
@@ -778,6 +857,7 @@ static struct sock_addr_test tests[] = {SERVUN_REWRITE_ADDRESS ,0 ,NULL , + SUCCESS, },/* recvmsg - system calls */
@@ -786,6 +866,7 @@ static struct sock_addr_test tests[] = {"recvmsg4: recvfrom (dgram)" , recvmsg4_prog_load, recvmsg4_prog_destroy, +BPF_CGROUP_UDP4_RECVMSG , &user_ops,AF_INET , SOCK_DGRAM,
@@ -794,12 +875,14 @@ static struct sock_addr_test tests[] = {SERV4_REWRITE_IP ,SERV4_REWRITE_PORT ,SERV4_IP , +SUCCESS , }, {SOCK_ADDR_TEST_RECVMSG ,"recvmsg6: recvfrom (dgram)" , recvmsg6_prog_load, recvmsg6_prog_destroy, +BPF_CGROUP_UDP6_RECVMSG , &user_ops,AF_INET6 , SOCK_DGRAM,
@@ -808,12 +891,14 @@ static struct sock_addr_test tests[] = {SERV6_REWRITE_IP ,SERV6_REWRITE_PORT ,SERV6_IP , +SUCCESS , }, {SOCK_ADDR_TEST_RECVMSG ,"recvmsg_unix: recvfrom (dgram)" , recvmsg_unix_prog_load, recvmsg_unix_prog_destroy, +BPF_CGROUP_UNIX_RECVMSG , &user_ops,AF_UNIX , SOCK_DGRAM,
@@ -822,12 +907,14 @@ static struct sock_addr_test tests[] = {SERVUN_REWRITE_ADDRESS ,0 ,SERVUN_ADDRESS , +SUCCESS , }, {SOCK_ADDR_TEST_RECVMSG ,"recvmsg_unix: recvfrom (stream)" , recvmsg_unix_prog_load, recvmsg_unix_prog_destroy, +BPF_CGROUP_UNIX_RECVMSG , &user_ops,AF_UNIX , SOCK_STREAM,
@@ -836,6 +923,7 @@ static struct sock_addr_test tests[] = {SERVUN_REWRITE_ADDRESS ,0 ,SERVUN_ADDRESS , + SUCCESS, },/* getsockname - system calls */
@@ -844,6 +932,7 @@ static struct sock_addr_test tests[] = {"getsockname_unix" , getsockname_unix_prog_load, getsockname_unix_prog_destroy, +BPF_CGROUP_UNIX_GETSOCKNAME , &user_ops,AF_UNIX , SOCK_STREAM,
@@ -852,6 +941,7 @@ static struct sock_addr_test tests[] = {SERVUN_REWRITE_ADDRESS ,0 ,NULL , + SUCCESS, },/* getpeername - system calls */
@@ -860,6 +950,7 @@ static struct sock_addr_test tests[] = {"getpeername_unix" , getpeername_unix_prog_load, getpeername_unix_prog_destroy, +BPF_CGROUP_UNIX_GETPEERNAME , &user_ops,AF_UNIX , SOCK_STREAM,
@@ -868,6 +959,7 @@ static struct sock_addr_test tests[] = { SERVUN_REWRITE_ADDRESS, 0, NULL, + SUCCESS, }, };
@@ -1249,7 +1341,8 @@ void test_sock_addr(void)if (!test__start_subtest (test->name))continue ; - skel = test->loadfn (cgroup_fd); + skel = test->loadfn (cgroup_fd, test->attach_type, + test->expected_result ==LOAD_REJECT );if (!skel)continue ;
Signature · 1 line
2.45.0.118.g7fe29c98d7-goog
PATCH 4/17 selftests/bpf: Handle ATTACH_REJECT test cases
In reply to Jordan RifeIn preparation to move test cases from bpf/test_sock_addr.c that expect ATTACH_REJECT, this patch adds BPF_SKEL_FUNCS_RAW to generate load and destroy functions that use bpf_prog_attach() to control the attach_type.
The normal load functions use bpf_program__attach_cgroup which does not have the same degree of control over the attach type, as bpf_program_attach_fd() calls bpf_link_create() with the attach type extracted from prog using bpf_program__expected_attach_type(). It is currently not possible to modify the attach type before bpf_program__attach_cgroup() is called, since bpf_program__set_expected_attach_type() has no effect after the program is loaded.
--- .../selftests/bpf/prog_tests/sock_addr.c | 35 ++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/sock_addr.c +34 -1
@@ -367,6 +367,38 @@ struct sock_addr_test { } expected_result; }; +#define BPF_SKEL_FUNCS_RAW (skel_name, prog_name) \ +static void *prog_name##_load_raw(int cgroup_fd, \ + enum bpf_attach_type attach_type, \ + bool expect_reject) \ +{ \ + struct skel_name *skel = skel_name##__open(); \ + int prog_fd = -1; \ + if (!ASSERT_OK_PTR(skel, "skel_open")) \ + goto cleanup; \ + if (!ASSERT_OK(skel_name##__load(skel), "load")) \ + goto cleanup; \ + prog_fd = bpf_program__fd(skel->progs.prog_name); \ + if (!ASSERT_GT(prog_fd, 0, "prog_fd")) \ + goto cleanup; \ + if (bpf_prog_attach(prog_fd, cgroup_fd, attach_type, \ + BPF_F_ALLOW_OVERRIDE), "bpf_prog_attach") { \ + ASSERT_TRUE(expect_reject, "unexpected rejection"); \ + goto cleanup; \ + } \ + if (!ASSERT_FALSE(expect_reject, "expected rejection")) \ + goto cleanup; \ +cleanup: \ + if (prog_fd > 0) \ + bpf_prog_detach(cgroup_fd, attach_type); \ + skel_name##__destroy(skel); \ + return NULL; \ +} \ +static void prog_name##_destroy_raw(void *progfd) \ +{ \ +/* No-op. *_load_raw does all cleanup. */ \ +} \ +#define BPF_SKEL_FUNCS (skel_name, prog_name) \ static void *prog_name##_load(int cgroup_fd, \ enum bpf_attach_type attach_type, \
@@ -1342,7 +1374,8 @@ void test_sock_addr(void)continue ; skel = test->loadfn (cgroup_fd, test->attach_type, - test->expected_result ==LOAD_REJECT ); + test->expected_result ==LOAD_REJECT || + test->expected_result ==ATTACH_REJECT );if (!skel)continue ;
Signature · 1 line
2.45.0.118.g7fe29c98d7-goog
PATCH 5/17 selftests/bpf: Handle SYSCALL_EPERM and SYSCALL_ENOTSUPP test cases
In reply to Jordan RifeIn preparation to move test cases from bpf/test_sock_addr.c that expect system calls to return ENOTSUPP or EPERM, this patch propagates errno from relevant system calls up to test_sock_addr() where the result can be checked.
--- .../selftests/bpf/prog_tests/sock_addr.c | 78 ++++++++++++++----- 1 file changed, 58 insertions(+), 20 deletions(-)
tools/testing/selftests/bpf/prog_tests/sock_addr.c +58 -20
@@ -19,6 +19,10 @@#include "getpeername_unix_prog.skel.h" #include "network_helpers.h" +#ifndef ENOTSUPP +# define ENOTSUPP 524 +#endif +#define TEST_NS "sock_addr"#define TEST_IF_PREFIX "test_sock_addr"#define TEST_IPV4 "127.0.0.4"
@@ -43,6 +47,8 @@#define SERVUN_REWRITE_ADDRESS "bpf_cgroup_unix_test_rewrite"#define SRCUN_ADDRESS "bpf_cgroup_unix_test_src" +#define save_errno_do (op) ({ int __save = errno; op; errno = __save; }) +enum sock_addr_test_type {SOCK_ADDR_TEST_BIND ,SOCK_ADDR_TEST_CONNECT ,
@@ -98,6 +104,7 @@ static int run_bpf_prog(const char *prog_name, void *ctx, int ctx_size) goto err; err = topts.retval; + errno = -topts.retval; goto out; err: err =-1 ;
@@ -221,8 +228,7 @@ int kernel_connect_to_addr(int type, const struct sockaddr_storage *addr, sockle "kernel_init_sock")) goto err; -if (!ASSERT_OK (kernel_connect ((struct sockaddr *)addr, addrlen), -"kernel_connect" )) +if (kernel_connect ((struct sockaddr *)addr, addrlen) <0 ) goto err;/* Test code expects a "file descriptor" on success. */
@@ -230,7 +236,7 @@ int kernel_connect_to_addr(int type, const struct sockaddr_storage *addr, sockle goto out; err: err =-1 ; -ASSERT_OK (kernel_close_sock (0 ),"kernel_close_sock" ); +save_errno_do (ASSERT_OK (kernel_close_sock (0 ),"kernel_close_sock" )); out:return err; }
@@ -248,8 +254,7 @@ int kernel_start_server(int family, int type, const char *addr_str, __u16 port,if (make_sockaddr (family, addr_str, port, &addr, &addrlen)) goto err; -if (!ASSERT_OK (kernel_bind (0 , (struct sockaddr *)&addr, addrlen), -"kernel_bind" )) +if (kernel_bind (0 , (struct sockaddr *)&addr, addrlen) <0 ) goto err;if (type ==SOCK_STREAM ) {
@@ -262,7 +267,7 @@ int kernel_start_server(int family, int type, const char *addr_str, __u16 port, goto out; err: err =-1 ; -ASSERT_OK (kernel_close_sock (0 ),"kernel_close_sock" ); +save_errno_do (ASSERT_OK (kernel_close_sock (0 ),"kernel_close_sock" )); out:return err; }
@@ -1066,7 +1071,7 @@ static void unload_sock_addr_kern(void)sock_addr_kern__destroy (skel); } -static void test_bind (struct sock_addr_test *test) +static int test_bind (struct sock_addr_test *test) {struct sockaddr_storage expected_addr;socklen_t expected_addr_len =sizeof (struct sockaddr_storage );
@@ -1075,8 +1080,10 @@ static void test_bind(struct sock_addr_test *test) serv = test->ops->start_server (test->socket_family, test->socket_type, test->requested_addr, test->requested_port,0 ); -if (!ASSERT_GE (serv,0 ,"start_server" )) - goto cleanup; +if (serv <0 ) { + err = errno; + goto err; + } err = make_sockaddr(test->socket_family, test->expected_addr, test->expected_port,
@@ -1095,13 +1102,17 @@ static void test_bind(struct sock_addr_test *test) goto cleanup; cleanup: + err =0 ; +err:if (client !=-1 )close (client);if (serv !=-1 ) test->ops->close (serv); + +return err; } -static void test_connect (struct sock_addr_test *test) +static int test_connect (struct sock_addr_test *test) {struct sockaddr_storage addr, expected_addr, expected_src_addr; socklen_t addr_len = sizeof(struct sockaddr_storage),
@@ -1121,8 +1132,10 @@ static void test_connect(struct sock_addr_test *test) client = test->ops->connect_to_addr (test->socket_type, &addr, addr_len,NULL ); -if (!ASSERT_GE (client,0 ,"connect_to_addr" )) - goto cleanup; +if (client <0 ) { + err = errno; + goto err; + } err =make_sockaddr (test->socket_family, test->expected_addr, test->expected_port, &expected_addr, &expected_addr_len);
@@ -1149,13 +1162,17 @@ static void test_connect(struct sock_addr_test *test) goto cleanup; } cleanup: + err =0 ; +err:if (client !=-1 ) test->ops->close (client);if (serv !=-1 )close (serv); + +return err; } -static void test_xmsg (struct sock_addr_test *test) +static int test_xmsg (struct sock_addr_test *test) {struct sockaddr_storage addr, src_addr; socklen_t addr_len = sizeof(struct sockaddr_storage),
@@ -1196,6 +1213,11 @@ static void test_xmsg(struct sock_addr_test *test)if (test->socket_type ==SOCK_DGRAM ) { err = test->ops->sendmsg (client, (struct sockaddr *)&addr, addr_len, &data,sizeof (data)); +if (err <0 ) { + err = errno; + goto err; + } +if (!ASSERT_EQ (err,sizeof (data),"sendmsg" )) goto cleanup; }else {
@@ -1245,13 +1267,17 @@ static void test_xmsg(struct sock_addr_test *test) } cleanup: + err =0 ; +err:if (client !=-1 ) test->ops->close (client);if (serv !=-1 )close (serv); + +return err; } -static void test_getsockname (struct sock_addr_test *test) +static int test_getsockname (struct sock_addr_test *test) {struct sockaddr_storage expected_addr;socklen_t expected_addr_len =sizeof (struct sockaddr_storage );
@@ -1275,9 +1301,11 @@ static void test_getsockname(struct sock_addr_test *test) cleanup:if (serv !=-1 ) test->ops->close (serv); + +return 0 ; } -static void test_getpeername (struct sock_addr_test *test) +static int test_getpeername (struct sock_addr_test *test) {struct sockaddr_storage addr, expected_addr; socklen_t addr_len = sizeof(struct sockaddr_storage),
@@ -1314,6 +1342,8 @@ static void test_getpeername(struct sock_addr_test *test) test->ops->close (client);if (serv !=-1 )close (serv); + +return 0 ; }static int setup_test_env (struct nstoken **tok)
@@ -1369,6 +1399,7 @@ void test_sock_addr(void)for (size_t i =0 ; i <ARRAY_SIZE (tests); ++i) {struct sock_addr_test *test = &tests[i]; +int err;if (!test__start_subtest (test->name))continue ;
@@ -1385,26 +1416,33 @@ void test_sock_addr(void)* the future. */ case SOCK_ADDR_TEST_BIND : -test_bind (test); + err =test_bind (test);break ;case SOCK_ADDR_TEST_CONNECT : -test_connect (test); + err =test_connect (test);break ;case SOCK_ADDR_TEST_SENDMSG :case SOCK_ADDR_TEST_RECVMSG : -test_xmsg (test); + err =test_xmsg (test);break ;case SOCK_ADDR_TEST_GETSOCKNAME : -test_getsockname (test); + err =test_getsockname (test);break ;case SOCK_ADDR_TEST_GETPEERNAME : -test_getpeername (test); + err =test_getpeername (test);break ;default :ASSERT_TRUE (false,"Unknown sock addr test type" );break ; } +if (test->expected_result ==SYSCALL_EPERM ) +ASSERT_EQ (err,EPERM ,"socket operation returns EPERM" ); +else if (test->expected_result ==SYSCALL_ENOTSUPP ) +ASSERT_EQ (err,ENOTSUPP ,"socket operation returns ENOTSUPP" ); +else if (test->expected_result ==SUCCESS ) +ASSERT_OK (err,"socket operation succeeds" ); + test->destroyfn (skel); }
Signature · 1 line
2.45.0.118.g7fe29c98d7-goog
PATCH 6/17 selftests/bpf: Migrate WILDCARD_IP test
In reply to Jordan RifeMove wildcard IP sendmsg test case out of bpf/test_sock_addr.c into prog_tests/sock_addr.c.
--- .../selftests/bpf/prog_tests/sock_addr.c | 50 +++++++++++++++++++ .../selftests/bpf/progs/sendmsg6_prog.c | 6 +++ tools/testing/selftests/bpf/test_sock_addr.c | 20 -------- 3 files changed, 56 insertions(+), 20 deletions(-)
tools/testing/selftests/bpf/prog_tests/sock_addr.c +50 -0
@@ -40,6 +40,7 @@#define SERV6_V4MAPPED_IP "::ffff:192.168.0.4"#define SRC6_IP "::1"#define SRC6_REWRITE_IP TEST_IPV6 +#define WILDCARD6_IP "::"#define SERV6_PORT 6060#define SERV6_REWRITE_PORT 6666
@@ -443,6 +444,7 @@ BPF_SKEL_FUNCS(connect6_prog, connect_v6_prog);BPF_SKEL_FUNCS (connect_unix_prog, connect_unix_prog);BPF_SKEL_FUNCS (sendmsg4_prog, sendmsg_v4_prog);BPF_SKEL_FUNCS (sendmsg6_prog, sendmsg_v6_prog); +BPF_SKEL_FUNCS (sendmsg6_prog, sendmsg_v6_preserve_dst_prog);BPF_SKEL_FUNCS (sendmsg_unix_prog, sendmsg_unix_prog);BPF_SKEL_FUNCS (recvmsg4_prog, recvmsg4_prog);BPF_SKEL_FUNCS (recvmsg6_prog, recvmsg6_prog);
@@ -780,6 +782,22 @@ static struct sock_addr_test tests[] = {SRC6_REWRITE_IP ,SUCCESS , }, + { +SOCK_ADDR_TEST_SENDMSG , +"sendmsg6: sendmsg [::] (BSD'ism) (dgram)" , + sendmsg_v6_preserve_dst_prog_load, + sendmsg_v6_preserve_dst_prog_destroy, +BPF_CGROUP_UDP6_SENDMSG , + &user_ops, +AF_INET6 , +SOCK_DGRAM , +WILDCARD6_IP , +SERV6_PORT , +SERV6_REWRITE_IP , +SERV6_PORT , +SRC6_IP , +SUCCESS , + }, {SOCK_ADDR_TEST_SENDMSG , "sendmsg_unix: sendmsg (dgram)",
@@ -830,6 +848,22 @@ static struct sock_addr_test tests[] = {SRC6_REWRITE_IP ,SUCCESS , }, + { +SOCK_ADDR_TEST_SENDMSG , +"sendmsg6: sock_sendmsg [::] (BSD'ism) (dgram)" , + sendmsg_v6_preserve_dst_prog_load, + sendmsg_v6_preserve_dst_prog_destroy, +BPF_CGROUP_UDP6_SENDMSG , + &kern_ops_sock_sendmsg, +AF_INET6 , +SOCK_DGRAM , +WILDCARD6_IP , +SERV6_PORT , +SERV6_REWRITE_IP , +SERV6_PORT , +SRC6_IP , +SUCCESS , + }, {SOCK_ADDR_TEST_SENDMSG , "sendmsg_unix: sock_sendmsg (dgram)",
@@ -880,6 +914,22 @@ static struct sock_addr_test tests[] = {SRC6_REWRITE_IP ,SUCCESS , }, + { +SOCK_ADDR_TEST_SENDMSG , +"sendmsg6: kernel_sendmsg [::] (BSD'ism) (dgram)" , + sendmsg_v6_preserve_dst_prog_load, + sendmsg_v6_preserve_dst_prog_destroy, +BPF_CGROUP_UDP6_SENDMSG , + &kern_ops_kernel_sendmsg, +AF_INET6 , +SOCK_DGRAM , +WILDCARD6_IP , +SERV6_PORT , +SERV6_REWRITE_IP , +SERV6_PORT , +SRC6_IP , +SUCCESS , + }, {SOCK_ADDR_TEST_SENDMSG , "sendmsg_unix: sock_sendmsg (dgram)",
tools/testing/selftests/bpf/progs/sendmsg6_prog.c +6 -0
@@ -59,4 +59,10 @@ int sendmsg_v6_prog(struct bpf_sock_addr *ctx)return 1 ; } +SEC("cgroup/sendmsg6") +int sendmsg_v6_preserve_dst_prog (struct bpf_sock_addr *ctx) +{ +return 1 ; +} + char _license[] SEC("license") = "GPL";
tools/testing/selftests/bpf/test_sock_addr.c +0 -20
@@ -92,7 +92,6 @@ static int bind4_prog_load(const struct sock_addr_test *test);static int bind6_prog_load (const struct sock_addr_test *test);static int connect4_prog_load (const struct sock_addr_test *test);static int connect6_prog_load (const struct sock_addr_test *test); -static int sendmsg_allow_prog_load (const struct sock_addr_test *test);static int sendmsg_deny_prog_load (const struct sock_addr_test *test);static int sendmsg4_rw_asm_prog_load (const struct sock_addr_test *test);static int sendmsg6_rw_asm_prog_load (const struct sock_addr_test *test);
@@ -343,20 +342,6 @@ static struct sock_addr_test tests[] = {SRC6_REWRITE_IP ,SUCCESS , }, - { -"sendmsg6: preserve dst IP = [::] (BSD'ism)" , - sendmsg_allow_prog_load, -BPF_CGROUP_UDP6_SENDMSG , -BPF_CGROUP_UDP6_SENDMSG , -AF_INET6 , -SOCK_DGRAM , -WILDCARD6_IP , -SERV6_PORT , -SERV6_REWRITE_IP , -SERV6_PORT , -SRC6_IP , -SUCCESS , - }, {"sendmsg6: deny call" , sendmsg_deny_prog_load,
@@ -457,11 +442,6 @@ static int xmsg_ret_only_prog_load(const struct sock_addr_test *test,return load_insns (test, insns,ARRAY_SIZE (insns)); } -static int sendmsg_allow_prog_load (const struct sock_addr_test *test) -{ -return xmsg_ret_only_prog_load (test,/*rc*/ 1 ); -} -static int sendmsg_deny_prog_load (const struct sock_addr_test *test) {return xmsg_ret_only_prog_load (test,/*rc*/ 0 );
Signature · 1 line
2.45.0.118.g7fe29c98d7-goog
PATCH 7/17 selftests/bpf: Migrate sendmsg deny test cases
In reply to Jordan RifeThis set of tests checks that sendmsg calls are rejected (return -EPERM) when the sendmsg* hook returns 0. Replace those in bpf/test_sock_addr.c with corresponding tests in prog_tests/sock_addr.c.
--- .../selftests/bpf/prog_tests/sock_addr.c | 98 +++++++++++++++++++ .../selftests/bpf/progs/sendmsg4_prog.c | 6 ++ .../selftests/bpf/progs/sendmsg6_prog.c | 6 ++ tools/testing/selftests/bpf/test_sock_addr.c | 45 --------- 4 files changed, 110 insertions(+), 45 deletions(-)
tools/testing/selftests/bpf/prog_tests/sock_addr.c +98 -0
@@ -443,7 +443,9 @@ BPF_SKEL_FUNCS(connect4_prog, connect_v4_prog);BPF_SKEL_FUNCS (connect6_prog, connect_v6_prog);BPF_SKEL_FUNCS (connect_unix_prog, connect_unix_prog);BPF_SKEL_FUNCS (sendmsg4_prog, sendmsg_v4_prog); +BPF_SKEL_FUNCS (sendmsg4_prog, sendmsg_v4_deny_prog);BPF_SKEL_FUNCS (sendmsg6_prog, sendmsg_v6_prog); +BPF_SKEL_FUNCS (sendmsg6_prog, sendmsg_v6_deny_prog);BPF_SKEL_FUNCS (sendmsg6_prog, sendmsg_v6_preserve_dst_prog);BPF_SKEL_FUNCS (sendmsg_unix_prog, sendmsg_unix_prog);BPF_SKEL_FUNCS (recvmsg4_prog, recvmsg4_prog);
@@ -766,6 +768,22 @@ static struct sock_addr_test tests[] = {SRC4_REWRITE_IP ,SUCCESS , }, + { +SOCK_ADDR_TEST_SENDMSG , +"sendmsg4: sendmsg deny (dgram)" , + sendmsg_v4_deny_prog_load, + sendmsg_v4_deny_prog_destroy, +BPF_CGROUP_UDP4_SENDMSG , + &user_ops, +AF_INET , +SOCK_DGRAM , +SERV4_IP , +SERV4_PORT , +SERV4_REWRITE_IP , +SERV4_REWRITE_PORT , +SRC4_REWRITE_IP , +SYSCALL_EPERM , + }, {SOCK_ADDR_TEST_SENDMSG , "sendmsg6: sendmsg (dgram)",
@@ -798,6 +816,22 @@ static struct sock_addr_test tests[] = {SRC6_IP ,SUCCESS , }, + { +SOCK_ADDR_TEST_SENDMSG , +"sendmsg6: sendmsg deny (dgram)" , + sendmsg_v6_deny_prog_load, + sendmsg_v6_deny_prog_destroy, +BPF_CGROUP_UDP6_SENDMSG , + &user_ops, +AF_INET6 , +SOCK_DGRAM , +SERV6_IP , +SERV6_PORT , +SERV6_REWRITE_IP , +SERV6_REWRITE_PORT , +SRC6_REWRITE_IP , +SYSCALL_EPERM , + }, {SOCK_ADDR_TEST_SENDMSG , "sendmsg_unix: sendmsg (dgram)",
@@ -832,6 +866,22 @@ static struct sock_addr_test tests[] = {SRC4_REWRITE_IP ,SUCCESS , }, + { +SOCK_ADDR_TEST_SENDMSG , +"sendmsg4: sock_sendmsg deny (dgram)" , + sendmsg_v4_deny_prog_load, + sendmsg_v4_deny_prog_destroy, +BPF_CGROUP_UDP4_SENDMSG , + &kern_ops_sock_sendmsg, +AF_INET , +SOCK_DGRAM , +SERV4_IP , +SERV4_PORT , +SERV4_REWRITE_IP , +SERV4_REWRITE_PORT , +SRC4_REWRITE_IP , +SYSCALL_EPERM , + }, {SOCK_ADDR_TEST_SENDMSG , "sendmsg6: sock_sendmsg (dgram)",
@@ -864,6 +914,22 @@ static struct sock_addr_test tests[] = {SRC6_IP ,SUCCESS , }, + { +SOCK_ADDR_TEST_SENDMSG , +"sendmsg6: sock_sendmsg deny (dgram)" , + sendmsg_v6_deny_prog_load, + sendmsg_v6_deny_prog_destroy, +BPF_CGROUP_UDP6_SENDMSG , + &kern_ops_sock_sendmsg, +AF_INET6 , +SOCK_DGRAM , +SERV6_IP , +SERV6_PORT , +SERV6_REWRITE_IP , +SERV6_REWRITE_PORT , +SRC6_REWRITE_IP , +SYSCALL_EPERM , + }, {SOCK_ADDR_TEST_SENDMSG , "sendmsg_unix: sock_sendmsg (dgram)",
@@ -898,6 +964,22 @@ static struct sock_addr_test tests[] = {SRC4_REWRITE_IP ,SUCCESS , }, + { +SOCK_ADDR_TEST_SENDMSG , +"sendmsg4: kernel_sendmsg deny (dgram)" , + sendmsg_v4_deny_prog_load, + sendmsg_v4_deny_prog_destroy, +BPF_CGROUP_UDP4_SENDMSG , + &kern_ops_kernel_sendmsg, +AF_INET , +SOCK_DGRAM , +SERV4_IP , +SERV4_PORT , +SERV4_REWRITE_IP , +SERV4_REWRITE_PORT , +SRC4_REWRITE_IP , +SYSCALL_EPERM , + }, {SOCK_ADDR_TEST_SENDMSG , "sendmsg6: kernel_sendmsg (dgram)",
@@ -930,6 +1012,22 @@ static struct sock_addr_test tests[] = {SRC6_IP ,SUCCESS , }, + { +SOCK_ADDR_TEST_SENDMSG , +"sendmsg6: kernel_sendmsg deny (dgram)" , + sendmsg_v6_deny_prog_load, + sendmsg_v6_deny_prog_destroy, +BPF_CGROUP_UDP6_SENDMSG , + &kern_ops_kernel_sendmsg, +AF_INET6 , +SOCK_DGRAM , +SERV6_IP , +SERV6_PORT , +SERV6_REWRITE_IP , +SERV6_REWRITE_PORT , +SRC6_REWRITE_IP , +SYSCALL_EPERM , + }, {SOCK_ADDR_TEST_SENDMSG , "sendmsg_unix: sock_sendmsg (dgram)",
tools/testing/selftests/bpf/progs/sendmsg4_prog.c +6 -0
@@ -49,4 +49,10 @@ int sendmsg_v4_prog(struct bpf_sock_addr *ctx)return 1 ; } +SEC("cgroup/sendmsg4") +int sendmsg_v4_deny_prog (struct bpf_sock_addr *ctx) +{ +return 0 ; +} + char _license[] SEC("license") = "GPL";
tools/testing/selftests/bpf/progs/sendmsg6_prog.c +6 -0
@@ -65,4 +65,10 @@ int sendmsg_v6_preserve_dst_prog(struct bpf_sock_addr *ctx)return 1 ; } +SEC("cgroup/sendmsg6") +int sendmsg_v6_deny_prog (struct bpf_sock_addr *ctx) +{ +return 0 ; +} + char _license[] SEC("license") = "GPL";
tools/testing/selftests/bpf/test_sock_addr.c +0 -45
69 lines not on this page · raw message
Signature · 1 line
2.45.0.118.g7fe29c98d7-goog
PATCH 8/17 selftests/bpf: Migrate sendmsg6 v4 mapped address tests
In reply to Jordan RifeMigrate test case from bpf/test_sock_addr.c ensuring that sendmsg returns -ENOTSUPP when sending to an IPv4-mapped IPv6 address to prog_tests/sock_addr.c.
--- .../selftests/bpf/prog_tests/sock_addr.c | 17 +++++++++++++ .../selftests/bpf/progs/sendmsg6_prog.c | 25 +++++++++++++++++++ tools/testing/selftests/bpf/test_sock_addr.c | 20 --------------- 3 files changed, 42 insertions(+), 20 deletions(-)
tools/testing/selftests/bpf/prog_tests/sock_addr.c +17 -0
@@ -447,6 +447,7 @@ BPF_SKEL_FUNCS(sendmsg4_prog, sendmsg_v4_deny_prog);BPF_SKEL_FUNCS (sendmsg6_prog, sendmsg_v6_prog);BPF_SKEL_FUNCS (sendmsg6_prog, sendmsg_v6_deny_prog);BPF_SKEL_FUNCS (sendmsg6_prog, sendmsg_v6_preserve_dst_prog); +BPF_SKEL_FUNCS (sendmsg6_prog, sendmsg_v6_v4mapped_prog);BPF_SKEL_FUNCS (sendmsg_unix_prog, sendmsg_unix_prog);BPF_SKEL_FUNCS (recvmsg4_prog, recvmsg4_prog);BPF_SKEL_FUNCS (recvmsg6_prog, recvmsg6_prog);
@@ -832,6 +833,22 @@ static struct sock_addr_test tests[] = {SRC6_REWRITE_IP ,SYSCALL_EPERM , }, + { +SOCK_ADDR_TEST_SENDMSG , +"sendmsg6: sendmsg IPv4-mapped IPv6 (dgram)" , + sendmsg_v6_v4mapped_prog_load, + sendmsg_v6_v4mapped_prog_destroy, +BPF_CGROUP_UDP6_SENDMSG , + &user_ops, +AF_INET6 , +SOCK_DGRAM , +SERV6_IP , +SERV6_PORT , +SERV6_REWRITE_IP , +SERV6_REWRITE_PORT , +SRC6_REWRITE_IP , +SYSCALL_ENOTSUPP , + }, {SOCK_ADDR_TEST_SENDMSG , "sendmsg_unix: sendmsg (dgram)",
tools/testing/selftests/bpf/progs/sendmsg6_prog.c +25 -0
@@ -20,6 +20,11 @@#define DST_REWRITE_IP6_2 0#define DST_REWRITE_IP6_3 1 +#define DST_REWRITE_IP6_V4_MAPPED_0 0 +#define DST_REWRITE_IP6_V4_MAPPED_1 0 +#define DST_REWRITE_IP6_V4_MAPPED_2 0x0000FFFF +#define DST_REWRITE_IP6_V4_MAPPED_3 0xc0a80004 // 192.168.0.4 +#define DST_REWRITE_PORT6 6666SEC ("cgroup/sendmsg6" )
@@ -59,6 +64,26 @@ int sendmsg_v6_prog(struct bpf_sock_addr *ctx)return 1 ; } +SEC("cgroup/sendmsg6") +int sendmsg_v6_v4mapped_prog (struct bpf_sock_addr *ctx) +{ +/* Rewrite source. */ + ctx->msg_src_ip6[0 ] =bpf_htonl (SRC_REWRITE_IP6_0 ); + ctx->msg_src_ip6[1 ] =bpf_htonl (SRC_REWRITE_IP6_1 ); + ctx->msg_src_ip6[2 ] =bpf_htonl (SRC_REWRITE_IP6_2 ); + ctx->msg_src_ip6[3 ] =bpf_htonl (SRC_REWRITE_IP6_3 ); + +/* Rewrite destination. */ + ctx->user_ip6[0 ] =bpf_htonl (DST_REWRITE_IP6_V4_MAPPED_0 ); + ctx->user_ip6[1 ] =bpf_htonl (DST_REWRITE_IP6_V4_MAPPED_1 ); + ctx->user_ip6[2 ] =bpf_htonl (DST_REWRITE_IP6_V4_MAPPED_2 ); + ctx->user_ip6[3 ] =bpf_htonl (DST_REWRITE_IP6_V4_MAPPED_3 ); + + ctx->user_port =bpf_htons (DST_REWRITE_PORT6 ); + +return 1 ; +} + SEC("cgroup/sendmsg6")int sendmsg_v6_preserve_dst_prog (struct bpf_sock_addr *ctx) {
tools/testing/selftests/bpf/test_sock_addr.c +0 -20
@@ -94,7 +94,6 @@ static int connect4_prog_load(const struct sock_addr_test *test);static int connect6_prog_load (const struct sock_addr_test *test);static int sendmsg4_rw_asm_prog_load (const struct sock_addr_test *test);static int sendmsg6_rw_asm_prog_load (const struct sock_addr_test *test); -static int sendmsg6_rw_v4mapped_prog_load (const struct sock_addr_test *test);static int sendmsg6_rw_wildcard_prog_load (const struct sock_addr_test *test);static struct sock_addr_test tests[] = {
@@ -299,20 +298,6 @@ static struct sock_addr_test tests[] = {SRC6_REWRITE_IP ,SUCCESS , }, - { -"sendmsg6: IPv4-mapped IPv6" , - sendmsg6_rw_v4mapped_prog_load, -BPF_CGROUP_UDP6_SENDMSG , -BPF_CGROUP_UDP6_SENDMSG , -AF_INET6 , -SOCK_DGRAM , -SERV6_IP , -SERV6_PORT , -SERV6_REWRITE_IP , -SERV6_REWRITE_PORT , -SRC6_REWRITE_IP , -SYSCALL_ENOTSUPP , - }, {"sendmsg6: set dst IP = [::] (BSD'ism)" , sendmsg6_rw_wildcard_prog_load,
@@ -512,11 +497,6 @@ static int sendmsg6_rw_asm_prog_load(const struct sock_addr_test *test)return sendmsg6_rw_dst_asm_prog_load (test,SERV6_REWRITE_IP ); } -static int sendmsg6_rw_v4mapped_prog_load (const struct sock_addr_test *test) -{ -return sendmsg6_rw_dst_asm_prog_load (test,SERV6_V4MAPPED_IP ); -} -static int sendmsg6_rw_wildcard_prog_load (const struct sock_addr_test *test) {return sendmsg6_rw_dst_asm_prog_load (test,WILDCARD6_IP );
Signature · 1 line
2.45.0.118.g7fe29c98d7-goog
PATCH 9/17 selftests/bpf: Migrate wildcard destination rewrite test
In reply to Jordan RifeMigrate test case from bpf/test_sock_addr.c ensuring that sendmsg respects when sendmsg6 hooks rewrite the destination IP with the IPv6 wildcard IP, [::].
--- .../selftests/bpf/prog_tests/sock_addr.c | 17 ++++++++++++++++ .../selftests/bpf/progs/sendmsg6_prog.c | 20 +++++++++++++++++++ tools/testing/selftests/bpf/test_sock_addr.c | 20 ------------------- 3 files changed, 37 insertions(+), 20 deletions(-)
tools/testing/selftests/bpf/prog_tests/sock_addr.c +17 -0
@@ -448,6 +448,7 @@ BPF_SKEL_FUNCS(sendmsg6_prog, sendmsg_v6_prog);BPF_SKEL_FUNCS (sendmsg6_prog, sendmsg_v6_deny_prog);BPF_SKEL_FUNCS (sendmsg6_prog, sendmsg_v6_preserve_dst_prog);BPF_SKEL_FUNCS (sendmsg6_prog, sendmsg_v6_v4mapped_prog); +BPF_SKEL_FUNCS (sendmsg6_prog, sendmsg_v6_wildcard_prog);BPF_SKEL_FUNCS (sendmsg_unix_prog, sendmsg_unix_prog);BPF_SKEL_FUNCS (recvmsg4_prog, recvmsg4_prog);BPF_SKEL_FUNCS (recvmsg6_prog, recvmsg6_prog);
@@ -849,6 +850,22 @@ static struct sock_addr_test tests[] = {SRC6_REWRITE_IP ,SYSCALL_ENOTSUPP , }, + { +SOCK_ADDR_TEST_SENDMSG , +"sendmsg6: sendmsg dst IP = [::] (BSD'ism) (dgram)" , + sendmsg_v6_wildcard_prog_load, + sendmsg_v6_wildcard_prog_destroy, +BPF_CGROUP_UDP6_SENDMSG , + &user_ops, +AF_INET6 , +SOCK_DGRAM , +SERV6_IP , +SERV6_PORT , +SERV6_REWRITE_IP , +SERV6_REWRITE_PORT , +SRC6_REWRITE_IP , +SUCCESS , + }, {SOCK_ADDR_TEST_SENDMSG , "sendmsg_unix: sendmsg (dgram)",
tools/testing/selftests/bpf/progs/sendmsg6_prog.c +20 -0
@@ -84,6 +84,26 @@ int sendmsg_v6_v4mapped_prog(struct bpf_sock_addr *ctx)return 1 ; } +SEC("cgroup/sendmsg6") +int sendmsg_v6_wildcard_prog (struct bpf_sock_addr *ctx) +{ +/* Rewrite source. */ + ctx->msg_src_ip6[0 ] =bpf_htonl (SRC_REWRITE_IP6_0 ); + ctx->msg_src_ip6[1 ] =bpf_htonl (SRC_REWRITE_IP6_1 ); + ctx->msg_src_ip6[2 ] =bpf_htonl (SRC_REWRITE_IP6_2 ); + ctx->msg_src_ip6[3 ] =bpf_htonl (SRC_REWRITE_IP6_3 ); + +/* Rewrite destination. */ + ctx->user_ip6[0 ] =bpf_htonl (0 ); + ctx->user_ip6[1 ] =bpf_htonl (0 ); + ctx->user_ip6[2 ] =bpf_htonl (0 ); + ctx->user_ip6[3 ] =bpf_htonl (0 ); + + ctx->user_port =bpf_htons (DST_REWRITE_PORT6 ); + +return 1 ; +} + SEC("cgroup/sendmsg6")int sendmsg_v6_preserve_dst_prog (struct bpf_sock_addr *ctx) {
tools/testing/selftests/bpf/test_sock_addr.c +0 -20
@@ -94,7 +94,6 @@ static int connect4_prog_load(const struct sock_addr_test *test);static int connect6_prog_load (const struct sock_addr_test *test);static int sendmsg4_rw_asm_prog_load (const struct sock_addr_test *test);static int sendmsg6_rw_asm_prog_load (const struct sock_addr_test *test); -static int sendmsg6_rw_wildcard_prog_load (const struct sock_addr_test *test);static struct sock_addr_test tests[] = {/* bind */
@@ -298,20 +297,6 @@ static struct sock_addr_test tests[] = { SRC6_REWRITE_IP, SUCCESS, }, - { -"sendmsg6: set dst IP = [::] (BSD'ism)" , - sendmsg6_rw_wildcard_prog_load, -BPF_CGROUP_UDP6_SENDMSG , -BPF_CGROUP_UDP6_SENDMSG , -AF_INET6 , -SOCK_DGRAM , -SERV6_IP , -SERV6_PORT , -SERV6_REWRITE_IP , -SERV6_REWRITE_PORT , -SRC6_REWRITE_IP , - SUCCESS, - }, }; static int load_insns(const struct sock_addr_test *test,
@@ -497,11 +482,6 @@ static int sendmsg6_rw_asm_prog_load(const struct sock_addr_test *test)return sendmsg6_rw_dst_asm_prog_load (test,SERV6_REWRITE_IP ); } -static int sendmsg6_rw_wildcard_prog_load (const struct sock_addr_test *test) -{ -return sendmsg6_rw_dst_asm_prog_load (test,WILDCARD6_IP ); -} -static int cmp_addr (const struct sockaddr_storage *addr1,const struct sockaddr_storage *addr2,int cmp_port) {
Signature · 1 line
2.45.0.118.g7fe29c98d7-goog
PATCH 10/17 selftests/bpf: Migrate expected_attach_type tests
In reply to Jordan RifeMigrates tests from progs/test_sock_addr.c ensuring that programs fail to load when the expected attach type does not match.
--- .../selftests/bpf/prog_tests/sock_addr.c | 96 +++++++++++++++++++ tools/testing/selftests/bpf/test_sock_addr.c | 84 ---------------- 2 files changed, 96 insertions(+), 84 deletions(-)
tools/testing/selftests/bpf/prog_tests/sock_addr.c +96 -0
@@ -490,6 +490,22 @@ static struct sock_addr_test tests[] = {NULL ,SUCCESS , }, + { +SOCK_ADDR_TEST_BIND , +"bind4: load prog with wrong expected attach type" , + bind_v4_prog_load, + bind_v4_prog_destroy, +BPF_CGROUP_INET6_BIND , + &user_ops, +AF_INET , +SOCK_STREAM , +NULL , +0 , +NULL , +0 , +NULL , +LOAD_REJECT , + }, {SOCK_ADDR_TEST_BIND , "bind6: bind (stream)",
@@ -522,6 +538,22 @@ static struct sock_addr_test tests[] = {NULL ,SUCCESS , }, + { +SOCK_ADDR_TEST_BIND , +"bind6: load prog with wrong expected attach type" , + bind_v6_prog_load, + bind_v6_prog_destroy, +BPF_CGROUP_INET4_BIND , + &user_ops, +AF_INET6 , +SOCK_STREAM , +NULL , +0 , +NULL , +0 , +NULL , + LOAD_REJECT, + }, /* bind - kernel calls */ {
@@ -622,6 +654,22 @@ static struct sock_addr_test tests[] = {SRC4_REWRITE_IP ,SUCCESS , }, + { +SOCK_ADDR_TEST_CONNECT , +"connect4: load prog with wrong expected attach type" , + connect_v4_prog_load, + connect_v4_prog_destroy, +BPF_CGROUP_INET6_CONNECT , + &user_ops, +AF_INET , +SOCK_STREAM , +NULL , +0 , +NULL , +0 , +NULL , +LOAD_REJECT , + }, {SOCK_ADDR_TEST_CONNECT , "connect6: connect (stream)",
@@ -654,6 +702,22 @@ static struct sock_addr_test tests[] = {SRC6_REWRITE_IP ,SUCCESS , }, + { +SOCK_ADDR_TEST_CONNECT , +"connect6: load prog with wrong expected attach type" , + connect_v6_prog_load, + connect_v6_prog_destroy, +BPF_CGROUP_INET4_CONNECT , + &user_ops, +AF_INET6 , +SOCK_STREAM , +NULL , +0 , +NULL , +0 , +NULL , +LOAD_REJECT , + }, {SOCK_ADDR_TEST_CONNECT , "connect_unix: connect (stream)",
@@ -786,6 +850,22 @@ static struct sock_addr_test tests[] = {SRC4_REWRITE_IP ,SYSCALL_EPERM , }, + { +SOCK_ADDR_TEST_SENDMSG , +"sendmsg4: load prog with wrong expected attach type" , + sendmsg_v4_prog_load, + sendmsg_v4_prog_destroy, +BPF_CGROUP_UDP6_SENDMSG , + &user_ops, +AF_INET , +SOCK_DGRAM , +NULL , +0 , +NULL , +0 , +NULL , +LOAD_REJECT , + }, {SOCK_ADDR_TEST_SENDMSG , "sendmsg6: sendmsg (dgram)",
@@ -866,6 +946,22 @@ static struct sock_addr_test tests[] = {SRC6_REWRITE_IP ,SUCCESS , }, + { +SOCK_ADDR_TEST_SENDMSG , +"sendmsg6: load prog with wrong expected attach type" , + sendmsg_v6_prog_load, + sendmsg_v6_prog_destroy, +BPF_CGROUP_UDP4_SENDMSG , + &user_ops, +AF_INET6 , +SOCK_DGRAM , +NULL , +0 , +NULL , +0 , +NULL , +LOAD_REJECT , + }, {SOCK_ADDR_TEST_SENDMSG , "sendmsg_unix: sendmsg (dgram)",
tools/testing/selftests/bpf/test_sock_addr.c +0 -84
120 lines not on this page · raw message
Signature · 1 line
2.45.0.118.g7fe29c98d7-goog
PATCH 11/17 selftests/bpf: Migrate ATTACH_REJECT test cases
In reply to Jordan RifeMigrate test case from bpf/test_sock_addr.c ensuring that program attachment fails when using an inappropriate attach type.
--- .../selftests/bpf/prog_tests/sock_addr.c | 102 ++++++++++++ tools/testing/selftests/bpf/test_sock_addr.c | 146 ------------------ 2 files changed, 102 insertions(+), 146 deletions(-)
tools/testing/selftests/bpf/prog_tests/sock_addr.c +102 -0
@@ -438,13 +438,19 @@ static void prog_name##_destroy(void *skel) \ }BPF_SKEL_FUNCS (bind4_prog, bind_v4_prog); +BPF_SKEL_FUNCS_RAW (bind4_prog, bind_v4_prog);BPF_SKEL_FUNCS (bind6_prog, bind_v6_prog); +BPF_SKEL_FUNCS_RAW (bind6_prog, bind_v6_prog);BPF_SKEL_FUNCS (connect4_prog, connect_v4_prog); +BPF_SKEL_FUNCS_RAW (connect4_prog, connect_v4_prog);BPF_SKEL_FUNCS (connect6_prog, connect_v6_prog); +BPF_SKEL_FUNCS_RAW (connect6_prog, connect_v6_prog);BPF_SKEL_FUNCS (connect_unix_prog, connect_unix_prog);BPF_SKEL_FUNCS (sendmsg4_prog, sendmsg_v4_prog); +BPF_SKEL_FUNCS_RAW (sendmsg4_prog, sendmsg_v4_prog);BPF_SKEL_FUNCS (sendmsg4_prog, sendmsg_v4_deny_prog);BPF_SKEL_FUNCS (sendmsg6_prog, sendmsg_v6_prog); +BPF_SKEL_FUNCS_RAW (sendmsg6_prog, sendmsg_v6_prog);BPF_SKEL_FUNCS (sendmsg6_prog, sendmsg_v6_deny_prog);BPF_SKEL_FUNCS (sendmsg6_prog, sendmsg_v6_preserve_dst_prog);BPF_SKEL_FUNCS (sendmsg6_prog, sendmsg_v6_v4mapped_prog);
@@ -506,6 +512,22 @@ static struct sock_addr_test tests[] = {NULL ,LOAD_REJECT , }, + { +SOCK_ADDR_TEST_BIND , +"bind4: attach prog with wrong attach type" , + bind_v4_prog_load_raw, + bind_v4_prog_destroy_raw, +BPF_CGROUP_INET6_BIND , + &user_ops, +AF_INET , +SOCK_STREAM , +NULL , +0 , +NULL , +0 , +NULL , +ATTACH_REJECT , + }, {SOCK_ADDR_TEST_BIND , "bind6: bind (stream)",
@@ -554,6 +576,22 @@ static struct sock_addr_test tests[] = {NULL ,LOAD_REJECT , }, + { +SOCK_ADDR_TEST_BIND , +"bind6: attach prog with wrong attach type" , + bind_v6_prog_load_raw, + bind_v6_prog_destroy_raw, +BPF_CGROUP_INET4_BIND , + &user_ops, +AF_INET , +SOCK_STREAM , +NULL , +0 , +NULL , +0 , +NULL , + ATTACH_REJECT, + }, /* bind - kernel calls */ {
@@ -670,6 +708,22 @@ static struct sock_addr_test tests[] = {NULL ,LOAD_REJECT , }, + { +SOCK_ADDR_TEST_CONNECT , +"connect4: attach prog with wrong attach type" , + connect_v4_prog_load_raw, + connect_v4_prog_destroy_raw, +BPF_CGROUP_INET6_CONNECT , + &user_ops, +AF_INET , +SOCK_STREAM , +NULL , +0 , +NULL , +0 , +NULL , +ATTACH_REJECT , + }, {SOCK_ADDR_TEST_CONNECT , "connect6: connect (stream)",
@@ -718,6 +772,22 @@ static struct sock_addr_test tests[] = {NULL ,LOAD_REJECT , }, + { +SOCK_ADDR_TEST_CONNECT , +"connect6: attach prog with wrong attach type" , + connect_v6_prog_load_raw, + connect_v6_prog_destroy_raw, +BPF_CGROUP_INET4_CONNECT , + &user_ops, +AF_INET , +SOCK_STREAM , +NULL , +0 , +NULL , +0 , +NULL , +ATTACH_REJECT , + }, {SOCK_ADDR_TEST_CONNECT , "connect_unix: connect (stream)",
@@ -866,6 +936,22 @@ static struct sock_addr_test tests[] = {NULL ,LOAD_REJECT , }, + { +SOCK_ADDR_TEST_SENDMSG , +"sendmsg4: attach prog with wrong attach type" , + sendmsg_v4_prog_load_raw, + sendmsg_v4_prog_destroy_raw, +BPF_CGROUP_UDP6_SENDMSG , + &user_ops, +AF_INET , +SOCK_DGRAM , +NULL , +0 , +NULL , +0 , +NULL , +ATTACH_REJECT , + }, {SOCK_ADDR_TEST_SENDMSG , "sendmsg6: sendmsg (dgram)",
@@ -962,6 +1048,22 @@ static struct sock_addr_test tests[] = {NULL ,LOAD_REJECT , }, + { +SOCK_ADDR_TEST_SENDMSG , +"sendmsg6: attach prog with wrong attach type" , + sendmsg_v6_prog_load_raw, + sendmsg_v6_prog_destroy_raw, +BPF_CGROUP_UDP4_SENDMSG , + &user_ops, +AF_INET6 , +SOCK_DGRAM , +NULL , +0 , +NULL , +0 , +NULL , +ATTACH_REJECT , + }, {SOCK_ADDR_TEST_SENDMSG , "sendmsg_unix: sendmsg (dgram)",
tools/testing/selftests/bpf/test_sock_addr.c +0 -146
169 lines not on this page · raw message
Signature · 1 line
2.45.0.118.g7fe29c98d7-goog
PATCH 12/17 selftests/bpf: Remove redundant sendmsg test cases
In reply to Jordan RifeRemove these test cases completely, as the same behavior is already covered by other sendmsg* test cases in prog_tests/sock_addr.c. This just rewrites the destination address similar to sendmsg_v4_prog and sendmsg_v6_prog.
--- tools/testing/selftests/bpf/test_sock_addr.c | 161 ------------------- 1 file changed, 161 deletions(-)
tools/testing/selftests/bpf/test_sock_addr.c +0 -161
@@ -88,170 +88,9 @@ struct sock_addr_test { } expected_result; }; -static int sendmsg4_rw_asm_prog_load (const struct sock_addr_test *test); -static int sendmsg6_rw_asm_prog_load (const struct sock_addr_test *test); -static struct sock_addr_test tests[] = { -/* sendmsg */ - { -"sendmsg4: rewrite IP & port (asm)" , - sendmsg4_rw_asm_prog_load, -BPF_CGROUP_UDP4_SENDMSG , -BPF_CGROUP_UDP4_SENDMSG , -AF_INET , -SOCK_DGRAM , -SERV4_IP , -SERV4_PORT , -SERV4_REWRITE_IP , -SERV4_REWRITE_PORT , -SRC4_REWRITE_IP , -SUCCESS , - }, - { -"sendmsg6: rewrite IP & port (asm)" , - sendmsg6_rw_asm_prog_load, -BPF_CGROUP_UDP6_SENDMSG , -BPF_CGROUP_UDP6_SENDMSG , -AF_INET6 , -SOCK_DGRAM , -SERV6_IP , -SERV6_PORT , -SERV6_REWRITE_IP , -SERV6_REWRITE_PORT , -SRC6_REWRITE_IP , -SUCCESS , - }, }; -static int load_insns (const struct sock_addr_test *test, -const struct bpf_insn *insns,size_t insns_cnt) -{ -LIBBPF_OPTS (bpf_prog_load_opts, opts); -int ret; - - opts.expected_attach_type = test->expected_attach_type; - opts.log_buf = bpf_log_buf; - opts.log_size =BPF_LOG_BUF_SIZE ; - - ret =bpf_prog_load (BPF_PROG_TYPE_CGROUP_SOCK_ADDR ,NULL ,"GPL" , insns, insns_cnt, &opts); -if (ret <0 && test->expected_result !=LOAD_REJECT ) { -log_err (">>> Loading program error.\n" -">>> Verifier output:\n%s\n-------\n" , bpf_log_buf); - } - -return ret; -} - -static int sendmsg4_rw_asm_prog_load (const struct sock_addr_test *test) -{ -struct sockaddr_in dst4_rw_addr; -struct in_addr src4_rw_ip; - -if (inet_pton (AF_INET ,SRC4_REWRITE_IP , (void *)&src4_rw_ip) !=1 ) { -log_err ("Invalid IPv4: %s" ,SRC4_REWRITE_IP ); -return -1 ; - } - -if (make_sockaddr (AF_INET ,SERV4_REWRITE_IP ,SERV4_REWRITE_PORT , - (struct sockaddr_storage *)&dst4_rw_addr, -NULL ) ==-1 ) -return -1 ; - -struct bpf_insn insns[] = { -BPF_MOV64_REG (BPF_REG_6 ,BPF_REG_1 ), - -/* if (sk.family == AF_INET && */ -BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , - offsetof(struct bpf_sock_addr , family)), -BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 ,AF_INET ,8 ), - -/* sk.type == SOCK_DGRAM) { */ -BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , - offsetof(struct bpf_sock_addr , type)), -BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 ,SOCK_DGRAM ,6 ), - -/* msg_src_ip4 = src4_rw_ip */ -BPF_MOV32_IMM (BPF_REG_7 , src4_rw_ip.s_addr), -BPF_STX_MEM (BPF_W ,BPF_REG_6 ,BPF_REG_7 , - offsetof(struct bpf_sock_addr , msg_src_ip4)), - -/* user_ip4 = dst4_rw_addr.sin_addr */ -BPF_MOV32_IMM (BPF_REG_7 , dst4_rw_addr.sin_addr.s_addr), -BPF_STX_MEM (BPF_W ,BPF_REG_6 ,BPF_REG_7 , - offsetof(struct bpf_sock_addr , user_ip4)), - -/* user_port = dst4_rw_addr.sin_port */ -BPF_MOV32_IMM (BPF_REG_7 , dst4_rw_addr.sin_port), -BPF_STX_MEM (BPF_W ,BPF_REG_6 ,BPF_REG_7 , - offsetof(struct bpf_sock_addr , user_port)), -/* } */ - -/* return 1 */ -BPF_MOV64_IMM (BPF_REG_0 ,1 ), -BPF_EXIT_INSN (), - }; - -return load_insns (test, insns,ARRAY_SIZE (insns)); -} - -static int sendmsg6_rw_dst_asm_prog_load (const struct sock_addr_test *test, -const char *rw_dst_ip) -{ -struct sockaddr_in6 dst6_rw_addr; -struct in6_addr src6_rw_ip; - -if (inet_pton (AF_INET6 ,SRC6_REWRITE_IP , (void *)&src6_rw_ip) !=1 ) { -log_err ("Invalid IPv6: %s" ,SRC6_REWRITE_IP ); -return -1 ; - } - -if (make_sockaddr (AF_INET6 , rw_dst_ip,SERV6_REWRITE_PORT , - (struct sockaddr_storage *)&dst6_rw_addr, -NULL ) ==-1 ) -return -1 ; - -struct bpf_insn insns[] = { -BPF_MOV64_REG (BPF_REG_6 ,BPF_REG_1 ), - -/* if (sk.family == AF_INET6) { */ -BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , - offsetof(struct bpf_sock_addr , family)), -BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 ,AF_INET6 ,18 ), - -#define STORE_IPV6_WORD_N(DST, SRC, N) \ -BPF_MOV32_IMM (BPF_REG_7 ,SRC [N ]), \ - BPF_STX_MEM(BPF_W, BPF_REG_6, BPF_REG_7, \ - offsetof(struct bpf_sock_addr, DST[N])) - -#define STORE_IPV6(DST, SRC) \ -STORE_IPV6_WORD_N (DST ,SRC ,0 ), \ -STORE_IPV6_WORD_N (DST ,SRC ,1 ), \ -STORE_IPV6_WORD_N (DST ,SRC ,2 ), \ - STORE_IPV6_WORD_N(DST, SRC, 3) - -STORE_IPV6 (msg_src_ip6, src6_rw_ip.s6_addr32), -STORE_IPV6 (user_ip6, dst6_rw_addr.sin6_addr.s6_addr32), - -/* user_port = dst6_rw_addr.sin6_port */ -BPF_MOV32_IMM (BPF_REG_7 , dst6_rw_addr.sin6_port), -BPF_STX_MEM (BPF_W ,BPF_REG_6 ,BPF_REG_7 , - offsetof(struct bpf_sock_addr , user_port)), - -/* } */ - -/* return 1 */ -BPF_MOV64_IMM (BPF_REG_0 ,1 ), -BPF_EXIT_INSN (), - }; - -return load_insns (test, insns,ARRAY_SIZE (insns)); -} - -static int sendmsg6_rw_asm_prog_load (const struct sock_addr_test *test) -{ -return sendmsg6_rw_dst_asm_prog_load (test,SERV6_REWRITE_IP ); -} -static int cmp_addr (const struct sockaddr_storage *addr1,const struct sockaddr_storage *addr2,int cmp_port) {
Signature · 1 line
2.45.0.118.g7fe29c98d7-goog
PATCH 13/17 selftests/bpf: Retire test_sock_addr.(c|sh)
In reply to Jordan RifeFully remove test_sock_addr.c and test_sock_addr.sh, as test coverage has been fully moved to prog_tests/sock_addr.c.
--- tools/testing/selftests/bpf/.gitignore | 1 - tools/testing/selftests/bpf/Makefile | 4 +- tools/testing/selftests/bpf/test_sock_addr.c | 574 ------------------ tools/testing/selftests/bpf/test_sock_addr.sh | 58 -- 4 files changed, 1 insertion(+), 636 deletions(-) delete mode 100644 tools/testing/selftests/bpf/test_sock_addr.c delete mode 100755 tools/testing/selftests/bpf/test_sock_addr.sh
tools/testing/selftests/bpf/.gitignore +0 -1
@@ -17,7 +17,6 @@ test_dev_cgroup test_verifier_log feature test_sock -test_sock_addr urandom_read test_sockmap test_lirc_mode2_user
tools/testing/selftests/bpf/Makefile +1 -3
@@ -115,7 +115,6 @@ TEST_PROGS := test_kmod.sh \ test_xdp_redirect_multi.sh \ test_xdp_meta.sh \ test_xdp_veth.sh \ - test_sock_addr.sh \ test_tunnel.sh \ test_lwt_seg6local.sh \ test_lirc_mode2.sh \
@@ -140,7 +139,7 @@ TEST_PROGS_EXTENDED := with_addr.sh \ test_xdp_vlan.sh test_bpftool.py # Compile but not part of 'make run_tests' -TEST_GEN_PROGS_EXTENDED = test_sock_addr test_skb_cgroup_id_user \ +TEST_GEN_PROGS_EXTENDED = test_skb_cgroup_id_user \ flow_dissector_load test_flow_dissector test_tcp_check_syncookie_user \ test_lirc_mode2_user xdping test_cpp runqslower bench bpf_testmod.ko \ xskxceiver xdp_redirect_multi xdp_synproxy veristat xdp_hw_metadata \
@@ -296,7 +295,6 @@ NETWORK_HELPERS := $(OUTPUT)/network_helpers.o $(OUTPUT)/test_dev_cgroup: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(OUTPUT)/test_skb_cgroup_id_user: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(OUTPUT)/test_sock: $(CGROUP_HELPERS) $(TESTING_HELPERS) -$(OUTPUT)/test_sock_addr: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(NETWORK_HELPERS) $(OUTPUT)/test_sockmap: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(OUTPUT)/test_tcpnotify_user: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(TRACE_HELPERS) $(OUTPUT)/get_cgroup_id_user: $(CGROUP_HELPERS) $(TESTING_HELPERS)
tools/testing/selftests/bpf/test_sock_addr.c deleted +0 -574
574 lines not on this page · raw message
tools/testing/selftests/bpf/test_sock_addr.sh deleted +0 -58
58 lines not on this page · raw message
Signature · 1 line
2.45.0.118.g7fe29c98d7-goog
PATCH 14/17 selftests/bpf: Expand sockaddr program return value tests
In reply to Jordan RifeThis patch expands verifier coverage for program return values to cover bind, connect, sendmsg, getsockname, and getpeername hooks. It also rounds out the recvmsg coverage by adding test cases for recvmsg_unix hooks.
--- .../selftests/bpf/progs/verifier_sock_addr.c | 294 ++++++++++++++++++ 1 file changed, 294 insertions(+)
tools/testing/selftests/bpf/progs/verifier_sock_addr.c +294 -0
@@ -34,4 +34,298 @@ int recvmsg6_bad_return_code(struct bpf_sock_addr *ctx)return 0 ; } +SEC("cgroup/recvmsg_unix") +__success +int recvmsg_unix_good_return_code (struct bpf_sock_addr *ctx) +{ +return 1 ; +} + +SEC("cgroup/recvmsg_unix") +__failure __msg("At program exit the register R0 has smin=0 smax=0 should have been in [1, 1]") +int recvmsg_unix_bad_return_code(struct bpf_sock_addr *ctx) +{ +return 0 ; +} + +SEC("cgroup/sendmsg4") +__success +int sendmsg4_good_return_code_0 (struct bpf_sock_addr *ctx) +{ +return 0 ; +} + +SEC("cgroup/sendmsg4") +__success +int sendmsg4_good_return_code_1 (struct bpf_sock_addr *ctx) +{ +return 1 ; +} + +SEC("cgroup/sendmsg4") +__failure __msg("At program exit the register R0 has smin=2 smax=2 should have been in [0, 1]") +int sendmsg4_bad_return_code(struct bpf_sock_addr *ctx) +{ +return 2 ; +} + +SEC("cgroup/sendmsg6") +__success +int sendmsg6_good_return_code_0 (struct bpf_sock_addr *ctx) +{ +return 0 ; +} + +SEC("cgroup/sendmsg6") +__success +int sendmsg6_good_return_code_1 (struct bpf_sock_addr *ctx) +{ +return 1 ; +} + +SEC("cgroup/sendmsg6") +__failure __msg("At program exit the register R0 has smin=2 smax=2 should have been in [0, 1]") +int sendmsg6_bad_return_code(struct bpf_sock_addr *ctx) +{ +return 2 ; +} + +SEC("cgroup/sendmsg_unix") +__success +int sendmsg_unix_good_return_code_0 (struct bpf_sock_addr *ctx) +{ +return 0 ; +} + +SEC("cgroup/sendmsg_unix") +__success +int sendmsg_unix_good_return_code_1 (struct bpf_sock_addr *ctx) +{ +return 1 ; +} + +SEC("cgroup/sendmsg_unix") +__failure __msg("At program exit the register R0 has smin=2 smax=2 should have been in [0, 1]") +int sendmsg_unix_bad_return_code(struct bpf_sock_addr *ctx) +{ +return 2 ; +} + +SEC("cgroup/getpeername4") +__success +int getpeername4_good_return_code (struct bpf_sock_addr *ctx) +{ +return 1 ; +} + +SEC("cgroup/getpeername4") +__failure __msg("At program exit the register R0 has smin=0 smax=0 should have been in [1, 1]") +int getpeername4_bad_return_code(struct bpf_sock_addr *ctx) +{ +return 0 ; +} + +SEC("cgroup/getpeername6") +__success +int getpeername6_good_return_code (struct bpf_sock_addr *ctx) +{ +return 1 ; +} + +SEC("cgroup/getpeername6") +__failure __msg("At program exit the register R0 has smin=0 smax=0 should have been in [1, 1]") +int getpeername6_bad_return_code(struct bpf_sock_addr *ctx) +{ +return 0 ; +} + +SEC("cgroup/getpeername_unix") +__success +int getpeername_unix_good_return_code (struct bpf_sock_addr *ctx) +{ +return 1 ; +} + +SEC("cgroup/getpeername_unix") +__failure __msg("At program exit the register R0 has smin=0 smax=0 should have been in [1, 1]") +int getpeername_unix_bad_return_code(struct bpf_sock_addr *ctx) +{ +return 0 ; +} + +SEC("cgroup/getsockname4") +__success +int getsockname4_good_return_code (struct bpf_sock_addr *ctx) +{ +return 1 ; +} + +SEC("cgroup/getsockname4") +__failure __msg("At program exit the register R0 has smin=0 smax=0 should have been in [1, 1]") +int getsockname4_bad_return_code(struct bpf_sock_addr *ctx) +{ +return 0 ; +} + +SEC("cgroup/getsockname6") +__success +int getsockname6_good_return_code (struct bpf_sock_addr *ctx) +{ +return 1 ; +} + +SEC("cgroup/getsockname6") +__failure __msg("At program exit the register R0 has smin=0 smax=0 should have been in [1, 1]") +int getsockname6_bad_return_code(struct bpf_sock_addr *ctx) +{ +return 0 ; +} + +SEC("cgroup/getsockname_unix") +__success +int getsockname_unix_good_return_code (struct bpf_sock_addr *ctx) +{ +return 1 ; +} + +SEC("cgroup/getsockname_unix") +__failure __msg("At program exit the register R0 has smin=0 smax=0 should have been in [1, 1]") +int getsockname_unix_unix_bad_return_code(struct bpf_sock_addr *ctx) +{ +return 0 ; +} + +SEC("cgroup/bind4") +__success +int bind4_good_return_code_0 (struct bpf_sock_addr *ctx) +{ +return 0 ; +} + +SEC("cgroup/bind4") +__success +int bind4_good_return_code_1 (struct bpf_sock_addr *ctx) +{ +return 1 ; +} + +SEC("cgroup/bind4") +__success +int bind4_good_return_code_2 (struct bpf_sock_addr *ctx) +{ +return 2 ; +} + +SEC("cgroup/bind4") +__success +int bind4_good_return_code_3 (struct bpf_sock_addr *ctx) +{ +return 3 ; +} + +SEC("cgroup/bind4") +__failure __msg("At program exit the register R0 has smin=4 smax=4 should have been in [0, 3]") +int bind4_bad_return_code(struct bpf_sock_addr *ctx) +{ +return 4 ; +} + +SEC("cgroup/bind6") +__success +int bind6_good_return_code_0 (struct bpf_sock_addr *ctx) +{ +return 0 ; +} + +SEC("cgroup/bind6") +__success +int bind6_good_return_code_1 (struct bpf_sock_addr *ctx) +{ +return 1 ; +} + +SEC("cgroup/bind6") +__success +int bind6_good_return_code_2 (struct bpf_sock_addr *ctx) +{ +return 2 ; +} + +SEC("cgroup/bind6") +__success +int bind6_good_return_code_3 (struct bpf_sock_addr *ctx) +{ +return 3 ; +} + +SEC("cgroup/bind6") +__failure __msg("At program exit the register R0 has smin=4 smax=4 should have been in [0, 3]") +int bind6_bad_return_code(struct bpf_sock_addr *ctx) +{ +return 4 ; +} + +SEC("cgroup/connect4") +__success +int connect4_good_return_code_0 (struct bpf_sock_addr *ctx) +{ +return 0 ; +} + +SEC("cgroup/connect4") +__success +int connect4_good_return_code_1 (struct bpf_sock_addr *ctx) +{ +return 1 ; +} + +SEC("cgroup/connect4") +__failure __msg("At program exit the register R0 has smin=2 smax=2 should have been in [0, 1]") +int connect4_bad_return_code(struct bpf_sock_addr *ctx) +{ +return 2 ; +} + +SEC("cgroup/connect6") +__success +int connect6_good_return_code_0 (struct bpf_sock_addr *ctx) +{ +return 0 ; +} + +SEC("cgroup/connect6") +__success +int connect6_good_return_code_1 (struct bpf_sock_addr *ctx) +{ +return 1 ; +} + +SEC("cgroup/connect6") +__failure __msg("At program exit the register R0 has smin=2 smax=2 should have been in [0, 1]") +int connect6_bad_return_code(struct bpf_sock_addr *ctx) +{ +return 2 ; +} + +SEC("cgroup/connect_unix") +__success +int connect_unix_good_return_code_0 (struct bpf_sock_addr *ctx) +{ +return 0 ; +} + +SEC("cgroup/connect_unix") +__success +int connect_unix_good_return_code_1 (struct bpf_sock_addr *ctx) +{ +return 1 ; +} + +SEC("cgroup/connect_unix") +__failure __msg("At program exit the register R0 has smin=2 smax=2 should have been in [0, 1]") +int connect_unix_bad_return_code(struct bpf_sock_addr *ctx) +{ +return 2 ; +} + char _license[] SEC("license") = "GPL";
Signature · 1 line
2.45.0.118.g7fe29c98d7-goog
PATCH 15/17 sefltests/bpf: Expand sockaddr hook deny tests
In reply to Jordan RifeThis patch expands test coverage for EPERM tests to include connect and bind calls and rounds out the coverage for sendmsg by adding tests for sendmsg_unix.
--- .../selftests/bpf/prog_tests/sock_addr.c | 342 ++++++++++++++++++ .../testing/selftests/bpf/progs/bind4_prog.c | 6 + .../testing/selftests/bpf/progs/bind6_prog.c | 6 + .../selftests/bpf/progs/connect4_prog.c | 6 + .../selftests/bpf/progs/connect6_prog.c | 6 + .../selftests/bpf/progs/connect_unix_prog.c | 6 + .../selftests/bpf/progs/sendmsg_unix_prog.c | 6 + 7 files changed, 378 insertions(+)
tools/testing/selftests/bpf/prog_tests/sock_addr.c +342 -0
@@ -439,13 +439,18 @@ static void prog_name##_destroy(void *skel) \BPF_SKEL_FUNCS (bind4_prog, bind_v4_prog);BPF_SKEL_FUNCS_RAW (bind4_prog, bind_v4_prog); +BPF_SKEL_FUNCS (bind4_prog, bind_v4_deny_prog);BPF_SKEL_FUNCS (bind6_prog, bind_v6_prog);BPF_SKEL_FUNCS_RAW (bind6_prog, bind_v6_prog); +BPF_SKEL_FUNCS (bind6_prog, bind_v6_deny_prog);BPF_SKEL_FUNCS (connect4_prog, connect_v4_prog);BPF_SKEL_FUNCS_RAW (connect4_prog, connect_v4_prog); +BPF_SKEL_FUNCS (connect4_prog, connect_v4_deny_prog);BPF_SKEL_FUNCS (connect6_prog, connect_v6_prog);BPF_SKEL_FUNCS_RAW (connect6_prog, connect_v6_prog); +BPF_SKEL_FUNCS (connect6_prog, connect_v6_deny_prog);BPF_SKEL_FUNCS (connect_unix_prog, connect_unix_prog); +BPF_SKEL_FUNCS (connect_unix_prog, connect_unix_deny_prog);BPF_SKEL_FUNCS (sendmsg4_prog, sendmsg_v4_prog);BPF_SKEL_FUNCS_RAW (sendmsg4_prog, sendmsg_v4_prog);BPF_SKEL_FUNCS (sendmsg4_prog, sendmsg_v4_deny_prog);
@@ -456,6 +461,7 @@ BPF_SKEL_FUNCS(sendmsg6_prog, sendmsg_v6_preserve_dst_prog);BPF_SKEL_FUNCS (sendmsg6_prog, sendmsg_v6_v4mapped_prog);BPF_SKEL_FUNCS (sendmsg6_prog, sendmsg_v6_wildcard_prog);BPF_SKEL_FUNCS (sendmsg_unix_prog, sendmsg_unix_prog); +BPF_SKEL_FUNCS (sendmsg_unix_prog, sendmsg_unix_deny_prog);BPF_SKEL_FUNCS (recvmsg4_prog, recvmsg4_prog);BPF_SKEL_FUNCS (recvmsg6_prog, recvmsg6_prog);BPF_SKEL_FUNCS (recvmsg_unix_prog, recvmsg_unix_prog);
@@ -480,6 +486,22 @@ static struct sock_addr_test tests[] = {NULL ,SUCCESS , }, + { +SOCK_ADDR_TEST_BIND , +"bind4: bind deny (stream)" , + bind_v4_deny_prog_load, + bind_v4_deny_prog_destroy, +BPF_CGROUP_INET4_BIND , + &user_ops, +AF_INET , +SOCK_STREAM , +SERV4_IP , +SERV4_PORT , +SERV4_REWRITE_IP , +SERV4_REWRITE_PORT , +NULL , +SYSCALL_EPERM , + }, {SOCK_ADDR_TEST_BIND , "bind4: bind (dgram)",
@@ -496,6 +518,22 @@ static struct sock_addr_test tests[] = {NULL ,SUCCESS , }, + { +SOCK_ADDR_TEST_BIND , +"bind4: bind deny (dgram)" , + bind_v4_deny_prog_load, + bind_v4_deny_prog_destroy, +BPF_CGROUP_INET4_BIND , + &user_ops, +AF_INET , +SOCK_DGRAM , +SERV4_IP , +SERV4_PORT , +SERV4_REWRITE_IP , +SERV4_REWRITE_PORT , +NULL , +SYSCALL_EPERM , + }, {SOCK_ADDR_TEST_BIND , "bind4: load prog with wrong expected attach type",
@@ -544,6 +582,22 @@ static struct sock_addr_test tests[] = {NULL ,SUCCESS , }, + { +SOCK_ADDR_TEST_BIND , +"bind6: bind deny (stream)" , + bind_v6_deny_prog_load, + bind_v6_deny_prog_destroy, +BPF_CGROUP_INET6_BIND , + &user_ops, +AF_INET6 , +SOCK_STREAM , +SERV6_IP , +SERV6_PORT , +SERV6_REWRITE_IP , +SERV6_REWRITE_PORT , +NULL , +SYSCALL_EPERM , + }, {SOCK_ADDR_TEST_BIND , "bind6: bind (dgram)",
@@ -560,6 +614,22 @@ static struct sock_addr_test tests[] = {NULL ,SUCCESS , }, + { +SOCK_ADDR_TEST_BIND , +"bind6: bind deny (dgram)" , + bind_v6_deny_prog_load, + bind_v6_deny_prog_destroy, +BPF_CGROUP_INET6_BIND , + &user_ops, +AF_INET6 , +SOCK_DGRAM , +SERV6_IP , +SERV6_PORT , +SERV6_REWRITE_IP , +SERV6_REWRITE_PORT , +NULL , +SYSCALL_EPERM , + }, {SOCK_ADDR_TEST_BIND , "bind6: load prog with wrong expected attach type",
@@ -610,6 +680,22 @@ static struct sock_addr_test tests[] = {NULL ,SUCCESS , }, + { +SOCK_ADDR_TEST_BIND , +"bind4: kernel_bind deny (stream)" , + bind_v4_deny_prog_load, + bind_v4_deny_prog_destroy, +BPF_CGROUP_INET4_BIND , + &kern_ops_sock_sendmsg, +AF_INET , +SOCK_STREAM , +SERV4_IP , +SERV4_PORT , +SERV4_REWRITE_IP , +SERV4_REWRITE_PORT , +NULL , +SYSCALL_EPERM , + }, {SOCK_ADDR_TEST_BIND , "bind4: kernel_bind (dgram)",
@@ -626,6 +712,22 @@ static struct sock_addr_test tests[] = {NULL ,SUCCESS , }, + { +SOCK_ADDR_TEST_BIND , +"bind4: kernel_bind deny (dgram)" , + bind_v4_deny_prog_load, + bind_v4_deny_prog_destroy, +BPF_CGROUP_INET4_BIND , + &kern_ops_sock_sendmsg, +AF_INET , +SOCK_DGRAM , +SERV4_IP , +SERV4_PORT , +SERV4_REWRITE_IP , +SERV4_REWRITE_PORT , +NULL , +SYSCALL_EPERM , + }, {SOCK_ADDR_TEST_BIND , "bind6: kernel_bind (stream)",
@@ -642,6 +744,22 @@ static struct sock_addr_test tests[] = {NULL ,SUCCESS , }, + { +SOCK_ADDR_TEST_BIND , +"bind6: kernel_bind deny (stream)" , + bind_v6_deny_prog_load, + bind_v6_deny_prog_destroy, +BPF_CGROUP_INET6_BIND , + &kern_ops_sock_sendmsg, +AF_INET6 , +SOCK_STREAM , +SERV6_IP , +SERV6_PORT , +SERV6_REWRITE_IP , +SERV6_REWRITE_PORT , +NULL , +SYSCALL_EPERM , + }, {SOCK_ADDR_TEST_BIND , "bind6: kernel_bind (dgram)",
@@ -658,6 +776,22 @@ static struct sock_addr_test tests[] = {NULL ,SUCCESS , }, + { +SOCK_ADDR_TEST_BIND , +"bind6: kernel_bind deny (dgram)" , + bind_v6_deny_prog_load, + bind_v6_deny_prog_destroy, +BPF_CGROUP_INET6_BIND , + &kern_ops_sock_sendmsg, +AF_INET6 , +SOCK_DGRAM , +SERV6_IP , +SERV6_PORT , +SERV6_REWRITE_IP , +SERV6_REWRITE_PORT , +NULL , + SYSCALL_EPERM, + }, /* connect - system calls */ {
@@ -676,6 +810,22 @@ static struct sock_addr_test tests[] = {SRC4_REWRITE_IP ,SUCCESS , }, + { +SOCK_ADDR_TEST_CONNECT , +"connect4: connect deny (stream)" , + connect_v4_deny_prog_load, + connect_v4_deny_prog_destroy, +BPF_CGROUP_INET4_CONNECT , + &user_ops, +AF_INET , +SOCK_STREAM , +SERV4_IP , +SERV4_PORT , +SERV4_REWRITE_IP , +SERV4_REWRITE_PORT , +SRC4_REWRITE_IP , +SYSCALL_EPERM , + }, {SOCK_ADDR_TEST_CONNECT , "connect4: connect (dgram)",
@@ -692,6 +842,22 @@ static struct sock_addr_test tests[] = {SRC4_REWRITE_IP ,SUCCESS , }, + { +SOCK_ADDR_TEST_CONNECT , +"connect4: connect deny (dgram)" , + connect_v4_deny_prog_load, + connect_v4_deny_prog_destroy, +BPF_CGROUP_INET4_CONNECT , + &user_ops, +AF_INET , +SOCK_DGRAM , +SERV4_IP , +SERV4_PORT , +SERV4_REWRITE_IP , +SERV4_REWRITE_PORT , +SRC4_REWRITE_IP , +SYSCALL_EPERM , + }, {SOCK_ADDR_TEST_CONNECT , "connect4: load prog with wrong expected attach type",
@@ -740,6 +906,22 @@ static struct sock_addr_test tests[] = {SRC6_REWRITE_IP ,SUCCESS , }, + { +SOCK_ADDR_TEST_CONNECT , +"connect6: connect deny (stream)" , + connect_v6_deny_prog_load, + connect_v6_deny_prog_destroy, +BPF_CGROUP_INET6_CONNECT , + &user_ops, +AF_INET6 , +SOCK_STREAM , +SERV6_IP , +SERV6_PORT , +SERV6_REWRITE_IP , +SERV6_REWRITE_PORT , +SRC6_REWRITE_IP , +SYSCALL_EPERM , + }, {SOCK_ADDR_TEST_CONNECT , "connect6: connect (dgram)",
@@ -756,6 +938,22 @@ static struct sock_addr_test tests[] = {SRC6_REWRITE_IP ,SUCCESS , }, + { +SOCK_ADDR_TEST_CONNECT , +"connect6: connect deny (dgram)" , + connect_v6_deny_prog_load, + connect_v6_deny_prog_destroy, +BPF_CGROUP_INET6_CONNECT , + &user_ops, +AF_INET6 , +SOCK_DGRAM , +SERV6_IP , +SERV6_PORT , +SERV6_REWRITE_IP , +SERV6_REWRITE_PORT , +SRC6_REWRITE_IP , +SYSCALL_EPERM , + }, {SOCK_ADDR_TEST_CONNECT , "connect6: load prog with wrong expected attach type",
@@ -804,6 +1002,22 @@ static struct sock_addr_test tests[] = {NULL ,SUCCESS , }, + { +SOCK_ADDR_TEST_CONNECT , +"connect_unix: connect deny (stream)" , + connect_unix_deny_prog_load, + connect_unix_deny_prog_destroy, +BPF_CGROUP_UNIX_CONNECT , + &user_ops, +AF_UNIX , +SOCK_STREAM , +SERVUN_ADDRESS , +0 , +SERVUN_REWRITE_ADDRESS , +0 , +NULL , + SYSCALL_EPERM, + }, /* connect - kernel calls */ {
@@ -822,6 +1036,22 @@ static struct sock_addr_test tests[] = {SRC4_REWRITE_IP ,SUCCESS , }, + { +SOCK_ADDR_TEST_CONNECT , +"connect4: kernel_connect deny (stream)" , + connect_v4_deny_prog_load, + connect_v4_deny_prog_destroy, +BPF_CGROUP_INET4_CONNECT , + &kern_ops_sock_sendmsg, +AF_INET , +SOCK_STREAM , +SERV4_IP , +SERV4_PORT , +SERV4_REWRITE_IP , +SERV4_REWRITE_PORT , +SRC4_REWRITE_IP , +SYSCALL_EPERM , + }, {SOCK_ADDR_TEST_CONNECT , "connect4: kernel_connect (dgram)",
@@ -838,6 +1068,22 @@ static struct sock_addr_test tests[] = {SRC4_REWRITE_IP ,SUCCESS , }, + { +SOCK_ADDR_TEST_CONNECT , +"connect4: kernel_connect deny (dgram)" , + connect_v4_deny_prog_load, + connect_v4_deny_prog_destroy, +BPF_CGROUP_INET4_CONNECT , + &kern_ops_sock_sendmsg, +AF_INET , +SOCK_DGRAM , +SERV4_IP , +SERV4_PORT , +SERV4_REWRITE_IP , +SERV4_REWRITE_PORT , +SRC4_REWRITE_IP , +SYSCALL_EPERM , + }, {SOCK_ADDR_TEST_CONNECT , "connect6: kernel_connect (stream)",
@@ -854,6 +1100,22 @@ static struct sock_addr_test tests[] = {SRC6_REWRITE_IP ,SUCCESS , }, + { +SOCK_ADDR_TEST_CONNECT , +"connect6: kernel_connect deny (stream)" , + connect_v6_deny_prog_load, + connect_v6_deny_prog_destroy, +BPF_CGROUP_INET6_CONNECT , + &kern_ops_sock_sendmsg, +AF_INET6 , +SOCK_STREAM , +SERV6_IP , +SERV6_PORT , +SERV6_REWRITE_IP , +SERV6_REWRITE_PORT , +SRC6_REWRITE_IP , +SYSCALL_EPERM , + }, {SOCK_ADDR_TEST_CONNECT , "connect6: kernel_connect (dgram)",
@@ -870,6 +1132,22 @@ static struct sock_addr_test tests[] = {SRC6_REWRITE_IP ,SUCCESS , }, + { +SOCK_ADDR_TEST_CONNECT , +"connect6: kernel_connect deny (dgram)" , + connect_v6_deny_prog_load, + connect_v6_deny_prog_destroy, +BPF_CGROUP_INET6_CONNECT , + &kern_ops_sock_sendmsg, +AF_INET6 , +SOCK_DGRAM , +SERV6_IP , +SERV6_PORT , +SERV6_REWRITE_IP , +SERV6_REWRITE_PORT , +SRC6_REWRITE_IP , +SYSCALL_EPERM , + }, {SOCK_ADDR_TEST_CONNECT , "connect_unix: kernel_connect (dgram)",
@@ -886,6 +1164,22 @@ static struct sock_addr_test tests[] = {NULL ,SUCCESS , }, + { +SOCK_ADDR_TEST_CONNECT , +"connect_unix: kernel_connect deny (dgram)" , + connect_unix_deny_prog_load, + connect_unix_deny_prog_destroy, +BPF_CGROUP_UNIX_CONNECT , + &kern_ops_sock_sendmsg, +AF_UNIX , +SOCK_STREAM , +SERVUN_ADDRESS , +0 , +SERVUN_REWRITE_ADDRESS , +0 , +NULL , + SYSCALL_EPERM, + }, /* sendmsg - system calls */ {
@@ -1080,6 +1374,22 @@ static struct sock_addr_test tests[] = {NULL ,SUCCESS , }, + { +SOCK_ADDR_TEST_SENDMSG , +"sendmsg_unix: sendmsg deny (dgram)" , + sendmsg_unix_deny_prog_load, + sendmsg_unix_deny_prog_destroy, +BPF_CGROUP_UNIX_SENDMSG , + &user_ops, +AF_UNIX , +SOCK_DGRAM , +SERVUN_ADDRESS , +0 , +SERVUN_REWRITE_ADDRESS , +0 , +NULL , + SYSCALL_EPERM, + }, /* sendmsg - kernel calls (sock_sendmsg) */ {
@@ -1178,6 +1488,22 @@ static struct sock_addr_test tests[] = {NULL ,SUCCESS , }, + { +SOCK_ADDR_TEST_SENDMSG , +"sendmsg_unix: sock_sendmsg deny (dgram)" , + sendmsg_unix_deny_prog_load, + sendmsg_unix_deny_prog_destroy, +BPF_CGROUP_UNIX_SENDMSG , + &kern_ops_sock_sendmsg, +AF_UNIX , +SOCK_DGRAM , +SERVUN_ADDRESS , +0 , +SERVUN_REWRITE_ADDRESS , +0 , +NULL , + SYSCALL_EPERM, + }, /* sendmsg - kernel calls (kernel_sendmsg) */ {
@@ -1276,6 +1602,22 @@ static struct sock_addr_test tests[] = {NULL ,SUCCESS , }, + { +SOCK_ADDR_TEST_SENDMSG , +"sendmsg_unix: kernel_sendmsg deny (dgram)" , + sendmsg_unix_deny_prog_load, + sendmsg_unix_deny_prog_destroy, +BPF_CGROUP_UNIX_SENDMSG , + &kern_ops_kernel_sendmsg, +AF_UNIX , +SOCK_DGRAM , +SERVUN_ADDRESS , +0 , +SERVUN_REWRITE_ADDRESS , +0 , +NULL , + SYSCALL_EPERM, + }, /* recvmsg - system calls */ {
tools/testing/selftests/bpf/progs/bind4_prog.c +6 -0
@@ -158,4 +158,10 @@ int bind_v4_prog(struct bpf_sock_addr *ctx)return 1 ; } +SEC("cgroup/bind4") +int bind_v4_deny_prog (struct bpf_sock_addr *ctx) +{ +return 0 ; +} + char _license[] SEC("license") = "GPL";
tools/testing/selftests/bpf/progs/bind6_prog.c +6 -0
@@ -175,4 +175,10 @@ int bind_v6_prog(struct bpf_sock_addr *ctx)return 1 ; } +SEC("cgroup/bind6") +int bind_v6_deny_prog (struct bpf_sock_addr *ctx) +{ +return 0 ; +} + char _license[] SEC("license") = "GPL";
tools/testing/selftests/bpf/progs/connect4_prog.c +6 -0
@@ -199,4 +199,10 @@ int connect_v4_prog(struct bpf_sock_addr *ctx)return do_bind (ctx) ?1 :0 ; } +SEC("cgroup/connect4") +int connect_v4_deny_prog (struct bpf_sock_addr *ctx) +{ +return 0 ; +} + char _license[] SEC("license") = "GPL";
tools/testing/selftests/bpf/progs/connect6_prog.c +6 -0
@@ -90,4 +90,10 @@ int connect_v6_prog(struct bpf_sock_addr *ctx)return 1 ; } +SEC("cgroup/connect6") +int connect_v6_deny_prog (struct bpf_sock_addr *ctx) +{ +return 0 ; +} + char _license[] SEC("license") = "GPL";
tools/testing/selftests/bpf/progs/connect_unix_prog.c +6 -0
@@ -36,4 +36,10 @@ int connect_unix_prog(struct bpf_sock_addr *ctx)return 1 ; } +SEC("cgroup/connect_unix") +int connect_unix_deny_prog (struct bpf_sock_addr *ctx) +{ +return 0 ; +} + char _license[] SEC("license") = "GPL";
tools/testing/selftests/bpf/progs/sendmsg_unix_prog.c +6 -0
@@ -36,4 +36,10 @@ int sendmsg_unix_prog(struct bpf_sock_addr *ctx)return 1 ; } +SEC("cgroup/sendmsg_unix") +int sendmsg_unix_deny_prog (struct bpf_sock_addr *ctx) +{ +return 0 ; +} + char _license[] SEC("license") = "GPL";
Signature · 1 line
2.45.0.118.g7fe29c98d7-goog
PATCH 16/17 selftests/bpf: Expand getsockname and getpeername tests
In reply to Jordan RifeThis expands coverage for getsockname and getpeername hooks to include getsockname4, getsockname6, getpeername4, and getpeername6.
--- .../selftests/bpf/prog_tests/sock_addr.c | 304 +++++++++++++++++- .../selftests/bpf/progs/getpeername4_prog.c | 24 ++ .../selftests/bpf/progs/getpeername6_prog.c | 31 ++ .../selftests/bpf/progs/getsockname4_prog.c | 24 ++ .../selftests/bpf/progs/getsockname6_prog.c | 31 ++ 5 files changed, 412 insertions(+), 2 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/getpeername4_prog.c create mode 100644 tools/testing/selftests/bpf/progs/getpeername6_prog.c create mode 100644 tools/testing/selftests/bpf/progs/getsockname4_prog.c create mode 100644 tools/testing/selftests/bpf/progs/getsockname6_prog.c
tools/testing/selftests/bpf/prog_tests/sock_addr.c +302 -2
@@ -15,7 +15,11 @@#include "recvmsg6_prog.skel.h" #include "sendmsg_unix_prog.skel.h" #include "recvmsg_unix_prog.skel.h" +#include "getsockname4_prog.skel.h" +#include "getsockname6_prog.skel.h" #include "getsockname_unix_prog.skel.h" +#include "getpeername4_prog.skel.h" +#include "getpeername6_prog.skel.h" #include "getpeername_unix_prog.skel.h" #include "network_helpers.h"
@@ -466,7 +470,11 @@ BPF_SKEL_FUNCS(recvmsg4_prog, recvmsg4_prog);BPF_SKEL_FUNCS (recvmsg6_prog, recvmsg6_prog);BPF_SKEL_FUNCS (recvmsg_unix_prog, recvmsg_unix_prog);BPF_SKEL_FUNCS (getsockname_unix_prog, getsockname_unix_prog); +BPF_SKEL_FUNCS (getsockname4_prog, getsockname_v4_prog); +BPF_SKEL_FUNCS (getsockname6_prog, getsockname_v6_prog);BPF_SKEL_FUNCS (getpeername_unix_prog, getpeername_unix_prog); +BPF_SKEL_FUNCS (getpeername4_prog, getpeername_v4_prog); +BPF_SKEL_FUNCS (getpeername6_prog, getpeername_v6_prog);static struct sock_addr_test tests[] = {/* bind - system calls */
@@ -1688,7 +1696,71 @@ static struct sock_addr_test tests[] = {/* getsockname - system calls */ {SOCK_ADDR_TEST_GETSOCKNAME , -"getsockname_unix" , +"getsockname4: getsockname (stream)" , + getsockname_v4_prog_load, + getsockname_v4_prog_destroy, +BPF_CGROUP_INET4_GETSOCKNAME , + &user_ops, +AF_INET , +SOCK_STREAM , +SERV4_REWRITE_IP , +SERV4_REWRITE_PORT , +SERV4_IP , +SERV4_PORT , +NULL , +SUCCESS , + }, + { +SOCK_ADDR_TEST_GETSOCKNAME , +"getsockname4: getsockname (dgram)" , + getsockname_v4_prog_load, + getsockname_v4_prog_destroy, +BPF_CGROUP_INET4_GETSOCKNAME , + &user_ops, +AF_INET , +SOCK_DGRAM , +SERV4_REWRITE_IP , +SERV4_REWRITE_PORT , +SERV4_IP , +SERV4_PORT , +NULL , +SUCCESS , + }, + { +SOCK_ADDR_TEST_GETSOCKNAME , +"getsockname6: getsockname (stream)" , + getsockname_v6_prog_load, + getsockname_v6_prog_destroy, +BPF_CGROUP_INET6_GETSOCKNAME , + &user_ops, +AF_INET6 , +SOCK_STREAM , +SERV6_REWRITE_IP , +SERV6_REWRITE_PORT , +SERV6_IP , +SERV6_PORT , +NULL , +SUCCESS , + }, + { +SOCK_ADDR_TEST_GETSOCKNAME , +"getsockname6: getsockname (dgram)" , + getsockname_v6_prog_load, + getsockname_v6_prog_destroy, +BPF_CGROUP_INET6_GETSOCKNAME , + &user_ops, +AF_INET6 , +SOCK_DGRAM , +SERV6_REWRITE_IP , +SERV6_REWRITE_PORT , +SERV6_IP , +SERV6_PORT , +NULL , +SUCCESS , + }, + { +SOCK_ADDR_TEST_GETSOCKNAME , +"getsockname_unix: getsockname" , getsockname_unix_prog_load, getsockname_unix_prog_destroy, BPF_CGROUP_UNIX_GETSOCKNAME,
@@ -1703,10 +1775,156 @@ static struct sock_addr_test tests[] = { SUCCESS, }, +/* getsockname - kernel calls */ + { +SOCK_ADDR_TEST_GETSOCKNAME , +"getsockname4: kernel_getsockname (stream)" , + getsockname_v4_prog_load, + getsockname_v4_prog_destroy, +BPF_CGROUP_INET4_GETSOCKNAME , + &kern_ops_kernel_sendmsg, +AF_INET , +SOCK_STREAM , +SERV4_REWRITE_IP , +SERV4_REWRITE_PORT , +SERV4_IP , +SERV4_PORT , +NULL , +SUCCESS , + }, + { +SOCK_ADDR_TEST_GETSOCKNAME , +"getsockname4: kernel_getsockname (dgram)" , + getsockname_v4_prog_load, + getsockname_v4_prog_destroy, +BPF_CGROUP_INET4_GETSOCKNAME , + &kern_ops_kernel_sendmsg, +AF_INET , +SOCK_DGRAM , +SERV4_REWRITE_IP , +SERV4_REWRITE_PORT , +SERV4_IP , +SERV4_PORT , +NULL , +SUCCESS , + }, + { +SOCK_ADDR_TEST_GETSOCKNAME , +"getsockname6: kernel_getsockname (stream)" , + getsockname_v6_prog_load, + getsockname_v6_prog_destroy, +BPF_CGROUP_INET6_GETSOCKNAME , + &kern_ops_kernel_sendmsg, +AF_INET6 , +SOCK_STREAM , +SERV6_REWRITE_IP , +SERV6_REWRITE_PORT , +SERV6_IP , +SERV6_PORT , +NULL , +SUCCESS , + }, + { +SOCK_ADDR_TEST_GETSOCKNAME , +"getsockname6: kernel_getsockname (dgram)" , + getsockname_v6_prog_load, + getsockname_v6_prog_destroy, +BPF_CGROUP_INET6_GETSOCKNAME , + &kern_ops_kernel_sendmsg, +AF_INET6 , +SOCK_DGRAM , +SERV6_REWRITE_IP , +SERV6_REWRITE_PORT , +SERV6_IP , +SERV6_PORT , +NULL , +SUCCESS , + }, + { +SOCK_ADDR_TEST_GETSOCKNAME , +"getsockname_unix: kernel_getsockname" , + getsockname_unix_prog_load, + getsockname_unix_prog_destroy, +BPF_CGROUP_UNIX_GETSOCKNAME , + &kern_ops_kernel_sendmsg, +AF_UNIX , +SOCK_STREAM , +SERVUN_ADDRESS , +0 , +SERVUN_REWRITE_ADDRESS , +0 , +NULL , +SUCCESS , + }, + /* getpeername - system calls */ {SOCK_ADDR_TEST_GETPEERNAME , -"getpeername_unix" , +"getpeername4: getpeername (stream)" , + getpeername_v4_prog_load, + getpeername_v4_prog_destroy, +BPF_CGROUP_INET4_GETPEERNAME , + &user_ops, +AF_INET , +SOCK_STREAM , +SERV4_REWRITE_IP , +SERV4_REWRITE_PORT , +SERV4_IP , +SERV4_PORT , +NULL , +SUCCESS , + }, + { +SOCK_ADDR_TEST_GETPEERNAME , +"getpeername4: getpeername (dgram)" , + getpeername_v4_prog_load, + getpeername_v4_prog_destroy, +BPF_CGROUP_INET4_GETPEERNAME , + &user_ops, +AF_INET , +SOCK_DGRAM , +SERV4_REWRITE_IP , +SERV4_REWRITE_PORT , +SERV4_IP , +SERV4_PORT , +NULL , +SUCCESS , + }, + { +SOCK_ADDR_TEST_GETPEERNAME , +"getpeername6: getpeername (stream)" , + getpeername_v6_prog_load, + getpeername_v6_prog_destroy, +BPF_CGROUP_INET6_GETPEERNAME , + &user_ops, +AF_INET6 , +SOCK_STREAM , +SERV6_REWRITE_IP , +SERV6_REWRITE_PORT , +SERV6_IP , +SERV6_PORT , +NULL , +SUCCESS , + }, + { +SOCK_ADDR_TEST_GETPEERNAME , +"getpeername6: getpeername (dgram)" , + getpeername_v6_prog_load, + getpeername_v6_prog_destroy, +BPF_CGROUP_INET6_GETPEERNAME , + &user_ops, +AF_INET6 , +SOCK_DGRAM , +SERV6_REWRITE_IP , +SERV6_REWRITE_PORT , +SERV6_IP , +SERV6_PORT , +NULL , +SUCCESS , + }, + { +SOCK_ADDR_TEST_GETPEERNAME , +"getpeername_unix: getpeername" , getpeername_unix_prog_load, getpeername_unix_prog_destroy, BPF_CGROUP_UNIX_GETPEERNAME,
@@ -1720,6 +1938,88 @@ static struct sock_addr_test tests[] = { NULL, SUCCESS, }, + +/* getpeername - kernel calls */ + { +SOCK_ADDR_TEST_GETPEERNAME , +"getpeername4: kernel_getpeername (stream)" , + getpeername_v4_prog_load, + getpeername_v4_prog_destroy, +BPF_CGROUP_INET4_GETPEERNAME , + &kern_ops_kernel_sendmsg, +AF_INET , +SOCK_STREAM , +SERV4_REWRITE_IP , +SERV4_REWRITE_PORT , +SERV4_IP , +SERV4_PORT , +NULL , +SUCCESS , + }, + { +SOCK_ADDR_TEST_GETPEERNAME , +"getpeername4: kernel_getpeername (dgram)" , + getpeername_v4_prog_load, + getpeername_v4_prog_destroy, +BPF_CGROUP_INET4_GETPEERNAME , + &kern_ops_kernel_sendmsg, +AF_INET , +SOCK_DGRAM , +SERV4_REWRITE_IP , +SERV4_REWRITE_PORT , +SERV4_IP , +SERV4_PORT , +NULL , +SUCCESS , + }, + { +SOCK_ADDR_TEST_GETPEERNAME , +"getpeername6: kernel_getpeername (stream)" , + getpeername_v6_prog_load, + getpeername_v6_prog_destroy, +BPF_CGROUP_INET6_GETPEERNAME , + &kern_ops_kernel_sendmsg, +AF_INET6 , +SOCK_STREAM , +SERV6_REWRITE_IP , +SERV6_REWRITE_PORT , +SERV6_IP , +SERV6_PORT , +NULL , +SUCCESS , + }, + { +SOCK_ADDR_TEST_GETPEERNAME , +"getpeername6: kernel_getpeername (dgram)" , + getpeername_v6_prog_load, + getpeername_v6_prog_destroy, +BPF_CGROUP_INET6_GETPEERNAME , + &kern_ops_kernel_sendmsg, +AF_INET6 , +SOCK_DGRAM , +SERV6_REWRITE_IP , +SERV6_REWRITE_PORT , +SERV6_IP , +SERV6_PORT , +NULL , +SUCCESS , + }, + { +SOCK_ADDR_TEST_GETPEERNAME , +"getpeername_unix: kernel_getpeername" , + getpeername_unix_prog_load, + getpeername_unix_prog_destroy, +BPF_CGROUP_UNIX_GETPEERNAME , + &kern_ops_kernel_sendmsg, +AF_UNIX , +SOCK_STREAM , +SERVUN_ADDRESS , +0 , +SERVUN_REWRITE_ADDRESS , +0 , +NULL , + SUCCESS, + }, };typedef int (*info_fn )(int ,struct sockaddr *,socklen_t *);
tools/testing/selftests/bpf/progs/getpeername4_prog.c new file +24 -0
@@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2024 Google LLC */ + +#include "vmlinux.h" + +#include <string.h> +#include <bpf/bpf_helpers.h> +#include <bpf/bpf_endian.h> +#include <bpf/bpf_core_read.h> +#include "bpf_kfuncs.h" + +#define REWRITE_ADDRESS_IP4 0xc0a801fe // 192.168.1.254 +#define REWRITE_ADDRESS_PORT4 4040 + +SEC("cgroup/getpeername4") +int getpeername_v4_prog (struct bpf_sock_addr *ctx) +{ + ctx->user_ip4 =bpf_htonl (REWRITE_ADDRESS_IP4 ); + ctx->user_port =bpf_htons (REWRITE_ADDRESS_PORT4 ); + +return 1 ; +} + +char _license[] SEC("license") = "GPL";
tools/testing/selftests/bpf/progs/getpeername6_prog.c new file +31 -0
@@ -0,0 +1,31 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2024 Google LLC */ + +#include "vmlinux.h" + +#include <string.h> +#include <bpf/bpf_helpers.h> +#include <bpf/bpf_endian.h> +#include <bpf/bpf_core_read.h> +#include "bpf_kfuncs.h" + +#define REWRITE_ADDRESS_IP6_0 0xfaceb00c +#define REWRITE_ADDRESS_IP6_1 0x12345678 +#define REWRITE_ADDRESS_IP6_2 0x00000000 +#define REWRITE_ADDRESS_IP6_3 0x0000abcd + +#define REWRITE_ADDRESS_PORT6 6060 + +SEC("cgroup/getpeername6") +int getpeername_v6_prog (struct bpf_sock_addr *ctx) +{ + ctx->user_ip6[0 ] =bpf_htonl (REWRITE_ADDRESS_IP6_0 ); + ctx->user_ip6[1 ] =bpf_htonl (REWRITE_ADDRESS_IP6_1 ); + ctx->user_ip6[2 ] =bpf_htonl (REWRITE_ADDRESS_IP6_2 ); + ctx->user_ip6[3 ] =bpf_htonl (REWRITE_ADDRESS_IP6_3 ); + ctx->user_port =bpf_htons (REWRITE_ADDRESS_PORT6 ); + +return 1 ; +} + +char _license[] SEC("license") = "GPL";
tools/testing/selftests/bpf/progs/getsockname4_prog.c new file +24 -0
@@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2024 Google LLC */ + +#include "vmlinux.h" + +#include <string.h> +#include <bpf/bpf_helpers.h> +#include <bpf/bpf_endian.h> +#include <bpf/bpf_core_read.h> +#include "bpf_kfuncs.h" + +#define REWRITE_ADDRESS_IP4 0xc0a801fe // 192.168.1.254 +#define REWRITE_ADDRESS_PORT4 4040 + +SEC("cgroup/getsockname4") +int getsockname_v4_prog (struct bpf_sock_addr *ctx) +{ + ctx->user_ip4 =bpf_htonl (REWRITE_ADDRESS_IP4 ); + ctx->user_port =bpf_htons (REWRITE_ADDRESS_PORT4 ); + +return 1 ; +} + +char _license[] SEC("license") = "GPL";
tools/testing/selftests/bpf/progs/getsockname6_prog.c new file +31 -0
@@ -0,0 +1,31 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2024 Google LLC */ + +#include "vmlinux.h" + +#include <string.h> +#include <bpf/bpf_helpers.h> +#include <bpf/bpf_endian.h> +#include <bpf/bpf_core_read.h> +#include "bpf_kfuncs.h" + +#define REWRITE_ADDRESS_IP6_0 0xfaceb00c +#define REWRITE_ADDRESS_IP6_1 0x12345678 +#define REWRITE_ADDRESS_IP6_2 0x00000000 +#define REWRITE_ADDRESS_IP6_3 0x0000abcd + +#define REWRITE_ADDRESS_PORT6 6060 + +SEC("cgroup/getsockname6") +int getsockname_v6_prog (struct bpf_sock_addr *ctx) +{ + ctx->user_ip6[0 ] =bpf_htonl (REWRITE_ADDRESS_IP6_0 ); + ctx->user_ip6[1 ] =bpf_htonl (REWRITE_ADDRESS_IP6_1 ); + ctx->user_ip6[2 ] =bpf_htonl (REWRITE_ADDRESS_IP6_2 ); + ctx->user_ip6[3 ] =bpf_htonl (REWRITE_ADDRESS_IP6_3 ); + ctx->user_port =bpf_htons (REWRITE_ADDRESS_PORT6 ); + +return 1 ; +} + +char _license[] SEC("license") = "GPL";
Signature · 1 line
2.45.0.118.g7fe29c98d7-goog
PATCH 17/17 selftests/bpf: Expand ATTACH_REJECT tests
In reply to Jordan RifeThis expands coverage for ATTACH_REJECT tests to include connect_unix, sendmsg_unix, recvmsg*, getsockname*, and getpeername*.
--- .../selftests/bpf/prog_tests/sock_addr.c | 187 ++++++++++++++++++ 1 file changed, 187 insertions(+)
tools/testing/selftests/bpf/prog_tests/sock_addr.c +187 -0
@@ -454,6 +454,7 @@ BPF_SKEL_FUNCS(connect6_prog, connect_v6_prog);BPF_SKEL_FUNCS_RAW (connect6_prog, connect_v6_prog);BPF_SKEL_FUNCS (connect6_prog, connect_v6_deny_prog);BPF_SKEL_FUNCS (connect_unix_prog, connect_unix_prog); +BPF_SKEL_FUNCS_RAW (connect_unix_prog, connect_unix_prog);BPF_SKEL_FUNCS (connect_unix_prog, connect_unix_deny_prog);BPF_SKEL_FUNCS (sendmsg4_prog, sendmsg_v4_prog);BPF_SKEL_FUNCS_RAW (sendmsg4_prog, sendmsg_v4_prog);
@@ -465,16 +466,26 @@ BPF_SKEL_FUNCS(sendmsg6_prog, sendmsg_v6_preserve_dst_prog);BPF_SKEL_FUNCS (sendmsg6_prog, sendmsg_v6_v4mapped_prog);BPF_SKEL_FUNCS (sendmsg6_prog, sendmsg_v6_wildcard_prog);BPF_SKEL_FUNCS (sendmsg_unix_prog, sendmsg_unix_prog); +BPF_SKEL_FUNCS_RAW (sendmsg_unix_prog, sendmsg_unix_prog);BPF_SKEL_FUNCS (sendmsg_unix_prog, sendmsg_unix_deny_prog);BPF_SKEL_FUNCS (recvmsg4_prog, recvmsg4_prog); +BPF_SKEL_FUNCS_RAW (recvmsg4_prog, recvmsg4_prog);BPF_SKEL_FUNCS (recvmsg6_prog, recvmsg6_prog); +BPF_SKEL_FUNCS_RAW (recvmsg6_prog, recvmsg6_prog);BPF_SKEL_FUNCS (recvmsg_unix_prog, recvmsg_unix_prog); +BPF_SKEL_FUNCS_RAW (recvmsg_unix_prog, recvmsg_unix_prog);BPF_SKEL_FUNCS (getsockname_unix_prog, getsockname_unix_prog); +BPF_SKEL_FUNCS_RAW (getsockname_unix_prog, getsockname_unix_prog);BPF_SKEL_FUNCS (getsockname4_prog, getsockname_v4_prog); +BPF_SKEL_FUNCS_RAW (getsockname4_prog, getsockname_v4_prog);BPF_SKEL_FUNCS (getsockname6_prog, getsockname_v6_prog); +BPF_SKEL_FUNCS_RAW (getsockname6_prog, getsockname_v6_prog);BPF_SKEL_FUNCS (getpeername_unix_prog, getpeername_unix_prog); +BPF_SKEL_FUNCS_RAW (getpeername_unix_prog, getpeername_unix_prog);BPF_SKEL_FUNCS (getpeername4_prog, getpeername_v4_prog); +BPF_SKEL_FUNCS_RAW (getpeername4_prog, getpeername_v4_prog);BPF_SKEL_FUNCS (getpeername6_prog, getpeername_v6_prog); +BPF_SKEL_FUNCS_RAW (getpeername6_prog, getpeername_v6_prog);static struct sock_addr_test tests[] = {/* bind - system calls */
@@ -1026,6 +1037,22 @@ static struct sock_addr_test tests[] = {NULL ,SYSCALL_EPERM , }, + { +SOCK_ADDR_TEST_CONNECT , +"connect_unix: attach prog with wrong attach type" , + connect_unix_prog_load_raw, + connect_unix_prog_destroy_raw, +BPF_CGROUP_INET4_CONNECT , + &user_ops, +AF_UNIX , +SOCK_STREAM , +SERVUN_ADDRESS , +0 , +SERVUN_REWRITE_ADDRESS , +0 , +NULL , + ATTACH_REJECT, + }, /* connect - kernel calls */ {
@@ -1398,6 +1425,22 @@ static struct sock_addr_test tests[] = {NULL ,SYSCALL_EPERM , }, + { +SOCK_ADDR_TEST_SENDMSG , +"sendmsg_unix: attach prog with wrong attach type" , + sendmsg_unix_prog_load_raw, + sendmsg_unix_prog_destroy_raw, +BPF_CGROUP_UDP4_SENDMSG , + &user_ops, +AF_UNIX , +SOCK_DGRAM , +SERVUN_ADDRESS , +0 , +SERVUN_REWRITE_ADDRESS , +0 , +NULL , + ATTACH_REJECT, + }, /* sendmsg - kernel calls (sock_sendmsg) */ {
@@ -1644,6 +1687,22 @@ static struct sock_addr_test tests[] = {SERV4_IP ,SUCCESS , }, + { +SOCK_ADDR_TEST_RECVMSG , +"recvmsg4: attach prog with wrong attach type" , + recvmsg4_prog_load_raw, + recvmsg4_prog_destroy_raw, +BPF_CGROUP_UDP6_RECVMSG , + &user_ops, +AF_INET , +SOCK_DGRAM , +SERV4_REWRITE_IP , +SERV4_REWRITE_PORT , +SERV4_REWRITE_IP , +SERV4_REWRITE_PORT , +SERV4_IP , +ATTACH_REJECT , + }, {SOCK_ADDR_TEST_RECVMSG , "recvmsg6: recvfrom (dgram)",
@@ -1660,6 +1719,22 @@ static struct sock_addr_test tests[] = {SERV6_IP ,SUCCESS , }, + { +SOCK_ADDR_TEST_RECVMSG , +"recvmsg6: attach prog with wrong attach type" , + recvmsg6_prog_load_raw, + recvmsg6_prog_destroy_raw, +BPF_CGROUP_UDP4_RECVMSG , + &user_ops, +AF_INET6 , +SOCK_DGRAM , +SERV6_REWRITE_IP , +SERV6_REWRITE_PORT , +SERV6_REWRITE_IP , +SERV6_REWRITE_PORT , +SERV6_IP , +ATTACH_REJECT , + }, {SOCK_ADDR_TEST_RECVMSG , "recvmsg_unix: recvfrom (dgram)",
@@ -1692,6 +1767,22 @@ static struct sock_addr_test tests[] = {SERVUN_ADDRESS ,SUCCESS , }, + { +SOCK_ADDR_TEST_RECVMSG , +"recvmsg_unix: attach prog with wrong attach type" , + recvmsg_unix_prog_load_raw, + recvmsg_unix_prog_destroy_raw, +BPF_CGROUP_UDP4_RECVMSG , + &user_ops, +AF_INET6 , +SOCK_STREAM , +SERVUN_REWRITE_ADDRESS , +0 , +SERVUN_REWRITE_ADDRESS , +0 , +SERVUN_ADDRESS , + ATTACH_REJECT, + }, /* getsockname - system calls */ {
@@ -1726,6 +1817,22 @@ static struct sock_addr_test tests[] = {NULL ,SUCCESS , }, + { +SOCK_ADDR_TEST_GETSOCKNAME , +"getsockname4: attach prog with wrong attach type" , + getsockname_v4_prog_load_raw, + getsockname_v4_prog_destroy_raw, +BPF_CGROUP_INET6_GETSOCKNAME , + &user_ops, +AF_INET , +SOCK_DGRAM , +SERV4_REWRITE_IP , +SERV4_REWRITE_PORT , +SERV4_IP , +SERV4_PORT , +NULL , +ATTACH_REJECT , + }, {SOCK_ADDR_TEST_GETSOCKNAME , "getsockname6: getsockname (stream)",
@@ -1758,6 +1865,22 @@ static struct sock_addr_test tests[] = {NULL ,SUCCESS , }, + { +SOCK_ADDR_TEST_GETSOCKNAME , +"getsockname6: attach prog with wrong attach type" , + getsockname_v6_prog_load_raw, + getsockname_v6_prog_destroy_raw, +BPF_CGROUP_INET4_GETSOCKNAME , + &user_ops, +AF_INET6 , +SOCK_DGRAM , +SERV6_REWRITE_IP , +SERV6_REWRITE_PORT , +SERV6_IP , +SERV6_PORT , +NULL , +ATTACH_REJECT , + }, {SOCK_ADDR_TEST_GETSOCKNAME , "getsockname_unix: getsockname",
@@ -1774,6 +1897,22 @@ static struct sock_addr_test tests[] = {NULL ,SUCCESS , }, + { +SOCK_ADDR_TEST_GETSOCKNAME , +"getsockname_unix: attach prog with wrong attach type" , + getsockname_unix_prog_load_raw, + getsockname_unix_prog_destroy_raw, +BPF_CGROUP_INET4_GETSOCKNAME , + &user_ops, +AF_UNIX , +SOCK_STREAM , +SERVUN_ADDRESS , +0 , +SERVUN_REWRITE_ADDRESS , +0 , +NULL , + ATTACH_REJECT, + }, /* getsockname - kernel calls */ {
@@ -1890,6 +2029,22 @@ static struct sock_addr_test tests[] = {NULL ,SUCCESS , }, + { +SOCK_ADDR_TEST_GETPEERNAME , +"getpeername4: attach prog with wrong attach type" , + getpeername_v4_prog_load_raw, + getpeername_v4_prog_destroy_raw, +BPF_CGROUP_INET6_GETSOCKNAME , + &user_ops, +AF_UNIX , +SOCK_DGRAM , +SERV4_REWRITE_IP , +SERV4_REWRITE_PORT , +SERV4_IP , +SERV4_PORT , +NULL , +ATTACH_REJECT , + }, {SOCK_ADDR_TEST_GETPEERNAME , "getpeername6: getpeername (stream)",
@@ -1922,6 +2077,22 @@ static struct sock_addr_test tests[] = {NULL ,SUCCESS , }, + { +SOCK_ADDR_TEST_GETPEERNAME , +"getpeername6: attach prog with wrong attach type" , + getpeername_v6_prog_load_raw, + getpeername_v6_prog_destroy_raw, +BPF_CGROUP_INET4_GETSOCKNAME , + &user_ops, +AF_INET6 , +SOCK_DGRAM , +SERV6_REWRITE_IP , +SERV6_REWRITE_PORT , +SERV6_IP , +SERV6_PORT , +NULL , +ATTACH_REJECT , + }, {SOCK_ADDR_TEST_GETPEERNAME , "getpeername_unix: getpeername",
@@ -1938,6 +2109,22 @@ static struct sock_addr_test tests[] = {NULL ,SUCCESS , }, + { +SOCK_ADDR_TEST_GETPEERNAME , +"getpeername_unix: attach prog with wrong attach type" , + getpeername_unix_prog_load_raw, + getpeername_unix_prog_destroy_raw, +BPF_CGROUP_INET4_GETSOCKNAME , + &user_ops, +AF_UNIX , +SOCK_STREAM , +SERVUN_ADDRESS , +0 , +SERVUN_REWRITE_ADDRESS , +0 , +NULL , + ATTACH_REJECT, + }, /* getpeername - kernel calls */ {
Signature · 1 line
2.45.0.118.g7fe29c98d7-goog
Quoted 71 lines · Jordan Rife
This patch series migrates remaining tests from
bpf/test_sock_addr.ctoprog_tests/sock_addr.candprogs/verifier_sock_addr.cin order to fully retire the old-style test program and expands test coverage to test previously untested scenarios related to sockaddr hooks.This is a continuation of the work started recently during the expansion of
prog_tests/sock_addr.c.=======
Patches
=======
* Patch 1 moves tests that check valid return values for recvmsg hooks intoprogs/verifier_sock_addr.c, a new addition to the verifier test suite.
* Patches 2-5 lay the groundwork for test migration, enablingprog_tests/sock_addr.cto handle more test dimensions.
* Patches 6-11 move existing tests toprog_tests/sock_addr.c.
* Patch 12 removes some redundant test cases.
* Patches 14-17 expand on existing test coverage.Jordan Rife (17):
selftests/bpf: Migrate recvmsg* return code tests to
verifier_sock_addr.c
selftests/bpf: Use program name for skel load/destroy functions selftests/bpf: HandleLOAD_REJECTtest cases selftests/bpf: HandleATTACH_REJECTtest cases selftests/bpf: HandleSYSCALL_EPERMandSYSCALL_ENOTSUPPtest cases selftests/bpf: MigrateWILDCARD_IPtest
selftests/bpf: Migrate sendmsg deny test cases selftests/bpf: Migrate sendmsg6 v4 mapped address tests selftests/bpf: Migrate wildcard destination rewrite test selftests/bpf: Migrateexpected_attach_typetests selftests/bpf: MigrateATTACH_REJECTtest cases selftests/bpf: Remove redundant sendmsg test cases selftests/bpf: Retire test_sock_addr.(c|sh) selftests/bpf: Expand sockaddr program return value tests sefltests/bpf: Expand sockaddr hook deny tests selftests/bpf: Expand getsockname and getpeername tests selftests/bpf: ExpandATTACH_REJECTteststools/testing/selftests/bpf/.gitignore | 1 - tools/testing/selftests/bpf/Makefile | 4 +- .../selftests/bpf/prog_tests/sock_addr.c | 1821 +++++++++++++++-- .../selftests/bpf/prog_tests/verifier.c | 2 + .../testing/selftests/bpf/progs/bind4_prog.c | 6 + .../testing/selftests/bpf/progs/bind6_prog.c | 6 + .../selftests/bpf/progs/connect4_prog.c | 6 + .../selftests/bpf/progs/connect6_prog.c | 6 + .../selftests/bpf/progs/connect_unix_prog.c | 6 + .../selftests/bpf/progs/getpeername4_prog.c | 24 + .../selftests/bpf/progs/getpeername6_prog.c | 31 + .../selftests/bpf/progs/getsockname4_prog.c | 24 + .../selftests/bpf/progs/getsockname6_prog.c | 31 + .../selftests/bpf/progs/sendmsg4_prog.c | 6 + .../selftests/bpf/progs/sendmsg6_prog.c | 57 + .../selftests/bpf/progs/sendmsg_unix_prog.c | 6 + .../selftests/bpf/progs/verifier_sock_addr.c | 331 +++ tools/testing/selftests/bpf/test_sock_addr.c | 1140 ----------- tools/testing/selftests/bpf/test_sock_addr.sh | 58 - 19 files changed, 2142 insertions(+), 1424 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/getpeername4_prog.c create mode 100644 tools/testing/selftests/bpf/progs/getpeername6_prog.c create mode 100644 tools/testing/selftests/bpf/progs/getsockname4_prog.c create mode 100644 tools/testing/selftests/bpf/progs/getsockname6_prog.c create mode 100644 tools/testing/selftests/bpf/progs/verifier_sock_addr.c delete mode 100644 tools/testing/selftests/bpf/test_sock_addr.c delete mode 100755 tools/testing/selftests/bpf/test_sock_addr.sh
Quoted 3 lines
--
2.45.0.118.g7fe29c98d7-goog
This patch set causes BPF CI to fail to build BPF selftests ([0]), please check and fix. Thanks!
[0] https://github.com/kernel-patches/bpf/actions/runs/9036931713/job/24834899012
Andrii,
It looks like the PR bot dropped one of the commits from the patch series which is why it didn't build.
Quoted 1 line
selftests/bpf: Handle
ATTACH_REJECTtest cases
Is there any way to get it to recreate the PR with all 17 patches?
-Jordan
Quoted 10 lines · Jordan Rife
Andrii,
It looks like the PR bot dropped one of the commits from the patch series which is why it didn't build.
Quoted 1 line
selftests/bpf: Handle
ATTACH_REJECTtest casesIs there any way to get it to recreate the PR with all 17 patches?
I marked it back as "New" in patchworks and this time BPF CI picked up all patches, I think. Will let it run, thanks for noticing this! You don't need to resend anything just yet.
Quoted 1 line
-Jordan
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 9 lines · On Fri, 10 May 2024 14:02:17 -0500 you wrote:
This patch series migrates remaining tests from
bpf/test_sock_addr.ctoprog_tests/sock_addr.candprogs/verifier_sock_addr.cin order to fully retire the old-style test program and expands test coverage to test previously untested scenarios related to sockaddr hooks.This is a continuation of the work started recently during the expansion of
prog_tests/sock_addr.c.[...]
Here is the summary with links:
- [v1,bpf-next,01/17] selftests/bpf: Migrate recvmsg* return code tests to verifier_sock_addr.c
https://git.kernel.org/bpf/bpf-next/c/73964e9085bb - [v1,bpf-next,02/17] selftests/bpf: Use program name for skel load/destroy functions https://git.kernel.org/bpf/bpf-next/c/86b65c6db019 - [v1,bpf-next,03/17] selftests/bpf: Handle LOAD_REJECT test cases https://git.kernel.org/bpf/bpf-next/c/5eff48f33fb7 - [v1,bpf-next,04/17] selftests/bpf: Handle ATTACH_REJECT test cases https://git.kernel.org/bpf/bpf-next/c/5a047b2226c0 - [v1,bpf-next,05/17] selftests/bpf: Handle SYSCALL_EPERM and SYSCALL_ENOTSUPP test cases https://git.kernel.org/bpf/bpf-next/c/a2618c0d8542 - [v1,bpf-next,06/17] selftests/bpf: Migrate WILDCARD_IP test https://git.kernel.org/bpf/bpf-next/c/d1b24fcf1c16 - [v1,bpf-next,07/17] selftests/bpf: Migrate sendmsg deny test cases https://git.kernel.org/bpf/bpf-next/c/f46a10483b27 - [v1,bpf-next,08/17] selftests/bpf: Migrate sendmsg6 v4 mapped address tests https://git.kernel.org/bpf/bpf-next/c/54462e8452f1 - [v1,bpf-next,09/17] selftests/bpf: Migrate wildcard destination rewrite test https://git.kernel.org/bpf/bpf-next/c/8eaf8056a44b - [v1,bpf-next,10/17] selftests/bpf: Migrate expected_attach_type tests https://git.kernel.org/bpf/bpf-next/c/b0f3af0bffef - [v1,bpf-next,11/17] selftests/bpf: Migrate ATTACH_REJECT test cases https://git.kernel.org/bpf/bpf-next/c/cded71f595c0 - [v1,bpf-next,12/17] selftests/bpf: Remove redundant sendmsg test cases https://git.kernel.org/bpf/bpf-next/c/9c3f17862fae - [v1,bpf-next,13/17] selftests/bpf: Retire test_sock_addr.(c|sh) https://git.kernel.org/bpf/bpf-next/c/61ecfdfce264 - [v1,bpf-next,14/17] selftests/bpf: Expand sockaddr program return value tests https://git.kernel.org/bpf/bpf-next/c/1e0a8367c89f - [v1,bpf-next,15/17] sefltests/bpf: Expand sockaddr hook deny tests https://git.kernel.org/bpf/bpf-next/c/dfb7539b47b5 - [v1,bpf-next,16/17] selftests/bpf: Expand getsockname and getpeername tests https://git.kernel.org/bpf/bpf-next/c/bc467e953e4f - [v1,bpf-next,17/17] selftests/bpf: Expand ATTACH_REJECT tests https://git.kernel.org/bpf/bpf-next/c/a3d3eb957ddc
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html