From patchwork Wed Mar 15 19:29:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jannik_Gl=C3=BCckert?= X-Patchwork-Id: 66423 X-Patchwork-Delegate: jwakely.gcc@gmail.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5F8B63857B9B for ; Wed, 15 Mar 2023 19:30:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5F8B63857B9B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678908642; bh=PtcJI8INxXPuTZ9dFiyTg1G9/RhVwmQ2bJHYBYzo2QQ=; h=Date:Subject:To:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=MT6lmt+C8NNNUm8/2rDBrBN5T05HqY9BLzTEosagRE46UYj4nMgcLVJVQOlirCHbx py5f0iStRlBnNZ4iJWuv15lvtTi2mFw5ycQyWvu9FuuXcuH1eJlfykmX3cHFjCOIEh YlIcT8DJ6+yVs9zNZRUJDfsZySax8SiYuhiByoYI= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-qk1-x72e.google.com (mail-qk1-x72e.google.com [IPv6:2607:f8b0:4864:20::72e]) by sourceware.org (Postfix) with ESMTPS id 7A2463858C83; Wed, 15 Mar 2023 19:30:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7A2463858C83 Received: by mail-qk1-x72e.google.com with SMTP id p20so3593176qkh.0; Wed, 15 Mar 2023 12:30:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678908610; h=cc:to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=PtcJI8INxXPuTZ9dFiyTg1G9/RhVwmQ2bJHYBYzo2QQ=; b=LFz9zvBwzxeJ9PvHTUlC8qvrddgWxY0+rx//UFOvTb5B0b9+ZE6eLUzbWZgh13d2Ak juSoeZJqJRRE8tmxFm8y0MRJEUVnFKuxDJJM3QVsqULp2b9UJd/751/WRt3Vr8MRJwf/ SheNAB6k6w7obt0Jk0b7W3BWe4TW9BxVwkQBD680UeDDoYdloHELoQOZLnHoJwBqfPb2 qq34s3gR6TV7YvLCMuEkL/6qeCv90eQ55Qq31u+Apd/uL4lCQALX0hDPjipkiQ7w+t4S O4B3/BYXcNfu1Us1h0JJnDJ5HSrpszBwWpIQTgpY616reBMs27IWW+GMLGgJwwXtL/G3 1BYQ== X-Gm-Message-State: AO0yUKWy+L7yVnNHmcC3AjPVM/f0xgosCJrbRWML3AuUO4yyojvpFvjb wu3+RPwAofvJBUdvBQWv7zXaXdsehky1z3+c+NREWWH2mk8= X-Google-Smtp-Source: AK7set8xfhtoAVynPvnrplfrU9EBZGDh4OtdKYLfh5GnmBK/Vm3prZUzg0HD9oINssAUlJoyIMQj2UBpdjE1dH+LZME= X-Received: by 2002:a05:620a:211b:b0:745:72b3:304f with SMTP id l27-20020a05620a211b00b0074572b3304fmr3546943qkl.5.1678908610386; Wed, 15 Mar 2023 12:30:10 -0700 (PDT) MIME-Version: 1.0 Date: Wed, 15 Mar 2023 20:29:58 +0100 Message-ID: Subject: [PATCH v2 1/2] libstdc++: use copy_file_range, improve sendfile in filesystem::copy_file To: libstdc++@gcc.gnu.org Cc: gcc-patches@gcc.gnu.org X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: =?utf-8?q?Jannik_Gl=C3=BCckert_via_Gcc-patches?= From: =?utf-8?q?Jannik_Gl=C3=BCckert?= Reply-To: =?utf-8?q?Jannik_Gl=C3=BCckert?= Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" This iteration improves error handling for copy_file_range, particularly around undocumented error codes in earlier kernel versions. Additionally this fixes the userspace copy fallback to handle zero-length files such as in https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108178. Lastly, the case "src gets resized during the copy loop" is now considered and will return true once the loop hits EOF (this is the only situation, aside from a zero-length src, where sendfile and copy_file_range return 0). Best Jannik From b55eb8dccaa44f07d8acbe6294326a46c920b04f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jannik=20Gl=C3=BCckert?= Date: Mon, 6 Mar 2023 20:52:08 +0100 Subject: [PATCH 1/2] libstdc++: also use sendfile for big files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit we were previously only using sendfile for files smaller than 2GB, as sendfile needs to be called repeatedly for files bigger than that. some quick numbers, copying a 16GB file, average of 10 repetitions: old: real: 13.4s user: 0.14s sys : 7.43s new: real: 8.90s user: 0.00s sys : 3.68s Additionally, this fixes https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108178 libstdc++-v3/ChangeLog: * acinclude.m4 (_GLIBCXX_HAVE_LSEEK): define * config.h.in: Regenerate. * configure: Regenerate. * src/filesystem/ops-common.h: enable sendfile for files >2GB in std::filesystem::copy_file, skip zero-length files Signed-off-by: Jannik Glückert --- libstdc++-v3/acinclude.m4 | 51 +++++---- libstdc++-v3/config.h.in | 3 + libstdc++-v3/configure | 127 ++++++++++++++++------- libstdc++-v3/src/filesystem/ops-common.h | 86 ++++++++------- 4 files changed, 175 insertions(+), 92 deletions(-) diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 5136c0571e8..85a09a5a869 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -4583,6 +4583,7 @@ dnl _GLIBCXX_USE_FCHMOD dnl _GLIBCXX_USE_FCHMODAT dnl _GLIBCXX_USE_SENDFILE dnl HAVE_LINK +dnl HAVE_LSEEK dnl HAVE_READLINK dnl HAVE_SYMLINK dnl @@ -4718,25 +4719,6 @@ dnl if test $glibcxx_cv_fchmodat = yes; then AC_DEFINE(_GLIBCXX_USE_FCHMODAT, 1, [Define if fchmodat is available in .]) fi -dnl - AC_CACHE_CHECK([for sendfile that can copy files], - glibcxx_cv_sendfile, [dnl - case "${target_os}" in - gnu* | linux* | solaris* | uclinux*) - GCC_TRY_COMPILE_OR_LINK( - [#include ], - [sendfile(1, 2, (off_t*)0, sizeof 1);], - [glibcxx_cv_sendfile=yes], - [glibcxx_cv_sendfile=no]) - ;; - *) - glibcxx_cv_sendfile=no - ;; - esac - ]) - if test $glibcxx_cv_sendfile = yes; then - AC_DEFINE(_GLIBCXX_USE_SENDFILE, 1, [Define if sendfile is available in .]) - fi dnl AC_CACHE_CHECK([for link], glibcxx_cv_link, [dnl @@ -4749,6 +4731,18 @@ dnl if test $glibcxx_cv_link = yes; then AC_DEFINE(HAVE_LINK, 1, [Define if link is available in .]) fi +dnl + AC_CACHE_CHECK([for lseek], + glibcxx_cv_lseek, [dnl + GCC_TRY_COMPILE_OR_LINK( + [#include ], + [lseek(1, 0, SEEK_SET);], + [glibcxx_cv_lseek=yes], + [glibcxx_cv_lseek=no]) + ]) + if test $glibcxx_cv_lseek = yes; then + AC_DEFINE(HAVE_LSEEK, 1, [Define if lseek is available in .]) + fi dnl AC_CACHE_CHECK([for readlink], glibcxx_cv_readlink, [dnl @@ -4785,6 +4779,25 @@ dnl if test $glibcxx_cv_truncate = yes; then AC_DEFINE(HAVE_TRUNCATE, 1, [Define if truncate is available in .]) fi +dnl + AC_CACHE_CHECK([for sendfile that can copy files], + glibcxx_cv_sendfile, [dnl + case "${target_os}" in + gnu* | linux* | solaris* | uclinux*) + GCC_TRY_COMPILE_OR_LINK( + [#include ], + [sendfile(1, 2, (off_t*)0, sizeof 1);], + [glibcxx_cv_sendfile=yes], + [glibcxx_cv_sendfile=no]) + ;; + *) + glibcxx_cv_sendfile=no + ;; + esac + ]) + if test $glibcxx_cv_sendfile = yes && test $glibcxx_cv_lseek = yes; then + AC_DEFINE(_GLIBCXX_USE_SENDFILE, 1, [Define if sendfile is available in .]) + fi dnl AC_CACHE_CHECK([for fdopendir], glibcxx_cv_fdopendir, [dnl diff --git a/libstdc++-v3/src/filesystem/ops-common.h b/libstdc++-v3/src/filesystem/ops-common.h index abbfca43e5c..9e1b1d41dc5 100644 --- a/libstdc++-v3/src/filesystem/ops-common.h +++ b/libstdc++-v3/src/filesystem/ops-common.h @@ -51,6 +51,7 @@ # include # ifdef _GLIBCXX_USE_SENDFILE # include // sendfile +# include // lseek # endif #endif @@ -358,6 +359,32 @@ _GLIBCXX_BEGIN_NAMESPACE_FILESYSTEM } #ifdef NEED_DO_COPY_FILE +#if defined _GLIBCXX_USE_SENDFILE && ! defined _GLIBCXX_FILESYSTEM_IS_WINDOWS + bool + copy_file_sendfile(int fd_in, int fd_out, size_t length) noexcept + { + // a zero-length file is either empty, or not copyable by this syscall + // return early to avoid the syscall cost + if (length == 0) + { + errno = EINVAL; + return false; + } + size_t bytes_left = length; + off_t offset = 0; + ssize_t bytes_copied; + do { + bytes_copied = ::sendfile(fd_out, fd_in, &offset, bytes_left); + bytes_left -= bytes_copied; + } while (bytes_left > 0 && bytes_copied > 0); + if (bytes_copied < 0) + { + ::lseek(fd_out, 0, SEEK_SET); + return false; + } + return true; + } +#endif bool do_copy_file(const char_type* from, const char_type* to, std::filesystem::copy_options_existing_file options, @@ -498,28 +525,30 @@ _GLIBCXX_BEGIN_NAMESPACE_FILESYSTEM return false; } - size_t count = from_st->st_size; + bool has_copied = false; + #if defined _GLIBCXX_USE_SENDFILE && ! defined _GLIBCXX_FILESYSTEM_IS_WINDOWS - off_t offset = 0; - ssize_t n = ::sendfile(out.fd, in.fd, &offset, count); - if (n < 0 && errno != ENOSYS && errno != EINVAL) + if (!has_copied) + has_copied = copy_file_sendfile(in.fd, out.fd, from_st->st_size); + if (!has_copied) { - ec.assign(errno, std::generic_category()); - return false; + if (errno != ENOSYS && errno != EINVAL) + { + ec.assign(errno, std::generic_category()); + return false; + } } - if ((size_t)n == count) +#endif + + if (has_copied) { - if (!out.close() || !in.close()) - { - ec.assign(errno, std::generic_category()); - return false; - } - ec.clear(); - return true; + if (!out.close() || !in.close()) + { + ec.assign(errno, std::generic_category()); + return false; + } + return true; } - else if (n > 0) - count -= n; -#endif // _GLIBCXX_USE_SENDFILE using std::ios; __gnu_cxx::stdio_filebuf sbin(in.fd, ios::in|ios::binary); @@ -530,29 +559,12 @@ _GLIBCXX_BEGIN_NAMESPACE_FILESYSTEM if (sbout.is_open()) out.fd = -1; -#ifdef _GLIBCXX_USE_SENDFILE - if (n != 0) + if (!(std::ostream(&sbout) << &sbin)) { - if (n < 0) - n = 0; - - const auto p1 = sbin.pubseekoff(n, ios::beg, ios::in); - const auto p2 = sbout.pubseekoff(n, ios::beg, ios::out); - - const std::streampos errpos(std::streamoff(-1)); - if (p1 == errpos || p2 == errpos) - { - ec = std::make_error_code(std::errc::io_error); - return false; - } + ec = std::make_error_code(std::errc::io_error); + return false; } -#endif - if (count && !(std::ostream(&sbout) << &sbin)) - { - ec = std::make_error_code(std::errc::io_error); - return false; - } if (!sbout.close() || !sbin.close()) { ec.assign(errno, std::generic_category()); -- 2.39.2 From patchwork Wed Mar 15 19:32:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jannik_Gl=C3=BCckert?= X-Patchwork-Id: 66424 X-Patchwork-Delegate: jwakely.gcc@gmail.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F3BBE385843D for ; Wed, 15 Mar 2023 19:32:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F3BBE385843D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678908762; bh=ns6ttBXOONOwqSGEd4rpD6R6+3J7CZOVzBIjkjHc8gQ=; h=Date:Subject:To:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=WUO/FsM1jLeYnhDlyVqyFnGpR5W4eUuVD6O/X/5OKZHlfvd17QMgydvQvieH9l6fl yNS5vWGpbc6pKrrXRJRm618RkX1POP50Ep9iUda559+MIFC+dxcnQdDpjE8hjRcTCc xbG8hOFBBt9S5xsCJQ+WZfNU6+tkt5IW9pYe6CVw= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) by sourceware.org (Postfix) with ESMTPS id 2EA983858C83; Wed, 15 Mar 2023 19:32:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2EA983858C83 Received: by mail-qk1-x735.google.com with SMTP id bm1so2300770qkb.13; Wed, 15 Mar 2023 12:32:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678908732; h=cc:to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=ns6ttBXOONOwqSGEd4rpD6R6+3J7CZOVzBIjkjHc8gQ=; b=s7kUHm9LEwBgELJuWCV8YbzuGGqLDnqNDQXusyYb9f3JVKkYb2pHYEvKHFa5NwbQ3k F1EepBJW7lElfsIqmjJNk2e8mKXzmCBoYsOEGkAJnIGUbYWkv3xGgcu7f2iX6r7CwqT0 5j/NiL6fZ/8rTdNsNyhRhq1tMmgQoohqL/5QaxJ60YRorHNbnWMC7nOuPtEoOMxF+RvS /lOYzpi6v+YyCV6XRqeqC9FLAsb6BGpAhvEBFexs6oJ+L6KHSa//XavOBofeqG5f+bVR tdxv8aYlTOibVW70APiIrgWKK17b+XdX3ydRH9SYvAMXil9rfrf5xv8EweoVTF4NHyCQ OOuQ== X-Gm-Message-State: AO0yUKW/4gu7Pl2FpOgQWSI26LJLcogYKu5qRLfl3Lpan6D0IY9azFTV 6yQx3r3HKc2mxccosy3/Ko10bP+gup0cY2OKur7NKpxI X-Google-Smtp-Source: AK7set9Oza7849joOnVIOk8QXMJPLd1FTNBwE5MzyXQgRJN7xJcr2OJjCRK1Wf9W07cRbxnQi9ZyTos2KNJlM0mrvog= X-Received: by 2002:a05:620a:146b:b0:742:839d:72e8 with SMTP id j11-20020a05620a146b00b00742839d72e8mr5640899qkl.5.1678908732207; Wed, 15 Mar 2023 12:32:12 -0700 (PDT) MIME-Version: 1.0 Date: Wed, 15 Mar 2023 20:32:01 +0100 Message-ID: Subject: [PATCH v2 2/2] libstdc++: use copy_file_range, improve sendfile in filesystem::copy_file To: libstdc++@gcc.gnu.org Cc: gcc-patches@gcc.gnu.org X-Spam-Status: No, score=-10.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: =?utf-8?q?Jannik_Gl=C3=BCckert_via_Gcc-patches?= From: =?utf-8?q?Jannik_Gl=C3=BCckert?= Reply-To: =?utf-8?q?Jannik_Gl=C3=BCckert?= Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" From c028a0072c7573cfac90289b3606ba19cb8272a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jannik=20Gl=C3=BCckert?= Date: Wed, 8 Mar 2023 19:37:43 +0100 Subject: [PATCH 2/2] libstdc++: use copy_file_range MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit copy_file_range is a recent-ish syscall for copying files. It is similar to sendfile but allows filesystem-specific optimizations. Common are: Reflinks: BTRFS, XFS, ZFS (does not implement the syscall yet) Server-side copy: NFS, SMB, Ceph If copy_file_range is not available for the given files, fall back to sendfile / userspace copy. libstdc++-v3/ChangeLog: * acinclude.m4 (_GLIBCXX_USE_COPY_FILE_RANGE): define * config.h.in: Regenerate. * configure: Regenerate. * src/filesystem/ops-common.h: use copy_file_range in std::filesystem::copy_file Signed-off-by: Jannik Glückert --- libstdc++-v3/acinclude.m4 | 20 ++++++++ libstdc++-v3/config.h.in | 3 ++ libstdc++-v3/configure | 62 ++++++++++++++++++++++++ libstdc++-v3/src/filesystem/ops-common.h | 50 +++++++++++++++++++ 4 files changed, 135 insertions(+) diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 85a09a5a869..4cf02dc6e4e 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -4581,6 +4581,7 @@ dnl _GLIBCXX_USE_UTIMENSAT dnl _GLIBCXX_USE_ST_MTIM dnl _GLIBCXX_USE_FCHMOD dnl _GLIBCXX_USE_FCHMODAT +dnl _GLIBCXX_USE_COPY_FILE_RANGE dnl _GLIBCXX_USE_SENDFILE dnl HAVE_LINK dnl HAVE_LSEEK @@ -4779,6 +4780,25 @@ dnl if test $glibcxx_cv_truncate = yes; then AC_DEFINE(HAVE_TRUNCATE, 1, [Define if truncate is available in .]) fi +dnl + AC_CACHE_CHECK([for copy_file_range that can copy files], + glibcxx_cv_copy_file_range, [dnl + case "${target_os}" in + linux*) + GCC_TRY_COMPILE_OR_LINK( + [#include ], + [copy_file_range(1, nullptr, 2, nullptr, 1, 0);], + [glibcxx_cv_copy_file_range=yes], + [glibcxx_cv_copy_file_range=no]) + ;; + *) + glibcxx_cv_copy_file_range=no + ;; + esac + ]) + if test $glibcxx_cv_copy_file_range = yes; then + AC_DEFINE(_GLIBCXX_USE_COPY_FILE_RANGE, 1, [Define if copy_file_range is available in .]) + fi dnl AC_CACHE_CHECK([for sendfile that can copy files], glibcxx_cv_sendfile, [dnl diff --git a/libstdc++-v3/src/filesystem/ops-common.h b/libstdc++-v3/src/filesystem/ops-common.h index 9e1b1d41dc5..202728baef2 100644 --- a/libstdc++-v3/src/filesystem/ops-common.h +++ b/libstdc++-v3/src/filesystem/ops-common.h @@ -49,6 +49,9 @@ #ifdef NEED_DO_COPY_FILE # include # include +# ifdef _GLIBCXX_USE_COPY_FILE_RANGE +# include // copy_file_range +# endif # ifdef _GLIBCXX_USE_SENDFILE # include // sendfile # include // lseek @@ -359,6 +362,31 @@ _GLIBCXX_BEGIN_NAMESPACE_FILESYSTEM } #ifdef NEED_DO_COPY_FILE +#ifdef _GLIBCXX_USE_COPY_FILE_RANGE + bool + copy_file_copy_file_range(int fd_in, int fd_out, size_t length) noexcept + { + // a zero-length file is either empty, or not copyable by this syscall + // return early to avoid the syscall cost + if (length == 0) + { + errno = EINVAL; + return false; + } + size_t bytes_left = length; + off64_t off_in = 0, off_out = 0; + ssize_t bytes_copied; + do { + bytes_copied = ::copy_file_range(fd_in, &off_in, fd_out, &off_out, bytes_left, 0); + bytes_left -= bytes_copied; + } while (bytes_left > 0 && bytes_copied > 0); + if (bytes_copied < 0) + { + return false; + } + return true; + } +#endif #if defined _GLIBCXX_USE_SENDFILE && ! defined _GLIBCXX_FILESYSTEM_IS_WINDOWS bool copy_file_sendfile(int fd_in, int fd_out, size_t length) noexcept @@ -527,6 +555,28 @@ _GLIBCXX_BEGIN_NAMESPACE_FILESYSTEM bool has_copied = false; +#ifdef _GLIBCXX_USE_COPY_FILE_RANGE + if (!has_copied) + has_copied = copy_file_copy_file_range(in.fd, out.fd, from_st->st_size); + if (!has_copied) + { + // EINVAL: src and dst are the same file (this is not cheaply detectable from userspace) + // EINVAL: copy_file_range is unsupported for this file type by the underlying filesystem + // ENOTSUP: undocumented, can arise with old kernels and NFS + // EOPNOTSUPP: filesystem does not implement copy_file_range + // ETXTBSY: src or dst is an active swapfile (nonsensical, but allowed with normal copying) + // EXDEV: src and dst are on different filesystems that do not support cross-fs copy_file_range + // ENOENT: undocumented, can arise with CIFS + // ENOSYS: unsupported by kernel or blocked by seccomp + if (errno != EINVAL && errno != ENOTSUP && errno != EOPNOTSUPP + && errno != ETXTBSY && errno != EXDEV && errno != ENOENT && errno != ENOSYS) + { + ec.assign(errno, std::generic_category()); + return false; + } + } +#endif + #if defined _GLIBCXX_USE_SENDFILE && ! defined _GLIBCXX_FILESYSTEM_IS_WINDOWS if (!has_copied) has_copied = copy_file_sendfile(in.fd, out.fd, from_st->st_size); -- 2.39.2