selftests/bpf: convert bpf_rdonly_cast() uses to bpf_core_cast() macro

Use more ergonomic bpf_core_cast() macro instead of bpf_rdonly_cast() in
selftests code.

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/r/20240130212023.183765-3-andrii@kernel.org
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>

diff --git a/tools/testing/selftests/bpf/progs/connect_unix_prog.c b/tools/testing/selftests/bpf/progs/connect_unix_prog.c
index ca8aa2f..2ef0e0c 100644 (file)
--- a/tools/testing/selftests/bpf/progs/connect_unix_prog.c
+++ b/tools/testing/selftests/bpf/progs/connect_unix_prog.c
@@ -28,8 +28,7 @@ int connect_unix_prog(struct bpf_sock_addr *ctx)
        if (sa_kern->uaddrlen != unaddrlen)
                return 0;
 
-       sa_kern_unaddr = bpf_rdonly_cast(sa_kern->uaddr,
-                                               bpf_core_type_id_kernel(struct sockaddr_un));
+       sa_kern_unaddr = bpf_core_cast(sa_kern->uaddr, struct sockaddr_un);
        if (memcmp(sa_kern_unaddr->sun_path, SERVUN_REWRITE_ADDRESS,
                        sizeof(SERVUN_REWRITE_ADDRESS) - 1) != 0)
                return 0;

diff --git a/tools/testing/selftests/bpf/progs/getpeername_unix_prog.c b/tools/testing/selftests/bpf/progs/getpeername_unix_prog.c
index 9c078f3..5a76754 100644 (file)
--- a/tools/testing/selftests/bpf/progs/getpeername_unix_prog.c
+++ b/tools/testing/selftests/bpf/progs/getpeername_unix_prog.c
@@ -27,8 +27,7 @@ int getpeername_unix_prog(struct bpf_sock_addr *ctx)
        if (sa_kern->uaddrlen != unaddrlen)
                return 1;
 
-       sa_kern_unaddr = bpf_rdonly_cast(sa_kern->uaddr,
-                                               bpf_core_type_id_kernel(struct sockaddr_un));
+       sa_kern_unaddr = bpf_core_cast(sa_kern->uaddr, struct sockaddr_un);
        if (memcmp(sa_kern_unaddr->sun_path, SERVUN_REWRITE_ADDRESS,
                        sizeof(SERVUN_REWRITE_ADDRESS) - 1) != 0)
                return 1;

diff --git a/tools/testing/selftests/bpf/progs/getsockname_unix_prog.c b/tools/testing/selftests/bpf/progs/getsockname_unix_prog.c
index ac71451..7867113 100644 (file)
--- a/tools/testing/selftests/bpf/progs/getsockname_unix_prog.c
+++ b/tools/testing/selftests/bpf/progs/getsockname_unix_prog.c
@@ -27,8 +27,7 @@ int getsockname_unix_prog(struct bpf_sock_addr *ctx)
        if (sa_kern->uaddrlen != unaddrlen)
                return 1;
 
-       sa_kern_unaddr = bpf_rdonly_cast(sa_kern->uaddr,
-                                               bpf_core_type_id_kernel(struct sockaddr_un));
+       sa_kern_unaddr = bpf_core_cast(sa_kern->uaddr, struct sockaddr_un);
        if (memcmp(sa_kern_unaddr->sun_path, SERVUN_REWRITE_ADDRESS,
                        sizeof(SERVUN_REWRITE_ADDRESS) - 1) != 0)
                return 1;

diff --git a/tools/testing/selftests/bpf/progs/recvmsg_unix_prog.c b/tools/testing/selftests/bpf/progs/recvmsg_unix_prog.c
index 4dfbc85..1c7ab44 100644 (file)
--- a/tools/testing/selftests/bpf/progs/recvmsg_unix_prog.c
+++ b/tools/testing/selftests/bpf/progs/recvmsg_unix_prog.c
@@ -27,8 +27,7 @@ int recvmsg_unix_prog(struct bpf_sock_addr *ctx)
        if (sa_kern->uaddrlen != unaddrlen)
                return 1;
 
-       sa_kern_unaddr = bpf_rdonly_cast(sa_kern->uaddr,
-                                               bpf_core_type_id_kernel(struct sockaddr_un));
+       sa_kern_unaddr = bpf_core_cast(sa_kern->uaddr, struct sockaddr_un);
        if (memcmp(sa_kern_unaddr->sun_path, SERVUN_ADDRESS,
                        sizeof(SERVUN_ADDRESS) - 1) != 0)
                return 1;

diff --git a/tools/testing/selftests/bpf/progs/sendmsg_unix_prog.c b/tools/testing/selftests/bpf/progs/sendmsg_unix_prog.c
index 1f67e83..d8869b0 100644 (file)
--- a/tools/testing/selftests/bpf/progs/sendmsg_unix_prog.c
+++ b/tools/testing/selftests/bpf/progs/sendmsg_unix_prog.c
@@ -28,8 +28,7 @@ int sendmsg_unix_prog(struct bpf_sock_addr *ctx)
        if (sa_kern->uaddrlen != unaddrlen)
                return 0;
 
-       sa_kern_unaddr = bpf_rdonly_cast(sa_kern->uaddr,
-                                               bpf_core_type_id_kernel(struct sockaddr_un));
+       sa_kern_unaddr = bpf_core_cast(sa_kern->uaddr, struct sockaddr_un);
        if (memcmp(sa_kern_unaddr->sun_path, SERVUN_REWRITE_ADDRESS,
                        sizeof(SERVUN_REWRITE_ADDRESS) - 1) != 0)
                return 0;

diff --git a/tools/testing/selftests/bpf/progs/sk_storage_omem_uncharge.c b/tools/testing/selftests/bpf/progs/sk_storage_omem_uncharge.c
index 934c4e5..46d6eb2 100644 (file)
--- a/tools/testing/selftests/bpf/progs/sk_storage_omem_uncharge.c
+++ b/tools/testing/selftests/bpf/progs/sk_storage_omem_uncharge.c
@@ -27,7 +27,7 @@ int BPF_PROG(bpf_local_storage_destroy, struct bpf_local_storage *local_storage)
        if (local_storage_ptr != local_storage)
                return 0;
 
-       sk = bpf_rdonly_cast(sk_ptr, bpf_core_type_id_kernel(struct sock));
+       sk = bpf_core_cast(sk_ptr, struct sock);
        if (sk->sk_cookie.counter != cookie)
                return 0;
 

diff --git a/tools/testing/selftests/bpf/progs/sock_iter_batch.c b/tools/testing/selftests/bpf/progs/sock_iter_batch.c
index ffbbfe1..96531b0 100644 (file)
--- a/tools/testing/selftests/bpf/progs/sock_iter_batch.c
+++ b/tools/testing/selftests/bpf/progs/sock_iter_batch.c
@@ -32,7 +32,7 @@ int iter_tcp_soreuse(struct bpf_iter__tcp *ctx)
        if (!sk)
                return 0;
 
-       sk = bpf_rdonly_cast(sk, bpf_core_type_id_kernel(struct sock));
+       sk = bpf_core_cast(sk, struct sock);
        if (sk->sk_family != AF_INET6 ||
            sk->sk_state != TCP_LISTEN ||
            !ipv6_addr_loopback(&sk->sk_v6_rcv_saddr))
@@ -68,7 +68,7 @@ int iter_udp_soreuse(struct bpf_iter__udp *ctx)
        if (!sk)
                return 0;
 
-       sk = bpf_rdonly_cast(sk, bpf_core_type_id_kernel(struct sock));
+       sk = bpf_core_cast(sk, struct sock);
        if (sk->sk_family != AF_INET6 ||
            !ipv6_addr_loopback(&sk->sk_v6_rcv_saddr))
                return 0;

diff --git a/tools/testing/selftests/bpf/progs/type_cast.c b/tools/testing/selftests/bpf/progs/type_cast.c
index 98ab358..9d808b8 100644 (file)
--- a/tools/testing/selftests/bpf/progs/type_cast.c
+++ b/tools/testing/selftests/bpf/progs/type_cast.c
@@ -46,13 +46,12 @@ int md_skb(struct __sk_buff *skb)
        /* Simulate the following kernel macro:
         *   #define skb_shinfo(SKB) ((struct skb_shared_info *)(skb_end_pointer(SKB)))
         */
-       shared_info = bpf_rdonly_cast(kskb->head + kskb->end,
-               bpf_core_type_id_kernel(struct skb_shared_info));
+       shared_info = bpf_core_cast(kskb->head + kskb->end, struct skb_shared_info);
        meta_len = shared_info->meta_len;
        frag0_len = shared_info->frag_list->len;
 
        /* kskb2 should be equal to kskb */
-       kskb2 = bpf_rdonly_cast(kskb, bpf_core_type_id_kernel(struct sk_buff));
+       kskb2 = bpf_core_cast(kskb, typeof(*kskb2));
        kskb2_len = kskb2->len;
        return 0;
 }
@@ -63,7 +62,7 @@ int BPF_PROG(untrusted_ptr, struct pt_regs *regs, long id)
        struct task_struct *task, *task_dup;
 
        task = bpf_get_current_task_btf();
-       task_dup = bpf_rdonly_cast(task, bpf_core_type_id_kernel(struct task_struct));
+       task_dup = bpf_core_cast(task, struct task_struct);
        (void)bpf_task_storage_get(&enter_id, task_dup, 0, 0);
        return 0;
 }
@@ -71,7 +70,7 @@ int BPF_PROG(untrusted_ptr, struct pt_regs *regs, long id)
 SEC("?tracepoint/syscalls/sys_enter_nanosleep")
 int kctx_u64(void *ctx)
 {
-       u64 *kctx = bpf_rdonly_cast(ctx, bpf_core_type_id_kernel(u64));
+       u64 *kctx = bpf_core_cast(ctx, u64);
 
        (void)kctx;
        return 0;