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_386.s | 52 --------------------------------------------- 1 file changed, 52 deletions(-) (limited to 'src/runtime/sys_linux_386.s') diff --git a/src/runtime/sys_linux_386.s b/src/runtime/sys_linux_386.s index 4942f21e4f..4f5b34b996 100644 --- a/src/runtime/sys_linux_386.s +++ b/src/runtime/sys_linux_386.s @@ -33,7 +33,6 @@ #define SYS_access 33 #define SYS_kill 37 #define SYS_brk 45 -#define SYS_fcntl 55 #define SYS_munmap 91 #define SYS_socketcall 102 #define SYS_setittimer 104 @@ -52,15 +51,11 @@ #define SYS_sched_getaffinity 242 #define SYS_set_thread_area 243 #define SYS_exit_group 252 -#define SYS_epoll_create 254 -#define SYS_epoll_ctl 255 -#define SYS_epoll_wait 256 #define SYS_timer_create 259 #define SYS_timer_settime 260 #define SYS_timer_delete 263 #define SYS_clock_gettime 265 #define SYS_tgkill 270 -#define SYS_epoll_create1 329 #define SYS_pipe2 331 TEXT runtime·exit(SB),NOSPLIT,$0 @@ -726,53 +721,6 @@ TEXT runtime·sched_getaffinity(SB),NOSPLIT,$0 MOVL AX, ret+12(FP) RET -// int32 runtime·epollcreate(int32 size); -TEXT runtime·epollcreate(SB),NOSPLIT,$0 - MOVL $SYS_epoll_create, AX - MOVL size+0(FP), BX - INVOKE_SYSCALL - MOVL AX, ret+4(FP) - RET - -// int32 runtime·epollcreate1(int32 flags); -TEXT runtime·epollcreate1(SB),NOSPLIT,$0 - MOVL $SYS_epoll_create1, AX - MOVL flags+0(FP), BX - INVOKE_SYSCALL - MOVL AX, ret+4(FP) - RET - -// func epollctl(epfd, op, fd int32, ev *epollEvent) int -TEXT runtime·epollctl(SB),NOSPLIT,$0 - MOVL $SYS_epoll_ctl, AX - MOVL epfd+0(FP), BX - MOVL op+4(FP), CX - MOVL fd+8(FP), DX - MOVL ev+12(FP), SI - INVOKE_SYSCALL - MOVL AX, ret+16(FP) - RET - -// int32 runtime·epollwait(int32 epfd, EpollEvent *ev, int32 nev, int32 timeout); -TEXT runtime·epollwait(SB),NOSPLIT,$0 - MOVL $SYS_epoll_wait, AX - MOVL epfd+0(FP), BX - MOVL ev+4(FP), CX - MOVL nev+8(FP), DX - MOVL timeout+12(FP), SI - INVOKE_SYSCALL - MOVL AX, ret+16(FP) - RET - -// void runtime·closeonexec(int32 fd); -TEXT runtime·closeonexec(SB),NOSPLIT,$0 - MOVL $SYS_fcntl, AX - MOVL fd+0(FP), BX // fd - MOVL $2, CX // F_SETFD - MOVL $1, DX // FD_CLOEXEC - INVOKE_SYSCALL - RET - // int access(const char *name, int mode) TEXT runtime·access(SB),NOSPLIT,$0 MOVL $SYS_access, AX -- cgit v1.3