diff options
| author | Andy Pan <panjf2000@gmail.com> | 2022-08-27 03:29:19 +0800 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2022-08-29 20:06:09 +0000 |
| commit | c108a682ff4571d1fd45e9c05cfad7b9a6c86a3d (patch) | |
| tree | 83b06e989eb3c14a235ee30b83a9ee91963ea595 /src | |
| parent | 9da49a7d2e47919ecbf54e75bfc15ffb022cf1d6 (diff) | |
| download | go-c108a682ff4571d1fd45e9c05cfad7b9a6c86a3d.tar.xz | |
internal/poll: use sync.Once instead to guard CopyFileRange() with kernel 5.3
The existing implementation creates more branches with more states: -1, 0, 1,
which makes it not very intuitive to understand, let's use sync.Once and boolean
instead to make it more straightforward.
Change-Id: I05766e5fdf7dba37d6565f84d3db4373f9342fe5
Reviewed-on: https://go-review.googlesource.com/c/go/+/425880
Run-TryBot: Ian Lance Taylor <iant@google.com>
Reviewed-by: Heschi Kreinick <heschi@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/internal/poll/copy_file_range_linux.go | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/src/internal/poll/copy_file_range_linux.go b/src/internal/poll/copy_file_range_linux.go index 5b9e5d4020..c2347ba7f2 100644 --- a/src/internal/poll/copy_file_range_linux.go +++ b/src/internal/poll/copy_file_range_linux.go @@ -6,11 +6,14 @@ package poll import ( "internal/syscall/unix" - "sync/atomic" + "sync" "syscall" ) -var copyFileRangeSupported int32 = -1 // accessed atomically +var ( + kernelVersion53Once sync.Once + kernelVersion53 bool +) const maxCopyFileRangeRound = 1 << 30 @@ -52,20 +55,20 @@ func kernelVersion() (major int, minor int) { // CopyFileRange copies at most remain bytes of data from src to dst, using // the copy_file_range system call. dst and src must refer to regular files. func CopyFileRange(dst, src *FD, remain int64) (written int64, handled bool, err error) { - if supported := atomic.LoadInt32(©FileRangeSupported); supported == 0 { - return 0, false, nil - } else if supported == -1 { + kernelVersion53Once.Do(func() { major, minor := kernelVersion() + // copy_file_range(2) is broken in various ways on kernels older than 5.3, + // see issue #42400 and + // https://man7.org/linux/man-pages/man2/copy_file_range.2.html#VERSIONS if major > 5 || (major == 5 && minor >= 3) { - atomic.StoreInt32(©FileRangeSupported, 1) - } else { - // copy_file_range(2) is broken in various ways on kernels older than 5.3, - // see issue #42400 and - // https://man7.org/linux/man-pages/man2/copy_file_range.2.html#VERSIONS - atomic.StoreInt32(©FileRangeSupported, 0) - return 0, false, nil + kernelVersion53 = true } + }) + + if !kernelVersion53 { + return 0, false, nil } + for remain > 0 { max := remain if max > maxCopyFileRangeRound { @@ -82,10 +85,6 @@ func CopyFileRange(dst, src *FD, remain int64) (written int64, handled bool, err // any data, so we can tell the caller that we // couldn't handle the transfer and let them fall // back to more generic code. - // - // Seeing ENOSYS also means that we will not try to - // use copy_file_range(2) again. - atomic.StoreInt32(©FileRangeSupported, 0) return 0, false, nil case syscall.EXDEV, syscall.EINVAL, syscall.EIO, syscall.EOPNOTSUPP, syscall.EPERM: // Prior to Linux 5.3, it was not possible to |
