[PATCH bpf-next v2 3/4] selftests/bpf: Migrate BPF_CGROUP_INET_SOCK_CREATE test cases to prog_tests

[Jordan Rife]

Move 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.

Signed-off-by: Jordan Rife <jr...@google.com>
---
 .../selftests/bpf/prog_tests/sock_create.c    | 35 +++++++++++++------
 tools/testing/selftests/bpf/test_sock.c       | 28 ---------------
 2 files changed, 25 insertions(+), 38 deletions(-)

diff --git a/tools/testing/selftests/bpf/prog_tests/sock_create.c 
b/tools/testing/selftests/bpf/prog_tests/sock_create.c
index 17a3713621dd..187ffc5e60c4 100644
--- a/tools/testing/selftests/bpf/prog_tests/sock_create.c
+++ b/tools/testing/selftests/bpf/prog_tests/sock_create.c
@@ -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;
diff --git a/tools/testing/selftests/bpf/test_sock.c 
b/tools/testing/selftests/bpf/test_sock.c
index 26dff88abbaa..f97850f1d84a 100644
--- a/tools/testing/selftests/bpf/test_sock.c
+++ b/tools/testing/selftests/bpf/test_sock.c
@@ -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)
-- 
2.47.0.105.g07ac214952-goog