From 4e6f963469d8f489586b2bf277af30e0fbfa1679 Mon Sep 17 00:00:00 2001 From: Andrew Pogrebnoy Date: Mon, 1 Aug 2022 17:58:17 +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. For #53824 For #51087 Change-Id: I9a6a26b7f2075a38e041de1bab4691da0ecb94fc Reviewed-on: https://go-review.googlesource.com/c/go/+/421994 Reviewed-by: Michael Pratt TryBot-Result: Gopher Robot Reviewed-by: Dmitri Shuralyov Run-TryBot: Michael Pratt Auto-Submit: Michael Pratt --- src/runtime/sys_linux_arm64.s | 52 ------------------------------------------- 1 file changed, 52 deletions(-) (limited to 'src/runtime/sys_linux_arm64.s') diff --git a/src/runtime/sys_linux_arm64.s b/src/runtime/sys_linux_arm64.s index b47b6fd0a0..04a2cd2da1 100644 --- a/src/runtime/sys_linux_arm64.s +++ b/src/runtime/sys_linux_arm64.s @@ -22,7 +22,6 @@ #define SYS_openat 56 #define SYS_close 57 #define SYS_pipe2 59 -#define SYS_fcntl 25 #define SYS_nanosleep 101 #define SYS_mmap 222 #define SYS_munmap 215 @@ -42,9 +41,6 @@ #define SYS_futex 98 #define SYS_sched_getaffinity 123 #define SYS_exit_group 94 -#define SYS_epoll_create1 20 -#define SYS_epoll_ctl 21 -#define SYS_epoll_pwait 22 #define SYS_clock_gettime 113 #define SYS_faccessat 48 #define SYS_socket 198 @@ -762,54 +758,6 @@ TEXT runtime·sched_getaffinity(SB),NOSPLIT|NOFRAME,$0 MOVW R0, ret+24(FP) RET -// int32 runtime·epollcreate(int32 size); -TEXT runtime·epollcreate(SB),NOSPLIT|NOFRAME,$0 - MOVW $0, R0 - MOVD $SYS_epoll_create1, R8 - SVC - MOVW R0, ret+8(FP) - RET - -// int32 runtime·epollcreate1(int32 flags); -TEXT runtime·epollcreate1(SB),NOSPLIT|NOFRAME,$0 - MOVW flags+0(FP), R0 - MOVD $SYS_epoll_create1, R8 - SVC - MOVW R0, ret+8(FP) - RET - -// func epollctl(epfd, op, fd int32, ev *epollEvent) int -TEXT runtime·epollctl(SB),NOSPLIT|NOFRAME,$0 - MOVW epfd+0(FP), R0 - MOVW op+4(FP), R1 - MOVW fd+8(FP), R2 - MOVD ev+16(FP), R3 - MOVD $SYS_epoll_ctl, R8 - SVC - MOVW R0, ret+24(FP) - RET - -// int32 runtime·epollwait(int32 epfd, EpollEvent *ev, int32 nev, int32 timeout); -TEXT runtime·epollwait(SB),NOSPLIT|NOFRAME,$0 - MOVW epfd+0(FP), R0 - MOVD ev+8(FP), R1 - MOVW nev+16(FP), R2 - MOVW timeout+20(FP), R3 - MOVD $0, R4 - MOVD $SYS_epoll_pwait, R8 - SVC - MOVW R0, ret+24(FP) - RET - -// void runtime·closeonexec(int32 fd); -TEXT runtime·closeonexec(SB),NOSPLIT|NOFRAME,$0 - MOVW fd+0(FP), R0 // fd - MOVD $2, R1 // F_SETFD - MOVD $1, R2 // FD_CLOEXEC - MOVD $SYS_fcntl, R8 - SVC - RET - // int access(const char *name, int mode) TEXT runtime·access(SB),NOSPLIT,$0-20 MOVD $AT_FDCWD, R0 -- cgit v1.3