Commit ea9d5616 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Martin KaFai Lau
Browse files

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: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/r/20240130212023.183765-3-andrii@kernel.org


Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
parent 20d59ee5

tools/testing/selftests/bpf/progs/connect_unix_prog.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

tools/testing/selftests/bpf/progs/getpeername_unix_prog.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

tools/testing/selftests/bpf/progs/getsockname_unix_prog.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

tools/testing/selftests/bpf/progs/recvmsg_unix_prog.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

tools/testing/selftests/bpf/progs/sendmsg_unix_prog.c

+1 −2
Original line number Diff line number Diff line
@@ -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;