Commit d295daf5 authored by Ilya Leoshkevich's avatar Ilya Leoshkevich Committed by Daniel Borkmann
Browse files

selftests/bpf: Attach to socketcall() in test_probe_user 



test_probe_user fails on architectures where libc uses
socketcall(SYS_CONNECT) instead of connect(). Fix by attaching
to socketcall as well.

Signed-off-by: default avatarIlya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Link: https://lore.kernel.org/bpf/20220726134008.256968-3-iii@linux.ibm.com
parent 2d369b4b

tools/testing/selftests/bpf/prog_tests/probe_user.c

+24 −11
Original line number Diff line number Diff line
@@ -4,25 +4,35 @@ 
/* TODO: corrupts other tests uses connect() */

void serial_test_probe_user(void)

{

	const char *prog_name = "handle_sys_connect";

	static const char *const prog_names[] = {

		"handle_sys_connect",

#if defined(__s390x__)

		"handle_sys_socketcall",

#endif

	};

	enum { prog_count = ARRAY_SIZE(prog_names) };

	const char *obj_file = "./test_probe_user.o";

	DECLARE_LIBBPF_OPTS(bpf_object_open_opts, opts, );

	int err, results_map_fd, sock_fd, duration = 0;

	struct sockaddr curr, orig, tmp;

	struct sockaddr_in *in = (struct sockaddr_in *)&curr;

	struct bpf_link *kprobe_link = NULL;

	struct bpf_program *kprobe_prog;

	struct bpf_link *kprobe_links[prog_count] = {};

	struct bpf_program *kprobe_progs[prog_count];

	struct bpf_object *obj;

	static const int zero = 0;

	size_t i;



	obj = bpf_object__open_file(obj_file, &opts);

	if (!ASSERT_OK_PTR(obj, "obj_open_file"))

		return;



	kprobe_prog = bpf_object__find_program_by_name(obj, prog_name);

	if (CHECK(!kprobe_prog, "find_probe",

		  "prog '%s' not found\n", prog_name))

	for (i = 0; i < prog_count; i++) {

		kprobe_progs[i] =

			bpf_object__find_program_by_name(obj, prog_names[i]);

		if (CHECK(!kprobe_progs[i], "find_probe",

			  "prog '%s' not found\n", prog_names[i]))

			goto cleanup;

	}



	err = bpf_object__load(obj);

	if (CHECK(err, "obj_load", "err %d\n", err))
@@ -33,9 +43,11 @@ void serial_test_probe_user(void) 
		  "err %d\n", results_map_fd))

		goto cleanup;



	kprobe_link = bpf_program__attach(kprobe_prog);

	if (!ASSERT_OK_PTR(kprobe_link, "attach_kprobe"))

	for (i = 0; i < prog_count; i++) {

		kprobe_links[i] = bpf_program__attach(kprobe_progs[i]);

		if (!ASSERT_OK_PTR(kprobe_links[i], "attach_kprobe"))

			goto cleanup;

	}



	memset(&curr, 0, sizeof(curr));

	in->sin_family = AF_INET;
@@ -69,6 +81,7 @@ void serial_test_probe_user(void) 
		  inet_ntoa(in->sin_addr), ntohs(in->sin_port)))

		goto cleanup;

cleanup:

	bpf_link__destroy(kprobe_link);

	for (i = 0; i < prog_count; i++)

		bpf_link__destroy(kprobe_links[i]);

	bpf_object__close(obj);

}

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

+27 −2
Original line number Diff line number Diff line
@@ -7,8 +7,7 @@ 


static struct sockaddr_in old;



SEC("ksyscall/connect")

int BPF_KSYSCALL(handle_sys_connect, int fd, struct sockaddr_in *uservaddr, int addrlen)

static int handle_sys_connect_common(struct sockaddr_in *uservaddr)

{

	struct sockaddr_in new;
@@ -19,4 +18,30 @@ int BPF_KSYSCALL(handle_sys_connect, int fd, struct sockaddr_in *uservaddr, int 
	return 0;

}



SEC("ksyscall/connect")

int BPF_KSYSCALL(handle_sys_connect, int fd, struct sockaddr_in *uservaddr,

		 int addrlen)

{

	return handle_sys_connect_common(uservaddr);

}



#if defined(bpf_target_s390)

#ifndef SYS_CONNECT

#define SYS_CONNECT 3

#endif



SEC("ksyscall/socketcall")

int BPF_KSYSCALL(handle_sys_socketcall, int call, unsigned long *args)

{

	if (call == SYS_CONNECT) {

		struct sockaddr_in *uservaddr;



		bpf_probe_read_user(&uservaddr, sizeof(uservaddr), &args[1]);

		return handle_sys_connect_common(uservaddr);

	}



	return 0;

}

#endif



char _license[] SEC("license") = "GPL";