Commit 84c22fa8 authored by Tiezhu Yang's avatar Tiezhu Yang Committed by Andrii Nakryiko
Browse files

selftests/bpf: Use __NR_prlimit64 instead of __NR_getrlimit in user_ringbuf test 



After commit 80d7da1c ("asm-generic: Drop getrlimit and setrlimit
syscalls from default list"), new architectures won't need to include
getrlimit and setrlimit, they are superseded with prlimit64.

In order to maintain compatibility for the new architectures, such as
LoongArch which does not define __NR_getrlimit, it is better to use
__NR_prlimit64 instead of __NR_getrlimit in user_ringbuf test to fix
the following build error:

    TEST-OBJ [test_progs] user_ringbuf.test.o
  tools/testing/selftests/bpf/prog_tests/user_ringbuf.c: In function 'kick_kernel_cb':
  tools/testing/selftests/bpf/prog_tests/user_ringbuf.c:593:17: error: '__NR_getrlimit' undeclared (first use in this function)
    593 |         syscall(__NR_getrlimit);
        |                 ^~~~~~~~~~~~~~
  tools/testing/selftests/bpf/prog_tests/user_ringbuf.c:593:17: note: each undeclared identifier is reported only once for each function it appears in
  make: *** [Makefile:573: tools/testing/selftests/bpf/user_ringbuf.test.o] Error 1
  make: Leaving directory 'tools/testing/selftests/bpf'

Signed-off-by: default avatarTiezhu Yang <yangtiezhu@loongson.cn>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/1677235015-21717-4-git-send-email-yangtiezhu@loongson.cn
parent 29c66ad1

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

+1 −1
Original line number Diff line number Diff line
@@ -590,7 +590,7 @@ static void *kick_kernel_cb(void *arg) 
	/* Kick the kernel, causing it to drain the ring buffer and then wake

	 * up the test thread waiting on epoll.

	 */

	syscall(__NR_getrlimit);

	syscall(__NR_prlimit64);



	return NULL;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ do_nothing_cb(struct bpf_dynptr *dynptr, void *context) 
	return 0;

}



SEC("fentry/" SYS_PREFIX "sys_getrlimit")

SEC("fentry/" SYS_PREFIX "sys_prlimit64")

int test_user_ringbuf_epoll(void *ctx)

{

	long num_samples;