Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

internal/poll, os: loop on EINTR

Browse source 
Historically we've assumed that we can install all signal handlers
with the SA_RESTART flag set, and let the system restart slow functions
if a signal is received. Therefore, we don't have to worry about EINTR.

This is only partially true, and we've added EINTR checks already for
connect, and open/read on Darwin, and sendfile on Solaris.

Other cases have turned up in #36644, #38033, and #38836.

Also, #20400 points out that when Go code is included in a C program,
the C program may install its own signal handlers without SA_RESTART.
In that case, Go code will see EINTR no matter what it does.

So, go ahead and check for EINTR. We don't check in the syscall package;
people using syscalls directly may want to check for EINTR themselves.
But we do check for EINTR in the higher level APIs in os and net,
and retry the system call if we see it.

This change looks safe, but of course we may be missing some cases
where we need to check for EINTR. As such cases turn up, we can add
tests to runtime/testdata/testprogcgo/eintr.go, and fix the code.
If there are any such cases, their handling after this change will be
no worse than it is today.

For #22838
Fixes #20400
Fixes #36644
Fixes #38033
Fixes #38836

Change-Id: I7e46ca8cafed0429c7a2386cc9edc9d9d47a6896
Reviewed-on: https://go-review.googlesource.com/c/go/+/232862
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
This commit is contained in:
Ian Lance Taylor 2020-05-07 21:34:54 -07:00
parent 910fee4ed5
commit 8c1db77a92
14 changed files with 359 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/internal/poll/copy_file_range_linux.go
View file

@ -88,6 +88,12 @@ func copyFileRange(dst, src *FD, max int) (written int64, err error) {
return 0, err
}
defer src.readUnlock()
n, err := unix.CopyFileRange(src.Sysfd, nil, dst.Sysfd, nil, max, 0)
var n int
for {
n, err = unix.CopyFileRange(src.Sysfd, nil, dst.Sysfd, nil, max, 0)
if err != syscall.EINTR {
break
}
}
return int64(n), err
}

59
src/internal/poll/fd_unix.go
View file

@ -8,7 +8,6 @@ package poll
import (
"io"
"runtime"
"sync/atomic"
"syscall"
)
@ -153,7 +152,7 @@ func (fd *FD) Read(p []byte) (int, error) {
p = p[:maxRW]
}
for {
n, err := syscall.Read(fd.Sysfd, p)
n, err := ignoringEINTR(syscall.Read, fd.Sysfd, p)
if err != nil {
n = 0
if err == syscall.EAGAIN && fd.pd.pollable() {
@ -161,12 +160,6 @@ func (fd *FD) Read(p []byte) (int, error) {
continue
}
}
// On MacOS we can see EINTR here if the user
// pressed ^Z. See issue #22838.
if runtime.GOOS == "darwin" && err == syscall.EINTR {
continue
}
}
err = fd.eofError(n, err)
return n, err
@ -184,7 +177,16 @@ func (fd *FD) Pread(p []byte, off int64) (int, error) {
if fd.IsStream && len(p) > maxRW {
p = p[:maxRW]
}
n, err := syscall.Pread(fd.Sysfd, p, off)
var (
n int
err error
)
for {
n, err = syscall.Pread(fd.Sysfd, p, off)
if err != syscall.EINTR {
break
}
}
if err != nil {
n = 0
}
@ -205,6 +207,9 @@ func (fd *FD) ReadFrom(p []byte) (int, syscall.Sockaddr, error) {
for {
n, sa, err := syscall.Recvfrom(fd.Sysfd, p, 0)
if err != nil {
if err == syscall.EINTR {
continue
}
n = 0
if err == syscall.EAGAIN && fd.pd.pollable() {
if err = fd.pd.waitRead(fd.isFile); err == nil {
@ -229,6 +234,9 @@ func (fd *FD) ReadMsg(p []byte, oob []byte) (int, int, int, syscall.Sockaddr, er
for {
n, oobn, flags, sa, err := syscall.Recvmsg(fd.Sysfd, p, oob, 0)
if err != nil {
if err == syscall.EINTR {
continue
}
// TODO(dfc) should n and oobn be set to 0
if err == syscall.EAGAIN && fd.pd.pollable() {
if err = fd.pd.waitRead(fd.isFile); err == nil {
@ -256,7 +264,7 @@ func (fd *FD) Write(p []byte) (int, error) {
if fd.IsStream && max-nn > maxRW {
max = nn + maxRW
}
n, err := syscall.Write(fd.Sysfd, p[nn:max])
n, err := ignoringEINTR(syscall.Write, fd.Sysfd, p[nn:max])
if n > 0 {
nn += n
}
@ -293,6 +301,9 @@ func (fd *FD) Pwrite(p []byte, off int64) (int, error) {
max = nn + maxRW
}
n, err := syscall.Pwrite(fd.Sysfd, p[nn:max], off+int64(nn))
if err == syscall.EINTR {
continue
}
if n > 0 {
nn += n
}
@ -319,6 +330,9 @@ func (fd *FD) WriteTo(p []byte, sa syscall.Sockaddr) (int, error) {
}
for {
err := syscall.Sendto(fd.Sysfd, p, 0, sa)
if err == syscall.EINTR {
continue
}
if err == syscall.EAGAIN && fd.pd.pollable() {
if err = fd.pd.waitWrite(fd.isFile); err == nil {
continue
@ -342,6 +356,9 @@ func (fd *FD) WriteMsg(p []byte, oob []byte, sa syscall.Sockaddr) (int, int, err
}
for {
n, err := syscall.SendmsgN(fd.Sysfd, p, oob, sa, 0)
if err == syscall.EINTR {
continue
}
if err == syscall.EAGAIN && fd.pd.pollable() {
if err = fd.pd.waitWrite(fd.isFile); err == nil {
continue
@ -370,6 +387,8 @@ func (fd *FD) Accept() (int, syscall.Sockaddr, string, error) {
return s, rsa, "", err
}
switch err {
case syscall.EINTR:
continue
case syscall.EAGAIN:
if fd.pd.pollable() {
if err = fd.pd.waitRead(fd.isFile); err == nil {
@ -404,7 +423,7 @@ func (fd *FD) ReadDirent(buf []byte) (int, error) {
}
defer fd.decref()
for {
n, err := syscall.ReadDirent(fd.Sysfd, buf)
n, err := ignoringEINTR(syscall.ReadDirent, fd.Sysfd, buf)
if err != nil {
n = 0
if err == syscall.EAGAIN && fd.pd.pollable() {
@ -495,7 +514,7 @@ func (fd *FD) WriteOnce(p []byte) (int, error) {
return 0, err
}
defer fd.writeUnlock()
return syscall.Write(fd.Sysfd, p)
return ignoringEINTR(syscall.Write, fd.Sysfd, p)
}
// RawRead invokes the user-defined function f for a read operation.
@ -535,3 +554,19 @@ func (fd *FD) RawWrite(f func(uintptr) bool) error {
}
}
}
// ignoringEINTR makes a function call and repeats it if it returns
// an EINTR error. This appears to be required even though we install
// all signal handlers with SA_RESTART: see #22838, #38033, #38836.
// Also #20400 and #36644 are issues in which a signal handler is
// installed without setting SA_RESTART. None of these are the common case,
// but there are enough of them that it seems that we can't avoid
// an EINTR loop.
func ignoringEINTR(fn func(fd int, p []byte) (int, error), fd int, p []byte) (int, error) {
for {
n, err := fn(fd, p)
if err != syscall.EINTR {
return n, err
}
}
}

13
src/internal/poll/fd_writev_unix.go
View file

@ -12,9 +12,18 @@ import (
)
func writev(fd int, iovecs []syscall.Iovec) (uintptr, error) {
r, _, e := syscall.Syscall(syscall.SYS_WRITEV, uintptr(fd), uintptr(unsafe.Pointer(&iovecs[0])), uintptr(len(iovecs)))
var (
r uintptr
e syscall.Errno
)
for {
r, _, e = syscall.Syscall(syscall.SYS_WRITEV, uintptr(fd), uintptr(unsafe.Pointer(&iovecs[0])), uintptr(len(iovecs)))
if e != syscall.EINTR {
break
}
}
if e != 0 {
return r, syscall.Errno(e)
return r, e
}
return r, nil
}

3
src/internal/poll/sendfile_bsd.go
View file

@ -35,6 +35,9 @@ func SendFile(dstFD *FD, src int, pos, remain int64) (int64, error) {
} else if n == 0 && err1 == nil {
break
}
if err1 == syscall.EINTR {
continue
}
if err1 == syscall.EAGAIN {
if err1 = dstFD.pd.waitWrite(dstFD.isFile); err1 == nil {
continue

3
src/internal/poll/sendfile_linux.go
View file

@ -32,6 +32,9 @@ func SendFile(dstFD *FD, src int, remain int64) (int64, error) {
} else if n == 0 && err1 == nil {
break
}
if err1 == syscall.EINTR {
continue
}
if err1 == syscall.EAGAIN {
if err1 = dstFD.pd.waitWrite(dstFD.isFile); err1 == nil {
continue

3
src/internal/poll/splice_linux.go
View file

@ -87,6 +87,9 @@ func spliceDrain(pipefd int, sock *FD, max int) (int, error) {
}
for {
n, err := splice(pipefd, sock.Sysfd, max, spliceNonblock)
if err == syscall.EINTR {
continue
}
if err != syscall.EAGAIN {
return n, err
}

5
src/internal/poll/writev.go
View file

@ -68,7 +68,10 @@ func (fd *FD) Writev(v *[][]byte) (int64, error) {
iovecs[i] = syscall.Iovec{}
}
if err != nil {
if err.(syscall.Errno) == syscall.EAGAIN {
if err == syscall.EINTR {
continue
}
if err == syscall.EAGAIN {
if err = fd.pd.waitWrite(fd.isFile); err == nil {
continue
}

15
src/os/exec_unix.go
View file

@ -33,9 +33,18 @@ func (p *Process) wait() (ps *ProcessState, err error) {
p.sigMu.Unlock()
}
var status syscall.WaitStatus
var rusage syscall.Rusage
pid1, e := syscall.Wait4(p.Pid, &status, 0, &rusage)
var (
status syscall.WaitStatus
rusage syscall.Rusage
pid1 int
e error
)
for {
pid1, e = syscall.Wait4(p.Pid, &status, 0, &rusage)
if e != syscall.EINTR {
break
}
}
if e != nil {
return nil, NewSyscallError("wait", e)
}

5
src/os/wait_wait6.go
View file

@ -18,6 +18,7 @@ const _P_PID = 0
// It does not actually call p.Wait.
func (p *Process) blockUntilWaitable() (bool, error) {
var errno syscall.Errno
for {
// The arguments on 32-bit FreeBSD look like the following:
// - freebsd32_wait6_args{ idtype, id1, id2, status, options, wrusage, info } or
// - freebsd32_wait6_args{ idtype, pad, id1, id2, status, options, wrusage, info } when PAD64_REQUIRED=1 on ARM, MIPS or PowerPC
@ -28,6 +29,10 @@ func (p *Process) blockUntilWaitable() (bool, error) {
} else {
_, _, errno = syscall.Syscall6(syscall.SYS_WAIT6, _P_PID, uintptr(p.Pid), 0, syscall.WEXITED|syscall.WNOWAIT, 0, 0)
}
if errno != syscall.EINTR {
break
}
}
runtime.KeepAlive(p)
if errno != 0 {
return false, NewSyscallError("wait6", errno)

8
src/os/wait_waitid.go
View file

@ -27,7 +27,13 @@ func (p *Process) blockUntilWaitable() (bool, error) {
// We don't care about the values it returns.
var siginfo [16]uint64
psig := &siginfo[0]
_, _, e := syscall.Syscall6(syscall.SYS_WAITID, _P_PID, uintptr(p.Pid), uintptr(unsafe.Pointer(psig)), syscall.WEXITED|syscall.WNOWAIT, 0, 0)
var e syscall.Errno
for {
_, _, e = syscall.Syscall6(syscall.SYS_WAITID, _P_PID, uintptr(p.Pid), uintptr(unsafe.Pointer(psig)), syscall.WEXITED|syscall.WNOWAIT, 0, 0)
if e != syscall.EINTR {
break
}
}
runtime.KeepAlive(p)
if e != 0 {
// waitid has been available since Linux 2.6.9, but

27
src/runtime/crash_cgo_test.go
View file

@ -573,3 +573,30 @@ func TestSegv(t *testing.T) {
})
}
}
// TestEINTR tests that we handle EINTR correctly.
// See issue #20400 and friends.
func TestEINTR(t *testing.T) {
switch runtime.GOOS {
case "plan9", "windows":
t.Skipf("no EINTR on %s", runtime.GOOS)
case "linux":
if runtime.GOARCH == "386" {
// On linux-386 the Go signal handler sets
// a restorer function that is not preserved
// by the C sigaction call in the test,
// causing the signal handler to crash when
// returning the normal code. The test is not
// architecture-specific, so just skip on 386
// rather than doing a complicated workaround.
t.Skip("skipping on linux-386; C sigaction does not preserve Go restorer")
}
}
t.Parallel()
output := runTestProg(t, "testprogcgo", "EINTR")
want := "OK\n"
if output != want {
t.Fatalf("want %s, got %s\n", want, output)
}
}

214
src/runtime/testdata/testprogcgo/eintr.go vendored Normal file
View file

@ -0,0 +1,214 @@
// Copyright 2020 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
// +build !plan9,!windows
package main
/*
#include <errno.h>
#include <signal.h>
#include <string.h>
static int clearRestart(int sig) {
struct sigaction sa;
memset(&sa, 0, sizeof sa);
if (sigaction(sig, NULL, &sa) < 0) {
return errno;
}
sa.sa_flags &=~ SA_RESTART;
if (sigaction(sig, &sa, NULL) < 0) {
return errno;
}
return 0;
}
*/
import "C"
import (
"bytes"
"errors"
"fmt"
"io"
"log"
"net"
"os"
"os/exec"
"sync"
"syscall"
"time"
)
func init() {
register("EINTR", EINTR)
register("Nop", Nop)
}
// Test various operations when a signal handler is installed without
// the SA_RESTART flag. This tests that the os and net APIs handle EINTR.
func EINTR() {
if errno := C.clearRestart(C.int(syscall.SIGURG)); errno != 0 {
log.Fatal(syscall.Errno(errno))
}
if errno := C.clearRestart(C.int(syscall.SIGWINCH)); errno != 0 {
log.Fatal(syscall.Errno(errno))
}
if errno := C.clearRestart(C.int(syscall.SIGCHLD)); errno != 0 {
log.Fatal(syscall.Errno(errno))
}
// Send ourselves SIGWINCH regularly.
go func() {
for range time.Tick(100 * time.Microsecond) {
syscall.Kill(0, syscall.SIGWINCH)
}
}()
var wg sync.WaitGroup
testPipe(&wg)
testNet(&wg)
testExec(&wg)
wg.Wait()
fmt.Println("OK")
}
// spin does CPU bound spinning and allocating for a millisecond,
// to get a SIGURG.
//go:noinline
func spin() (float64, [][]byte) {
stop := time.Now().Add(time.Millisecond)
r1 := 0.0
var r2 [][]byte
for time.Now().Before(stop) {
for i := 1; i < 1e6; i++ {
r1 += r1 / float64(i)
r2 = append(r2, bytes.Repeat([]byte{byte(i)}, 100))
}
}
return r1, r2
}
// testPipe tests pipe operations.
func testPipe(wg *sync.WaitGroup) {
r, w, err := os.Pipe()
if err != nil {
log.Fatal(err)
}
if err := syscall.SetNonblock(int(r.Fd()), false); err != nil {
log.Fatal(err)
}
if err := syscall.SetNonblock(int(w.Fd()), false); err != nil {
log.Fatal(err)
}
wg.Add(2)
go func() {
defer wg.Done()
defer w.Close()
// Spin before calling Write so that the first ReadFull
// in the other goroutine will likely be interrupted
// by a signal.
spin()
// This Write will likely be interrupted by a signal
// as the other goroutine spins in the middle of reading.
// We write enough data that we should always fill the
// pipe buffer and need multiple write system calls.
if _, err := w.Write(bytes.Repeat([]byte{0}, 2 << 20)); err != nil {
log.Fatal(err)
}
}()
go func() {
defer wg.Done()
defer r.Close()
b := make([]byte, 1 << 20)
// This ReadFull will likely be interrupted by a signal,
// as the other goroutine spins before writing anything.
if _, err := io.ReadFull(r, b); err != nil {
log.Fatal(err)
}
// Spin after reading half the data so that the Write
// in the other goroutine will likely be interrupted
// before it completes.
spin()
if _, err := io.ReadFull(r, b); err != nil {
log.Fatal(err)
}
}()
}
// testNet tests network operations.
func testNet(wg *sync.WaitGroup) {
ln, err := net.Listen("tcp4", "127.0.0.1:0")
if err != nil {
if errors.Is(err, syscall.EAFNOSUPPORT) || errors.Is(err, syscall.EPROTONOSUPPORT) {
return
}
log.Fatal(err)
}
wg.Add(2)
go func() {
defer wg.Done()
defer ln.Close()
c, err := ln.Accept()
if err != nil {
log.Fatal(err)
}
defer c.Close()
cf, err := c.(*net.TCPConn).File()
if err != nil {
log.Fatal(err)
}
defer cf.Close()
if err := syscall.SetNonblock(int(cf.Fd()), false); err != nil {
log.Fatal(err)
}
// See comments in testPipe.
spin()
if _, err := cf.Write(bytes.Repeat([]byte{0}, 2 << 20)); err != nil {
log.Fatal(err)
}
}()
go func() {
defer wg.Done()
spin()
c, err := net.Dial("tcp", ln.Addr().String())
if err != nil {
log.Fatal(err)
}
defer c.Close()
cf, err := c.(*net.TCPConn).File()
if err != nil {
log.Fatal(err)
}
defer cf.Close()
if err := syscall.SetNonblock(int(cf.Fd()), false); err != nil {
log.Fatal(err)
}
// See comments in testPipe.
b := make([]byte, 1 << 20)
if _, err := io.ReadFull(cf, b); err != nil {
log.Fatal(err)
}
spin()
if _, err := io.ReadFull(cf, b); err != nil {
log.Fatal(err)
}
}()
}
func testExec(wg *sync.WaitGroup) {
wg.Add(1)
go func() {
defer wg.Done()
if err := exec.Command(os.Args[0], "Nop").Run(); err != nil {
log.Fatal(err)
}
}()
}
// Nop just sleeps for a bit. This is used to test interrupts while waiting
// for a child.
func Nop() {
time.Sleep(time.Millisecond)
}

1
src/runtime/trace/trace_stack_test.go
View file

@ -252,6 +252,7 @@ func TestTraceSymbolize(t *testing.T) {
{trace.EvGoSysCall, []frame{
{"syscall.read", 0},
{"syscall.Read", 0},
{"internal/poll.ignoringEINTR", 0},
{"internal/poll.(*FD).Read", 0},
{"os.(*File).read", 0},
{"os.(*File).Read", 0},

5
src/syscall/exec_unix.go
View file

@ -217,7 +217,12 @@ func forkExec(argv0 string, argv []string, attr *ProcAttr) (pid int, err error)
// Read child error status from pipe.
Close(p[1])
for {
n, err = readlen(p[0], (*byte)(unsafe.Pointer(&err1)), int(unsafe.Sizeof(err1)))
if err != EINTR {
break
}
}
Close(p[0])
if err != nil || n != 0 {
if n == int(unsafe.Sizeof(err1)) {