Commit b57482b0 authored by Michal Luczaj's avatar Michal Luczaj Committed by Martin KaFai Lau
Browse files

selftests/bpf: Add u32()/u64() to sockmap_helpers 



Add integer wrappers for convenient sockmap usage.

While there, fix misaligned trailing slashes.

Suggested-by: default avatarJakub Sitnicki <jakub@cloudflare.com>
Signed-off-by: default avatarMichal Luczaj <mhal@rbox.co>
Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
Reviewed-by: default avatarJakub Sitnicki <jakub@cloudflare.com>
Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/r/20250515-selftests-sockmap-redir-v3-3-a1ea723f7e7e@rbox.co
parent d8785794

tools/testing/selftests/bpf/prog_tests/sockmap_helpers.h

+11 −14
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ 


#define MAX_TEST_NAME 80



#define u32(v) ((u32){(v)})

#define u64(v) ((u64){(v)})



#define __always_unused	__attribute__((__unused__))



#define xbpf_map_delete_elem(fd, key)                                          \
@@ -66,21 +69,15 @@ 
		__ret;                                                         \

	})



static inline int add_to_sockmap(int sock_mapfd, int fd1, int fd2)

static inline int add_to_sockmap(int mapfd, int fd1, int fd2)

{

	u64 value;

	u32 key;

	int err;



	key = 0;

	value = fd1;

	err = xbpf_map_update_elem(sock_mapfd, &key, &value, BPF_NOEXIST);

	err = xbpf_map_update_elem(mapfd, &u32(0), &u64(fd1), BPF_NOEXIST);

	if (err)

		return err;



	key = 1;

	value = fd2;

	return xbpf_map_update_elem(sock_mapfd, &key, &value, BPF_NOEXIST);

	return xbpf_map_update_elem(mapfd, &u32(1), &u64(fd2), BPF_NOEXIST);

}



#endif // __SOCKMAP_HELPERS__