Commit eaa8c9a8 authored by Thomas Weißschuh's avatar Thomas Weißschuh
Browse files

tools/nolibc: automatically detect necessity to use pselect6 



We can automatically detect if pselect6 is needed or not from the kernel
headers. This removes the need to manually specify it.

Signed-off-by: default avatarThomas Weißschuh <linux@weissschuh.net>
Acked-by: default avatarWilly Tarreau <w@1wt.eu>
Link: https://lore.kernel.org/r/20230917-nolibc-syscall-nr-v2-4-03863d509b9a@weissschuh.net
parent e7b28f25

tools/include/nolibc/arch-aarch64.h

+0 −3
Original line number Diff line number Diff line
@@ -20,10 +20,7 @@ 
 *   - the arguments are cast to long and assigned into the target registers

 *     which are then simply passed as registers to the asm code, so that we

 *     don't have to experience issues with register constraints.

 *

 * On aarch64, select() is not implemented so we have to use pselect6().

 */

#define __ARCH_WANT_SYS_PSELECT6



#define my_syscall0(num)                                                      \

({                                                                            \

tools/include/nolibc/arch-loongarch.h

+1 −3
Original line number Diff line number Diff line
@@ -19,10 +19,8 @@ 
 *   - the arguments are cast to long and assigned into the target

 *     registers which are then simply passed as registers to the asm code,

 *     so that we don't have to experience issues with register constraints.

 *

 * On LoongArch, select() is not implemented so we have to use pselect6().

 */

#define __ARCH_WANT_SYS_PSELECT6



#define _NOLIBC_SYSCALL_CLOBBERLIST \

	"memory", "$t0", "$t1", "$t2", "$t3", "$t4", "$t5", "$t6", "$t7", "$t8"

tools/include/nolibc/arch-riscv.h

+0 −3
Original line number Diff line number Diff line
@@ -19,10 +19,7 @@ 
 *   - the arguments are cast to long and assigned into the target

 *     registers which are then simply passed as registers to the asm code,

 *     so that we don't have to experience issues with register constraints.

 *

 * On riscv, select() is not implemented so we have to use pselect6().

 */

#define __ARCH_WANT_SYS_PSELECT6



#define my_syscall0(num)                                                      \

({                                                                            \

tools/include/nolibc/sys.h

+5 −5
Original line number Diff line number Diff line
@@ -930,7 +930,11 @@ int sys_select(int nfds, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeva 
		struct timeval *t;

	} arg = { .n = nfds, .r = rfds, .w = wfds, .e = efds, .t = timeout };

	return my_syscall1(__NR_select, &arg);

#elif defined(__ARCH_WANT_SYS_PSELECT6) && defined(__NR_pselect6)

#elif defined(__NR__newselect)

	return my_syscall5(__NR__newselect, nfds, rfds, wfds, efds, timeout);

#elif defined(__NR_select)

	return my_syscall5(__NR_select, nfds, rfds, wfds, efds, timeout);

#elif defined(__NR_pselect6)

	struct timespec t;



	if (timeout) {
@@ -938,10 +942,6 @@ int sys_select(int nfds, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeva 
		t.tv_nsec = timeout->tv_usec * 1000;

	}

	return my_syscall6(__NR_pselect6, nfds, rfds, wfds, efds, timeout ? &t : NULL, NULL);

#elif defined(__NR__newselect)

	return my_syscall5(__NR__newselect, nfds, rfds, wfds, efds, timeout);

#elif defined(__NR_select)

	return my_syscall5(__NR_select, nfds, rfds, wfds, efds, timeout);

#else

	return __nolibc_enosys(__func__, nfds, rfds, wfds, efds, timeout);

#endif