selftests/bpf: Expand getsockname and getpeername tests

This expands coverage for getsockname and getpeername hooks to include
getsockname4, getsockname6, getpeername4, and getpeername6.

Signed-off-by: Jordan Rife <jrife@google.com>
Link: https://lore.kernel.org/r/20240510190246.3247730-17-jrife@google.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --git a/tools/testing/selftests/bpf/prog_tests/sock_addr.c b/tools/testing/selftests/bpf/prog_tests/sock_addr.c
index 0477b4080b2e81f976fb8be0b3514eaa8c050e4f..a0a40bdcfe45c8ad221feab4bab219bb59fb53c4 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/sock_addr.c
+++ b/tools/testing/selftests/bpf/prog_tests/sock_addr.c
@@ -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 *);

diff --git a/tools/testing/selftests/bpf/progs/getpeername4_prog.c b/tools/testing/selftests/bpf/progs/getpeername4_prog.c
new file mode 100644 (file)
index 0000000..4c97208
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/getpeername4_prog.c
@@ -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";

diff --git a/tools/testing/selftests/bpf/progs/getpeername6_prog.c b/tools/testing/selftests/bpf/progs/getpeername6_prog.c
new file mode 100644 (file)
index 0000000..070e4d7
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/getpeername6_prog.c
@@ -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";

diff --git a/tools/testing/selftests/bpf/progs/getsockname4_prog.c b/tools/testing/selftests/bpf/progs/getsockname4_prog.c
new file mode 100644 (file)
index 0000000..e298487
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/getsockname4_prog.c
@@ -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";

diff --git a/tools/testing/selftests/bpf/progs/getsockname6_prog.c b/tools/testing/selftests/bpf/progs/getsockname6_prog.c
new file mode 100644 (file)
index 0000000..811d10c
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/getsockname6_prog.c
@@ -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";