qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-12 09:50:21 -07:00
Code Releases Activity

internal/poll: fall back on unsupported splice from unix socket

Browse Source 
Gracefully fallback to a userspace copy when the kernel does not support
splice(2) on a unix domain socket. EINVAL is returned by the splice
syscall if it does not support unix domain sockets. Keeping the handled
return value as false when the first splice call fails with EINVAL will
cause the caller to fall back to a userspace copy.

Fixes #27513

Change-Id: I4b10c1900ba3c096cb32edb7c8a6044f468efb52
Reviewed-on: https://go-review.googlesource.com/133575
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Tobias Klauser <tobias.klauser@gmail.com>
This commit is contained in:
Ben Burkert 2018-09-05 10:20:26 -07:00 committed by Tobias Klauser
parent 58c6afe075
commit 1bf5796cae
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/internal/poll/splice_linux.go
View File

@ -32,8 +32,6 @@ func Splice(dst, src *FD, remain int64) (written int64, handled bool, sc string,
return 0, false, sc, err
}
defer destroyTempPipe(prfd, pwfd)
// From here on, the operation should be considered handled,
// even if Splice doesn't transfer any data.
var inPipe, n int
for err == nil && remain > 0 {
max := maxSpliceSize
@ -41,6 +39,12 @@ func Splice(dst, src *FD, remain int64) (written int64, handled bool, sc string,
max = int(remain)
}
inPipe, err = spliceDrain(pwfd, src, max)
// the operation is considered handled if splice returns no error, or
// an error other than EINVAL. An EINVAL means the kernel does not
// support splice for the socket type of dst and/or src. The failed
// syscall does not consume any data so it is safe to fall back to a
// generic copy.
handled = handled || (err != syscall.EINVAL)
// spliceDrain should never return EAGAIN, so if err != nil,
// Splice cannot continue. If inPipe == 0 && err == nil,
// src is at EOF, and the transfer is complete.
@ -54,7 +58,7 @@ func Splice(dst, src *FD, remain int64) (written int64, handled bool, sc string,
}
}
if err != nil {
return written, true, "splice", err
return written, handled, "splice", err
}
return written, true, "", nil
}