From nobody Sat Jul 8 19:52:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qz1B94yWRz4mHvq; Sat, 8 Jul 2023 19:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qz1B94BwYz3M2N; Sat, 8 Jul 2023 19:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688845921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xHOYBF9sbAnX7KEY27fq3gOEtPCIZjpF2d9NcbAQ4Yk=; b=pfjcQtKIzSCqUo5dJuUOassuAJUghx1kVAmyRnCWrPM4CeP0OO+6QTmnHYPs1pSc31susw 9d9coVOG4OjVxBMzmVlMmXTjd44IOYOWa5xqwfv9gjAKFmEdpjmzucV5QNxru3B5SSNiUK 8ia+C7fTKSRSL4ClwlFcB1qFE5SUskCB+/BlL6D8x24JujcC3kZu+1bo9TotlG37/JXi+D SrpS/QqP3745QPbO0SfGnbBrttyglA9sUjO35Hss4vi0RUJeBcEEcN7xWiIDmYorAls0gE LhuDcnIdnU16Gk3UoeEIrttBzwQUXP5+gKbIQ9ESd/Gt83d9OpHYSGtFO4FVOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688845921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xHOYBF9sbAnX7KEY27fq3gOEtPCIZjpF2d9NcbAQ4Yk=; b=gwLOG2UIl8NzuyqI7Yw+UJXZKIOBj28cwQVJn/H20Yxt9rNf+m7WwmkrWq8rCJRjWHtpdH ry9g8x26wDZheIRe3g4bljUcojeFRE+Y5Y2UGxcqmWmqioHla1CmgqnscROM3XmkmbNlU2 6paZMuzoYPXQVKYRZamkLAduGnAVTD9pRFjU7OMwl/oaDT9sBcDlROLorUE2PBa5duFCEY u3q6hbcIVFGXLu88tw0ThKk4bsUhse+qNg9shfSzXLRU0ocLQLtI1xBuk3SJtVWJjWpsTG OSYdQQLewXT8EObC1BCu1VyJA1itYs1m62Jq5XYDHE5S7Zh9aghsMMTED91OAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688845921; a=rsa-sha256; cv=none; b=hKuMDqLlprM6rLdbZeaQPnvs4I6voxWr+CjSMI2wPbSj0d+aB27Ywg97uMcutuTmZ3PYln U9SqFxeMyzYF5Nz3f8+vpvaOeoOxZBRtbad2cq2RGMmitGIdpeQEZJkjDv8L4zbGXDaXSt WGqimBQt/gH7jO824aN77l35FW74qNZLaUjfLE23Q3RjP1JLdmAUC1oU2ScNSGslhAwx54 zCgiXFvX08APVpm0MwsmzT3+RyTbCTbabthSXdKvDkbOatRkAAS1H8NQBcqyfzGRZe6Prg XupuBZVwjCllHak5vCWXrRRkrESOo2dh14pmf+f0zJhWfp1xcEvdVBO1It7New== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Qz1B93CclzZ0x; Sat, 8 Jul 2023 19:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 368Jq11O092061; Sat, 8 Jul 2023 19:52:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 368Jq1JY092060; Sat, 8 Jul 2023 19:52:01 GMT (envelope-from git) Date: Sat, 8 Jul 2023 19:52:01 GMT Message-Id: <202307081952.368Jq1JY092060@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 5a50d52f112a - main - xinstall: use copy_file_range(2) with fallback to previous behavior List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5a50d52f112a86ebd0696da6564c7c7befa27f5d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=5a50d52f112a86ebd0696da6564c7c7befa27f5d commit 5a50d52f112a86ebd0696da6564c7c7befa27f5d Author: Martin Matuska AuthorDate: 2023-07-08 19:46:46 +0000 Commit: Martin Matuska CommitDate: 2023-07-08 19:51:21 +0000 xinstall: use copy_file_range(2) with fallback to previous behavior This allows to use special filesystem features like server-side copying on NFS 4.2 or block cloning on OpenZFS 2.2. Note: copy_file_range(2) is not used when a digest calculation is requested as this would require to read the input file twice. Reviewed by: asomers, imp, rmacklem Differential revision: https://reviews.freebsd.org/D40898 --- usr.bin/xinstall/xinstall.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index b0e52453ca29..8dace862ef1e 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -1300,6 +1300,7 @@ copy(int from_fd, const char *from_name, int to_fd, const char *to_name, static size_t bufsize; int nr, nw; int serrno; + ssize_t ret; char *p; int done_copy; DIGEST_CTX ctx; @@ -1310,6 +1311,26 @@ copy(int from_fd, const char *from_name, int to_fd, const char *to_name, if (lseek(to_fd, (off_t)0, SEEK_SET) == (off_t)-1) err(EX_OSERR, "lseek: %s", to_name); + /* Try copy_file_range() if no digest is requested */ + if (digesttype == DIGEST_NONE) { + ret = 1; + while (ret > 0) { + ret = copy_file_range(from_fd, NULL, to_fd, NULL, + SSIZE_MAX, 0); + } + if (ret == 0) { + /* DIGEST_NONE always returns NULL */ + return (NULL); + } + if (errno != EINVAL) { + serrno = errno; + (void)unlink(to_name); + errno = serrno; + err(EX_OSERR, "%s", to_name); + } + /* Fall back */ + } + digest_init(&ctx); done_copy = 0;