From c7cc2b94c63af610a29b1b48cfbfb87cb8abf05b Mon Sep 17 00:00:00 2001 From: Andrew Pogrebnoy Date: Fri, 7 Oct 2022 10:12:54 +0300 Subject: runtime: move epoll syscalls to runtime/internal/syscall This change moves Linux epoll's syscalls implementation to the "runtime/internal/syscall" package. The intention in this CL was to minimise behavioural changes but make the code more generalised. This also will allow adding new syscalls (like epoll_pwait2) without the need to implement assembly stubs for each arch. It also drops epoll_create as not all architectures provide this call. epoll_create1 was added to the kernel in version 2.6.27 and Go requires Linux kernel version 2.6.32 or later since Go 1.18. So it is safe to always use epoll_create1. This is a resubmit as the previous CL 421994 was reverted due to test failures after the merge with the master. The issue was fixed in CL 438615 For #53824 For #51087 Change-Id: I1bd0f23a85b4f9b80178c5dd36fd3e95ff4f9648 Reviewed-on: https://go-review.googlesource.com/c/go/+/440115 Reviewed-by: Dmitri Shuralyov TryBot-Result: Gopher Robot Auto-Submit: Michael Pratt Reviewed-by: Michael Pratt Run-TryBot: Michael Pratt --- src/runtime/sys_linux_amd64.s | 54 ------------------------------------------- 1 file changed, 54 deletions(-) (limited to 'src/runtime/sys_linux_amd64.s') diff --git a/src/runtime/sys_linux_amd64.s b/src/runtime/sys_linux_amd64.s index ca6ecb13eb..d91f9bd31f 100644 --- a/src/runtime/sys_linux_amd64.s +++ b/src/runtime/sys_linux_amd64.s @@ -33,24 +33,19 @@ #define SYS_clone 56 #define SYS_exit 60 #define SYS_kill 62 -#define SYS_fcntl 72 #define SYS_sigaltstack 131 #define SYS_arch_prctl 158 #define SYS_gettid 186 #define SYS_futex 202 #define SYS_sched_getaffinity 204 -#define SYS_epoll_create 213 #define SYS_timer_create 222 #define SYS_timer_settime 223 #define SYS_timer_delete 226 #define SYS_clock_gettime 228 #define SYS_exit_group 231 -#define SYS_epoll_ctl 233 #define SYS_tgkill 234 #define SYS_openat 257 #define SYS_faccessat 269 -#define SYS_epoll_pwait 281 -#define SYS_epoll_create1 291 #define SYS_pipe2 293 TEXT runtime·exit(SB),NOSPLIT,$0-4 @@ -666,55 +661,6 @@ TEXT runtime·sched_getaffinity(SB),NOSPLIT,$0 MOVL AX, ret+24(FP) RET -// int32 runtime·epollcreate(int32 size); -TEXT runtime·epollcreate(SB),NOSPLIT,$0 - MOVL size+0(FP), DI - MOVL $SYS_epoll_create, AX - SYSCALL - MOVL AX, ret+8(FP) - RET - -// int32 runtime·epollcreate1(int32 flags); -TEXT runtime·epollcreate1(SB),NOSPLIT,$0 - MOVL flags+0(FP), DI - MOVL $SYS_epoll_create1, AX - SYSCALL - MOVL AX, ret+8(FP) - RET - -// func epollctl(epfd, op, fd int32, ev *epollEvent) int -TEXT runtime·epollctl(SB),NOSPLIT,$0 - MOVL epfd+0(FP), DI - MOVL op+4(FP), SI - MOVL fd+8(FP), DX - MOVQ ev+16(FP), R10 - MOVL $SYS_epoll_ctl, AX - SYSCALL - MOVL AX, ret+24(FP) - RET - -// int32 runtime·epollwait(int32 epfd, EpollEvent *ev, int32 nev, int32 timeout); -TEXT runtime·epollwait(SB),NOSPLIT,$0 - // This uses pwait instead of wait, because Android O blocks wait. - MOVL epfd+0(FP), DI - MOVQ ev+8(FP), SI - MOVL nev+16(FP), DX - MOVL timeout+20(FP), R10 - MOVQ $0, R8 - MOVL $SYS_epoll_pwait, AX - SYSCALL - MOVL AX, ret+24(FP) - RET - -// void runtime·closeonexec(int32 fd); -TEXT runtime·closeonexec(SB),NOSPLIT,$0 - MOVL fd+0(FP), DI // fd - MOVQ $2, SI // F_SETFD - MOVQ $1, DX // FD_CLOEXEC - MOVL $SYS_fcntl, AX - SYSCALL - RET - // int access(const char *name, int mode) TEXT runtime·access(SB),NOSPLIT,$0 // This uses faccessat instead of access, because Android O blocks access. -- cgit v1.3-5-g9baa