Skip to content

Commit 021fd86

Browse files
tklausergopherbot
authored andcommitted
syscall: implement EpollCreate using EpollCreate1 on all linux platforms
Most newer architectures (e.g. arm64, riscv64, loong64) don't provide the epoll_create syscall. Some systems (e.g. Android) block it even if it were available. In the kernel, the epoll_create syscall is implemented [1] the same way EpollCreate is implemented in this package for platforms without the epoll_create syscall. The epoll_create1 syscall is available since Linux kernel 2.6.27 and the minimum required kernel version is 2.6.32 since Go 1.18 (see #45964). Thus, avoid the separate wrapper and consistently implement EpollCreate using EpollCreate1. [1] https://elixir.bootlin.com/linux/v5.15-rc1/source/fs/eventpoll.c#L2006 The same change was already done in CL 349809 for golang.org/x/sys/unix. For #45964 Change-Id: I5463b208aa7ae236fa2c175d6d3ec6568f1840b0 Reviewed-on: https://go-review.googlesource.com/c/go/+/411594 Reviewed-by: Bryan Mills <[email protected]> Auto-Submit: Tobias Klauser <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]> TryBot-Result: Gopher Robot <[email protected]> Run-TryBot: Tobias Klauser <[email protected]>
1 parent 741ab7e commit 021fd86

21 files changed

+7
-138
lines changed

src/syscall/syscall_linux.go

+7
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,13 @@ func Creat(path string, mode uint32) (fd int, err error) {
115115
return Open(path, O_CREAT|O_WRONLY|O_TRUNC, mode)
116116
}
117117

118+
func EpollCreate(size int) (fd int, err error) {
119+
if size <= 0 {
120+
return -1, EINVAL
121+
}
122+
return EpollCreate1(0)
123+
}
124+
118125
func isGroupMember(gid int) bool {
119126
groups, err := Getgroups()
120127
if err != nil {

src/syscall/syscall_linux_386.go

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ func setTimeval(sec, usec int64) Timeval {
1919
// 64-bit file system and 32-bit uid calls
2020
// (386 default is 32-bit file system and 16-bit uid).
2121
//sys Dup2(oldfd int, newfd int) (err error)
22-
//sysnb EpollCreate(size int) (fd int, err error)
2322
//sys Fchown(fd int, uid int, gid int) (err error) = SYS_FCHOWN32
2423
//sys Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
2524
//sys fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_FSTATAT64

src/syscall/syscall_linux_amd64.go

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ package syscall
77
const _SYS_setgroups = SYS_SETGROUPS
88

99
//sys Dup2(oldfd int, newfd int) (err error)
10-
//sysnb EpollCreate(size int) (fd int, err error)
1110
//sys Fchown(fd int, uid int, gid int) (err error)
1211
//sys Fstat(fd int, stat *Stat_t) (err error)
1312
//sys Fstatfs(fd int, buf *Statfs_t) (err error)

src/syscall/syscall_linux_arm.go

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
4646
// 64-bit file system and 32-bit uid calls
4747
// (16-bit uid calls are not always supported in newer kernels)
4848
//sys Dup2(oldfd int, newfd int) (err error)
49-
//sysnb EpollCreate(size int) (fd int, err error)
5049
//sys Fchown(fd int, uid int, gid int) (err error) = SYS_FCHOWN32
5150
//sys Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
5251
//sys fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_FSTATAT64

src/syscall/syscall_linux_arm64.go

-7
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@ import "unsafe"
88

99
const _SYS_setgroups = SYS_SETGROUPS
1010

11-
func EpollCreate(size int) (fd int, err error) {
12-
if size <= 0 {
13-
return -1, EINVAL
14-
}
15-
return EpollCreate1(0)
16-
}
17-
1811
//sys EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) = SYS_EPOLL_PWAIT
1912
//sys Fchown(fd int, uid int, gid int) (err error)
2013
//sys Fstat(fd int, stat *Stat_t) (err error)

src/syscall/syscall_linux_loong64.go

-7
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@ import "unsafe"
88

99
const _SYS_setgroups = SYS_SETGROUPS
1010

11-
func EpollCreate(size int) (fd int, err error) {
12-
if size <= 0 {
13-
return -1, EINVAL
14-
}
15-
return EpollCreate1(0)
16-
}
17-
1811
//sys EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) = SYS_EPOLL_PWAIT
1912
//sys Fchown(fd int, uid int, gid int) (err error)
2013
//sys Fstatfs(fd int, buf *Statfs_t) (err error)

src/syscall/syscall_linux_mips64x.go

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ package syscall
99
const _SYS_setgroups = SYS_SETGROUPS
1010

1111
//sys Dup2(oldfd int, newfd int) (err error)
12-
//sysnb EpollCreate(size int) (fd int, err error)
1312
//sys Fchown(fd int, uid int, gid int) (err error)
1413
//sys Fstatfs(fd int, buf *Statfs_t) (err error)
1514
//sys fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_NEWFSTATAT

src/syscall/syscall_linux_mipsx.go

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ const _SYS_setgroups = SYS_SETGROUPS
1313
func Syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err Errno)
1414

1515
//sys Dup2(oldfd int, newfd int) (err error)
16-
//sysnb EpollCreate(size int) (fd int, err error)
1716
//sys Fchown(fd int, uid int, gid int) (err error)
1817
//sys fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_FSTATAT64
1918
//sys Ftruncate(fd int, length int64) (err error) = SYS_FTRUNCATE64

src/syscall/syscall_linux_ppc64x.go

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ package syscall
99
const _SYS_setgroups = SYS_SETGROUPS
1010

1111
//sys Dup2(oldfd int, newfd int) (err error)
12-
//sysnb EpollCreate(size int) (fd int, err error)
1312
//sys EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
1413
//sys Fchown(fd int, uid int, gid int) (err error)
1514
//sys Fstat(fd int, stat *Stat_t) (err error)

src/syscall/syscall_linux_riscv64.go

-7
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@ import "unsafe"
88

99
const _SYS_setgroups = SYS_SETGROUPS
1010

11-
func EpollCreate(size int) (fd int, err error) {
12-
if size <= 0 {
13-
return -1, EINVAL
14-
}
15-
return EpollCreate1(0)
16-
}
17-
1811
//sys EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) = SYS_EPOLL_PWAIT
1912
//sys Fchown(fd int, uid int, gid int) (err error)
2013
//sys Fstat(fd int, stat *Stat_t) (err error)

src/syscall/syscall_linux_s390x.go

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import "unsafe"
99
const _SYS_setgroups = SYS_SETGROUPS
1010

1111
//sys Dup2(oldfd int, newfd int) (err error)
12-
//sysnb EpollCreate(size int) (fd int, err error)
1312
//sys EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
1413
//sys Fchown(fd int, uid int, gid int) (err error)
1514
//sys Fstat(fd int, stat *Stat_t) (err error)

src/syscall/zsyscall_linux_386.go

-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/syscall/zsyscall_linux_amd64.go

-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/syscall/zsyscall_linux_arm.go

-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/syscall/zsyscall_linux_mips.go

-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/syscall/zsyscall_linux_mips64.go

-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/syscall/zsyscall_linux_mips64le.go

-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/syscall/zsyscall_linux_mipsle.go

-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/syscall/zsyscall_linux_ppc64.go

-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/syscall/zsyscall_linux_ppc64le.go

-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/syscall/zsyscall_linux_s390x.go

-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)