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_arm.s | 52 --------------------------------------------- 1 file changed, 52 deletions(-) (limited to 'src/runtime/sys_linux_arm.s') diff --git a/src/runtime/sys_linux_arm.s b/src/runtime/sys_linux_arm.s index 9ac64328c1..1bc9e86d6d 100644 --- a/src/runtime/sys_linux_arm.s +++ b/src/runtime/sys_linux_arm.s @@ -41,15 +41,10 @@ #define SYS_nanosleep (SYS_BASE + 162) #define SYS_sched_getaffinity (SYS_BASE + 242) #define SYS_clock_gettime (SYS_BASE + 263) -#define SYS_epoll_create (SYS_BASE + 250) -#define SYS_epoll_ctl (SYS_BASE + 251) -#define SYS_epoll_wait (SYS_BASE + 252) #define SYS_timer_create (SYS_BASE + 257) #define SYS_timer_settime (SYS_BASE + 258) #define SYS_timer_delete (SYS_BASE + 261) -#define SYS_epoll_create1 (SYS_BASE + 357) #define SYS_pipe2 (SYS_BASE + 359) -#define SYS_fcntl (SYS_BASE + 55) #define SYS_access (SYS_BASE + 33) #define SYS_connect (SYS_BASE + 283) #define SYS_socket (SYS_BASE + 281) @@ -616,53 +611,6 @@ TEXT runtime·sched_getaffinity(SB),NOSPLIT,$0 MOVW R0, ret+12(FP) RET -// int32 runtime·epollcreate(int32 size) -TEXT runtime·epollcreate(SB),NOSPLIT,$0 - MOVW size+0(FP), R0 - MOVW $SYS_epoll_create, R7 - SWI $0 - MOVW R0, ret+4(FP) - RET - -// int32 runtime·epollcreate1(int32 flags) -TEXT runtime·epollcreate1(SB),NOSPLIT,$0 - MOVW flags+0(FP), R0 - MOVW $SYS_epoll_create1, R7 - SWI $0 - MOVW R0, ret+4(FP) - RET - -// func epollctl(epfd, op, fd int32, ev *epollEvent) int -TEXT runtime·epollctl(SB),NOSPLIT,$0 - MOVW epfd+0(FP), R0 - MOVW op+4(FP), R1 - MOVW fd+8(FP), R2 - MOVW ev+12(FP), R3 - MOVW $SYS_epoll_ctl, R7 - SWI $0 - MOVW R0, ret+16(FP) - RET - -// int32 runtime·epollwait(int32 epfd, EpollEvent *ev, int32 nev, int32 timeout) -TEXT runtime·epollwait(SB),NOSPLIT,$0 - MOVW epfd+0(FP), R0 - MOVW ev+4(FP), R1 - MOVW nev+8(FP), R2 - MOVW timeout+12(FP), R3 - MOVW $SYS_epoll_wait, R7 - SWI $0 - MOVW R0, ret+16(FP) - RET - -// void runtime·closeonexec(int32 fd) -TEXT runtime·closeonexec(SB),NOSPLIT,$0 - MOVW fd+0(FP), R0 // fd - MOVW $2, R1 // F_SETFD - MOVW $1, R2 // FD_CLOEXEC - MOVW $SYS_fcntl, R7 - SWI $0 - RET - // b __kuser_get_tls @ 0xffff0fe0 TEXT runtime·read_tls_fallback(SB),NOSPLIT|NOFRAME,$0 MOVW $0xffff0fe0, R0 -- cgit v1.3