Retire test_sock.c
Subsystems (3)
v2 cover Retire test_sock.c
This patch series migrates test cases out of test_sock.c to prog_tests-style tests. It moves all BPF_CGROUP_INET4_POST_BIND and BPF_CGROUP_INET6_POST_BIND test cases into a new prog_test, sock_post_bind.c, while reimplementing all LOAD_REJECT test cases as verifier tests in progs/verifier_sock.c. Finally, it moves remaining BPF_CGROUP_INET_SOCK_CREATE test coverage into prog_tests/sock_create.c before retiring test_sock.c completely.
Changes
=======v1->v2:
- Remove superfluous verbose bool from the top of sock_post_bind.c.
- Use ASSERT_OK_FD instead of ASSERT_GE to test cgroup_fd validity.
- Run sock_post_bind tests in their own namespace, "sock_post_bind".
Jordan Rife (4):
selftests/bpf: Migrate *_POST_BIND test cases to prog_tests selftests/bpf: Migrate LOAD_REJECT test cases to prog_tests selftests/bpf: Migrate BPF_CGROUP_INET_SOCK_CREATE test cases to
prog_tests
selftests/bpf: Retire test_sock.c
tools/testing/selftests/bpf/.gitignore | 1 -
tools/testing/selftests/bpf/Makefile | 3 +-
.../selftests/bpf/prog_tests/sock_create.c | 35 ++-
.../sock_post_bind.c} | 256 +++++-------------
.../selftests/bpf/progs/verifier_sock.c | 60 ++++
5 files changed, 150 insertions(+), 205 deletions(-)
rename tools/testing/selftests/bpf/{test_sock.c => prog_tests/sock_post_bind.c} (64%)Signature · 1 line
2.47.0.105.g07ac214952-goog
PATCH v2 1/4 selftests/bpf: Migrate *_POST_BIND test cases to prog_tests
Move all BPF_CGROUP_INET6_POST_BIND and BPF_CGROUP_INET4_POST_BIND test cases to a new prog_test, prog_tests/sock_post_bind.c, except for LOAD_REJECT test cases.
--- .../selftests/bpf/prog_tests/sock_post_bind.c | 428 ++++++++++++++++++ tools/testing/selftests/bpf/test_sock.c | 245 ---------- 2 files changed, 428 insertions(+), 245 deletions(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/sock_post_bind.c
tools/testing/selftests/bpf/prog_tests/sock_post_bind.c new file +428 -0
@@ -0,0 +1,428 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <linux/bpf.h> +#include <test_progs.h> +#include "cgroup_helpers.h" + +#define TEST_NS "sock_post_bind" + +static char bpf_log_buf[4096 ]; + +static struct sock_post_bind_test { +const char *descr; +/* BPF prog properties */ +const struct bpf_insn insns[64 ]; +enum bpf_attach_type attach_type; +enum bpf_attach_type expected_attach_type; +/* Socket properties */ +int domain; +int type; +/* Endpoint to bind() to */ +const char *ip; +unsigned short port; +unsigned short port_retry; + +/* Expected test result */ +enum { +ATTACH_REJECT , +BIND_REJECT , +SUCCESS , +RETRY_SUCCESS , +RETRY_REJECT + } result; +} tests[] = { + { + .descr ="attach type mismatch bind4 vs bind6" , + .insns = { +BPF_MOV64_IMM (BPF_REG_0 ,1 ), +BPF_EXIT_INSN (), + }, + .expected_attach_type =BPF_CGROUP_INET4_POST_BIND , + .attach_type =BPF_CGROUP_INET6_POST_BIND , + .result =ATTACH_REJECT , + }, + { + .descr ="attach type mismatch bind6 vs bind4" , + .insns = { +BPF_MOV64_IMM (BPF_REG_0 ,1 ), +BPF_EXIT_INSN (), + }, + .expected_attach_type =BPF_CGROUP_INET6_POST_BIND , + .attach_type =BPF_CGROUP_INET4_POST_BIND , + .result =ATTACH_REJECT , + }, + { + .descr ="attach type mismatch default vs bind4" , + .insns = { +BPF_MOV64_IMM (BPF_REG_0 ,1 ), +BPF_EXIT_INSN (), + }, + .expected_attach_type =0 , + .attach_type =BPF_CGROUP_INET4_POST_BIND , + .result =ATTACH_REJECT , + }, + { + .descr ="attach type mismatch bind6 vs sock_create" , + .insns = { +BPF_MOV64_IMM (BPF_REG_0 ,1 ), +BPF_EXIT_INSN (), + }, + .expected_attach_type =BPF_CGROUP_INET6_POST_BIND , + .attach_type =BPF_CGROUP_INET_SOCK_CREATE , + .result =ATTACH_REJECT , + }, + { + .descr ="bind4 reject all" , + .insns = { +BPF_MOV64_IMM (BPF_REG_0 ,0 ), +BPF_EXIT_INSN (), + }, + .expected_attach_type =BPF_CGROUP_INET4_POST_BIND , + .attach_type =BPF_CGROUP_INET4_POST_BIND , + .domain =AF_INET , + .type =SOCK_STREAM , + .ip ="0.0.0.0" , + .result =BIND_REJECT , + }, + { + .descr ="bind6 reject all" , + .insns = { +BPF_MOV64_IMM (BPF_REG_0 ,0 ), +BPF_EXIT_INSN (), + }, + .expected_attach_type =BPF_CGROUP_INET6_POST_BIND , + .attach_type =BPF_CGROUP_INET6_POST_BIND , + .domain =AF_INET6 , + .type =SOCK_STREAM , + .ip ="::" , + .result =BIND_REJECT , + }, + { + .descr ="bind6 deny specific IP & port" , + .insns = { +BPF_MOV64_REG (BPF_REG_6 ,BPF_REG_1 ), + +/* if (ip == expected && port == expected) */ +BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , + offsetof(struct bpf_sock, src_ip6[3])), +BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 , +__bpf_constant_ntohl (0x00000001 ),4 ), +BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , + offsetof(struct bpf_sock , src_port)), +BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 ,0x2001 ,2 ), + +/* return DENY; */ +BPF_MOV64_IMM (BPF_REG_0 ,0 ), +BPF_JMP_A (1 ), + +/* else return ALLOW; */ +BPF_MOV64_IMM (BPF_REG_0 ,1 ), +BPF_EXIT_INSN (), + }, + .expected_attach_type =BPF_CGROUP_INET6_POST_BIND , + .attach_type =BPF_CGROUP_INET6_POST_BIND , + .domain =AF_INET6 , + .type =SOCK_STREAM , + .ip ="::1" , + .port =8193 , + .result =BIND_REJECT , + }, + { + .descr ="bind4 allow specific IP & port" , + .insns = { +BPF_MOV64_REG (BPF_REG_6 ,BPF_REG_1 ), + +/* if (ip == expected && port == expected) */ +BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , + offsetof(struct bpf_sock , src_ip4)), +BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 , +__bpf_constant_ntohl (0x7F000001 ),4 ), +BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , + offsetof(struct bpf_sock , src_port)), +BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 ,0x1002 ,2 ), + +/* return ALLOW; */ +BPF_MOV64_IMM (BPF_REG_0 ,1 ), +BPF_JMP_A (1 ), + +/* else return DENY; */ +BPF_MOV64_IMM (BPF_REG_0 ,0 ), +BPF_EXIT_INSN (), + }, + .expected_attach_type =BPF_CGROUP_INET4_POST_BIND , + .attach_type =BPF_CGROUP_INET4_POST_BIND , + .domain =AF_INET , + .type =SOCK_STREAM , + .ip ="127.0.0.1" , + .port =4098 , + .result =SUCCESS , + }, + { + .descr ="bind4 deny specific IP & port of TCP, and retry" , + .insns = { +BPF_MOV64_REG (BPF_REG_6 ,BPF_REG_1 ), + +/* if (ip == expected && port == expected) */ +BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , + offsetof(struct bpf_sock , src_ip4)), +BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 , +__bpf_constant_ntohl (0x7F000001 ),4 ), +BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , + offsetof(struct bpf_sock , src_port)), +BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 ,0x1002 ,2 ), + +/* return DENY; */ +BPF_MOV64_IMM (BPF_REG_0 ,0 ), +BPF_JMP_A (1 ), + +/* else return ALLOW; */ +BPF_MOV64_IMM (BPF_REG_0 ,1 ), +BPF_EXIT_INSN (), + }, + .expected_attach_type =BPF_CGROUP_INET4_POST_BIND , + .attach_type =BPF_CGROUP_INET4_POST_BIND , + .domain =AF_INET , + .type =SOCK_STREAM , + .ip ="127.0.0.1" , + .port =4098 , + .port_retry =5000 , + .result =RETRY_SUCCESS , + }, + { + .descr ="bind4 deny specific IP & port of UDP, and retry" , + .insns = { +BPF_MOV64_REG (BPF_REG_6 ,BPF_REG_1 ), + +/* if (ip == expected && port == expected) */ +BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , + offsetof(struct bpf_sock , src_ip4)), +BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 , +__bpf_constant_ntohl (0x7F000001 ),4 ), +BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , + offsetof(struct bpf_sock , src_port)), +BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 ,0x1002 ,2 ), + +/* return DENY; */ +BPF_MOV64_IMM (BPF_REG_0 ,0 ), +BPF_JMP_A (1 ), + +/* else return ALLOW; */ +BPF_MOV64_IMM (BPF_REG_0 ,1 ), +BPF_EXIT_INSN (), + }, + .expected_attach_type =BPF_CGROUP_INET4_POST_BIND , + .attach_type =BPF_CGROUP_INET4_POST_BIND , + .domain =AF_INET , + .type =SOCK_DGRAM , + .ip ="127.0.0.1" , + .port =4098 , + .port_retry =5000 , + .result =RETRY_SUCCESS , + }, + { + .descr ="bind6 deny specific IP & port, and retry" , + .insns = { +BPF_MOV64_REG (BPF_REG_6 ,BPF_REG_1 ), + +/* if (ip == expected && port == expected) */ +BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , + offsetof(struct bpf_sock, src_ip6[3])), +BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 , +__bpf_constant_ntohl (0x00000001 ),4 ), +BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , + offsetof(struct bpf_sock , src_port)), +BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 ,0x2001 ,2 ), + +/* return DENY; */ +BPF_MOV64_IMM (BPF_REG_0 ,0 ), +BPF_JMP_A (1 ), + +/* else return ALLOW; */ +BPF_MOV64_IMM (BPF_REG_0 ,1 ), +BPF_EXIT_INSN (), + }, + .expected_attach_type =BPF_CGROUP_INET6_POST_BIND , + .attach_type =BPF_CGROUP_INET6_POST_BIND , + .domain =AF_INET6 , + .type =SOCK_STREAM , + .ip ="::1" , + .port =8193 , + .port_retry =9000 , + .result =RETRY_SUCCESS , + }, + { + .descr ="bind4 allow all" , + .insns = { +BPF_MOV64_IMM (BPF_REG_0 ,1 ), +BPF_EXIT_INSN (), + }, + .expected_attach_type =BPF_CGROUP_INET4_POST_BIND , + .attach_type =BPF_CGROUP_INET4_POST_BIND , + .domain =AF_INET , + .type =SOCK_STREAM , + .ip ="0.0.0.0" , + .result =SUCCESS , + }, + { + .descr ="bind6 allow all" , + .insns = { +BPF_MOV64_IMM (BPF_REG_0 ,1 ), +BPF_EXIT_INSN (), + }, + .expected_attach_type =BPF_CGROUP_INET6_POST_BIND , + .attach_type =BPF_CGROUP_INET6_POST_BIND , + .domain =AF_INET6 , + .type =SOCK_STREAM , + .ip ="::" , + .result =SUCCESS , + }, +}; + +static int load_prog (const struct bpf_insn *insns, +enum bpf_attach_type expected_attach_type) +{ +LIBBPF_OPTS (bpf_prog_load_opts, opts, + .expected_attach_type = expected_attach_type, + .log_level = 2, + .log_buf = bpf_log_buf, + .log_size = sizeof(bpf_log_buf), + ); +int fd, insns_cnt =0 ; + +for (; + insns[insns_cnt].code != (BPF_JMP |BPF_EXIT ); + insns_cnt++) { + } + insns_cnt++; + + fd =bpf_prog_load (BPF_PROG_TYPE_CGROUP_SOCK ,NULL ,"GPL" , insns, + insns_cnt, &opts); +if (fd <0 ) +fprintf (stderr,"%s\n" , bpf_log_buf); + +return fd; +} + +static int bind_sock (int domain,int type,const char *ip, +unsigned short port,unsigned short port_retry) +{ +struct sockaddr_storage addr; +struct sockaddr_in6 *addr6; +struct sockaddr_in *addr4; +int sockfd =-1 ; +socklen_t len; +int res =SUCCESS ; + + sockfd =socket (domain, type,0 ); +if (sockfd <0 ) + goto err; + +memset (&addr,0 ,sizeof (addr)); + +if (domain ==AF_INET ) { + len =sizeof (struct sockaddr_in ); + addr4 = (struct sockaddr_in *)&addr; + addr4->sin_family = domain; + addr4->sin_port =htons (port); +if (inet_pton (domain, ip, (void *)&addr4->sin_addr) !=1 ) + goto err; + }else if (domain ==AF_INET6 ) { + len =sizeof (struct sockaddr_in6 ); + addr6 = (struct sockaddr_in6 *)&addr; + addr6->sin6_family = domain; + addr6->sin6_port =htons (port); +if (inet_pton (domain, ip, (void *)&addr6->sin6_addr) !=1 ) + goto err; + }else { + goto err; + } + +if (bind (sockfd, (const struct sockaddr *)&addr, len) ==-1 ) { +/* sys_bind() may fail for different reasons, errno has to be +* checked to confirm that BPF program rejected it. +*/ +if (errno !=EPERM ) + goto err; +if (port_retry) + goto retry; + res =BIND_REJECT ; + goto out; + } + + goto out; +retry: +if (domain ==AF_INET ) + addr4->sin_port =htons (port_retry); +else + addr6->sin6_port =htons (port_retry); +if (bind (sockfd, (const struct sockaddr *)&addr, len) ==-1 ) { +if (errno !=EPERM ) + goto err; + res =RETRY_REJECT ; + }else { + res =RETRY_SUCCESS ; + } + goto out; +err: + res =-1 ; +out: +close (sockfd); +return res; +} + +static int run_test (int cgroup_fd,struct sock_post_bind_test *test) +{ +int err, prog_fd, res, ret =0 ; + + prog_fd =load_prog (test->insns, test->expected_attach_type); +if (prog_fd <0 ) + goto err; + + err =bpf_prog_attach (prog_fd, cgroup_fd, test->attach_type,0 ); +if (err <0 ) { +if (test->result ==ATTACH_REJECT ) + goto out; +else + goto err; + } + + res =bind_sock (test->domain, test->type, test->ip, test->port, + test->port_retry); +if (res >0 && test->result == res) + goto out; +err: + ret =-1 ; +out: +/* Detaching w/o checking return code: best effort attempt. */ +if (prog_fd !=-1 ) +bpf_prog_detach (cgroup_fd, test->attach_type); +close (prog_fd); +return ret; +} + +void test_sock_post_bind (void ) +{ +struct netns_obj *ns =NULL ; +int cgroup_fd =0 ; +int i; + + ns =netns_new (TEST_NS , true); +if (!ASSERT_OK_PTR (ns,"netns_new" )) + goto cleanup; + + cgroup_fd =test__join_cgroup ("/post_bind" ); +if (!ASSERT_OK_FD (cgroup_fd,"join_cgroup" )) + goto cleanup; + +for (i =0 ; i <ARRAY_SIZE (tests); i++) { +if (!test__start_subtest (tests[i].descr)) +continue ; + +ASSERT_OK (run_test (cgroup_fd, &tests[i]), tests[i].descr); + } + +cleanup: +if (ns) +netns_free (ns); +if (cgroup_fd) +close (cgroup_fd); +}
tools/testing/selftests/bpf/test_sock.c +0 -245
251 lines not on this page · raw message
Signature · 1 line
2.47.0.105.g07ac214952-goog
PATCH v2 2/4 selftests/bpf: Migrate LOAD_REJECT test cases to prog_tests
In reply to Jordan RifeMove LOAD_REJECT test cases from test_sock.c to an equivalent set of verifier tests in progs/verifier_sock.c.
--- .../selftests/bpf/progs/verifier_sock.c | 60 +++++++++++++++++++ tools/testing/selftests/bpf/test_sock.c | 52 ---------------- 2 files changed, 60 insertions(+), 52 deletions(-)
tools/testing/selftests/bpf/progs/verifier_sock.c +60 -0
@@ -977,4 +977,64 @@ l1_%=: r0 = *(u8*)(r7 + 0); \ : __clobber_all); } +SEC("cgroup/post_bind4") +__description("sk->src_ip6[0] [load 1st byte]") +__failure __msg("invalid bpf_context access off=28 size=2") +__naked void post_bind4_read_src_ip6(void) +{ + asmvolatile (" \ +r6 = r1; \ +r7 = *(u16*)(r6 + %[bpf_sock_src_ip6_0]); \ +r0 = 1; \ +exit; \ +" : + : __imm_const(bpf_sock_src_ip6_0, offsetof(struct bpf_sock, src_ip6[0])) + : __clobber_all); +} + +SEC("cgroup/post_bind4") +__description("sk->mark [load mark]") +__failure __msg("invalid bpf_context access off=16 size=2") +__naked void post_bind4_read_mark(void) +{ + asmvolatile (" \ +r6 = r1; \ +r7 = *(u16*)(r6 + %[bpf_sock_mark]); \ +r0 = 1; \ +exit; \ +" : + : __imm_const(bpf_sock_mark, offsetof(struct bpf_sock, mark)) + : __clobber_all); +} + +SEC("cgroup/post_bind6") +__description("sk->src_ip4 [load src_ip4]") +__failure __msg("invalid bpf_context access off=24 size=2") +__naked void post_bind6_read_src_ip4(void) +{ + asmvolatile (" \ +r6 = r1; \ +r7 = *(u16*)(r6 + %[bpf_sock_src_ip4]); \ +r0 = 1; \ +exit; \ +" : + : __imm_const(bpf_sock_src_ip4, offsetof(struct bpf_sock, src_ip4)) + : __clobber_all); +} + +SEC("cgroup/sock_create") +__description("sk->src_port [word load]") +__failure __msg("invalid bpf_context access off=44 size=2") +__naked void sock_create_read_src_port(void) +{ + asmvolatile (" \ +r6 = r1; \ +r7 = *(u16*)(r6 + %[bpf_sock_src_port]); \ +r0 = 1; \ +exit; \ +" : + : __imm_const(bpf_sock_src_port, offsetof(struct bpf_sock, src_port)) + : __clobber_all); +} + char _license[] SEC("license") = "GPL";
tools/testing/selftests/bpf/test_sock.c +0 -52
58 lines not on this page · raw message
Signature · 1 line
2.47.0.105.g07ac214952-goog
PATCH v2 3/4 selftests/bpf: Migrate BPF_CGROUP_INET_SOCK_CREATE test cases to prog_tests
In reply to Jordan RifeMove the "load w/o expected_attach_type" test case to prog_tests/sock_create.c and drop the remaining test case, as it is made redundant with the existing coverage inside prog_tests/sock_create.c.
--- .../selftests/bpf/prog_tests/sock_create.c | 35 +++++++++++++------ tools/testing/selftests/bpf/test_sock.c | 28 --------------- 2 files changed, 25 insertions(+), 38 deletions(-)
tools/testing/selftests/bpf/prog_tests/sock_create.c +25 -10
@@ -237,6 +237,19 @@ static struct sock_create_test { .error = DENY_CREATE, }, + { + .descr = "load w/o expected_attach_type (compat mode)", + .insns = { + /* return 1 */ + BPF_MOV64_IMM(BPF_REG_0, 1), + BPF_EXIT_INSN(), + }, + .expected_attach_type = 0, + .attach_type = BPF_CGROUP_INET_SOCK_CREATE, + + .domain = AF_INET, + .type = SOCK_STREAM, + }, }; static int load_prog(const struct bpf_insn *insns,
@@ -291,16 +304,18 @@ static int run_test(int cgroup_fd, struct sock_create_test *test) goto detach_prog; } - err =getsockopt (sock_fd,SOL_SOCKET , test->optname, &optval, &optlen); -if (err) { -log_err ("Failed to call getsockopt" ); - goto cleanup; - } - -if (optval != test->optval) { - errno =0 ; -log_err ("getsockopt returned unexpected optval" ); - goto cleanup; +if (test->optname) { + err =getsockopt (sock_fd,SOL_SOCKET , test->optname, &optval, &optlen); +if (err) { +log_err ("Failed to call getsockopt" ); + goto cleanup; + } + +if (optval != test->optval) { + errno =0 ; +log_err ("getsockopt returned unexpected optval" ); + goto cleanup; + } } ret = test->error !=OK ;
tools/testing/selftests/bpf/test_sock.c +0 -28
@@ -47,34 +47,6 @@ struct sock_test { };static struct sock_test tests[] = { - { - .descr ="sock_create load w/o expected_attach_type (compat mode)" , - .insns = { -BPF_MOV64_IMM (BPF_REG_0 ,1 ), -BPF_EXIT_INSN (), - }, - .expected_attach_type =0 , - .attach_type =BPF_CGROUP_INET_SOCK_CREATE , - .domain =AF_INET , - .type =SOCK_STREAM , - .ip ="127.0.0.1" , - .port =8097 , - .result =SUCCESS , - }, - { - .descr ="sock_create load w/ expected_attach_type" , - .insns = { -BPF_MOV64_IMM (BPF_REG_0 ,1 ), -BPF_EXIT_INSN (), - }, - .expected_attach_type =BPF_CGROUP_INET_SOCK_CREATE , - .attach_type =BPF_CGROUP_INET_SOCK_CREATE , - .domain =AF_INET , - .type =SOCK_STREAM , - .ip ="127.0.0.1" , - .port =8097 , - .result =SUCCESS , - }, };static size_t probe_prog_length (const struct bpf_insn *fp)
Signature · 1 line
2.47.0.105.g07ac214952-goog
PATCH v2 4/4 selftests/bpf: Retire test_sock.c
In reply to Jordan RifeCompletely remove test_sock.c and associated config.
--- tools/testing/selftests/bpf/.gitignore | 1 - tools/testing/selftests/bpf/Makefile | 3 +- tools/testing/selftests/bpf/test_sock.c | 231 ------------------------ 3 files changed, 1 insertion(+), 234 deletions(-) delete mode 100644 tools/testing/selftests/bpf/test_sock.c
tools/testing/selftests/bpf/.gitignore +0 -1
@@ -16,7 +16,6 @@ fixdep /test_progs-cpuv4 test_verifier_log feature -test_sock urandom_read test_sockmap test_lirc_mode2_user
tools/testing/selftests/bpf/Makefile +1 -2
@@ -84,7 +84,7 @@ endif # Order correspond to 'make run_tests' order TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test_progs \ - test_sock test_sockmap \ + test_sockmap \ test_tcpnotify_user test_sysctl \ test_progs-no_alu32 TEST_INST_SUBDIRS := no_alu32
@@ -335,7 +335,6 @@ JSON_WRITER := $(OUTPUT)/json_writer.o CAP_HELPERS := $(OUTPUT)/cap_helpers.o NETWORK_HELPERS := $(OUTPUT)/network_helpers.o -$(OUTPUT)/test_sock: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(OUTPUT)/test_sockmap: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(OUTPUT)/test_tcpnotify_user: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(TRACE_HELPERS) $(OUTPUT)/test_sock_fields: $(CGROUP_HELPERS) $(TESTING_HELPERS)
tools/testing/selftests/bpf/test_sock.c deleted +0 -231
231 lines not on this page · raw message
Signature · 1 line
2.47.0.105.g07ac214952-goog
This series was applied to bpf/bpf-next.git (master) by Martin KaFai Lau <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Martin KaFai Lau <[email protected]>:
Quoted 9 lines · On Tue, 22 Oct 2024 15:29:00 +0000 you wrote:
This patch series migrates test cases out of
test_sock.cto prog_tests-style tests. It moves allBPF_CGROUP_INET4_POST_BINDandBPF_CGROUP_INET6_POST_BINDtest cases into a newprog_test,sock_post_bind.c, while reimplementing allLOAD_REJECTtest cases as verifier tests inprogs/verifier_sock.c. Finally, it moves remainingBPF_CGROUP_INET_SOCK_CREATEtest coverage intoprog_tests/sock_create.cbefore retiringtest_sock.ccompletely.[...]
Here is the summary with links:
- [bpf-next,v2,1/4] selftests/bpf: Migrate *_POST_BIND test cases to prog_tests
https://git.kernel.org/bpf/bpf-next/c/94682d6ad969 - [bpf-next,v2,2/4] selftests/bpf: Migrate LOAD_REJECT test cases to prog_tests https://git.kernel.org/bpf/bpf-next/c/c17f9734e35b - [bpf-next,v2,3/4] selftests/bpf: Migrate BPF_CGROUP_INET_SOCK_CREATE test cases to prog_tests https://git.kernel.org/bpf/bpf-next/c/af522f13e917 - [bpf-next,v2,4/4] selftests/bpf: Retire test_sock.c https://git.kernel.org/bpf/bpf-next/c/eea6c14c10ce
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html