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_riscv64.s | 52 ----------------------------------------- 1 file changed, 52 deletions(-) (limited to 'src/runtime/sys_linux_riscv64.s') diff --git a/src/runtime/sys_linux_riscv64.s b/src/runtime/sys_linux_riscv64.s index afb2d11da9..f4fb1c124b 100644 --- a/src/runtime/sys_linux_riscv64.s +++ b/src/runtime/sys_linux_riscv64.s @@ -18,13 +18,9 @@ #define SYS_clone 220 #define SYS_close 57 #define SYS_connect 203 -#define SYS_epoll_create1 20 -#define SYS_epoll_ctl 21 -#define SYS_epoll_pwait 22 #define SYS_exit 93 #define SYS_exit_group 94 #define SYS_faccessat 48 -#define SYS_fcntl 25 #define SYS_futex 98 #define SYS_getpid 172 #define SYS_gettid 178 @@ -578,54 +574,6 @@ TEXT runtime·sched_getaffinity(SB),NOSPLIT|NOFRAME,$0 MOV A0, ret+24(FP) RET -// func epollcreate(size int32) int32 -TEXT runtime·epollcreate(SB),NOSPLIT|NOFRAME,$0 - MOV $0, A0 - MOV $SYS_epoll_create1, A7 - ECALL - MOVW A0, ret+8(FP) - RET - -// func epollcreate1(flags int32) int32 -TEXT runtime·epollcreate1(SB),NOSPLIT|NOFRAME,$0 - MOVW flags+0(FP), A0 - MOV $SYS_epoll_create1, A7 - ECALL - MOVW A0, ret+8(FP) - RET - -// func epollctl(epfd, op, fd int32, ev *epollevent) int32 -TEXT runtime·epollctl(SB),NOSPLIT|NOFRAME,$0 - MOVW epfd+0(FP), A0 - MOVW op+4(FP), A1 - MOVW fd+8(FP), A2 - MOV ev+16(FP), A3 - MOV $SYS_epoll_ctl, A7 - ECALL - MOVW A0, ret+24(FP) - RET - -// func epollwait(epfd int32, ev *epollevent, nev, timeout int32) int32 -TEXT runtime·epollwait(SB),NOSPLIT|NOFRAME,$0 - MOVW epfd+0(FP), A0 - MOV ev+8(FP), A1 - MOVW nev+16(FP), A2 - MOVW timeout+20(FP), A3 - MOV $0, A4 - MOV $SYS_epoll_pwait, A7 - ECALL - MOVW A0, ret+24(FP) - RET - -// func closeonexec(int32) -TEXT runtime·closeonexec(SB),NOSPLIT|NOFRAME,$0 - MOVW fd+0(FP), A0 // fd - MOV $2, A1 // F_SETFD - MOV $1, A2 // FD_CLOEXEC - MOV $SYS_fcntl, A7 - ECALL - RET - // func sbrk0() uintptr TEXT runtime·sbrk0(SB),NOSPLIT,$0-8 // Implemented as brk(NULL). -- cgit v1.3-5-g9baa