From nobody Sat Mar 30 21:01:07 2024 X-Original-To: dev-commits-src-branches@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 4V6V775MDTz5G0rj; Sat, 30 Mar 2024 21:01:07 +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 4V6V774sFKz4pd6; Sat, 30 Mar 2024 21:01:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711832467; 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=Ort38J/UuIBVmN2nJhWFbWujAjjcPUh84Uw2PkTYXpM=; b=ex5R48zWToCtwx2CgC0LYk5RclKtIUmhVdMW+YKp5uMQd+frqDOFGe+BbEZKhvcOSK5oGt BA03UdpBID0F5hyAeLi0dhUZI6m/aboYAQ2JVdZLiGk1YcVauhrbAGn5ck8+bRqkXq4epe EygOKVs1CCzGqu8XOjxpwOOTeEeL9a2JYGat+bXkKWN5yR0w/PDTGhpVfaVzaLeNcwgThZ gACkrau5PZ4VqznSEYPbBX+epEGdPW3KYc8YzwY0k88dRL+CdCZ2IDeLvxuso2K2rjRZjs TFW5Z1RkKj7usBuXItXMmG3uvExWNw+5K/2W1d5pxx2qMJVAIS7ku6SYqGIgBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711832467; a=rsa-sha256; cv=none; b=Hb5IrXJQ59y7Rv/Y9GDaX8ODjbbIAoLqyYc6MZP1UIW1bn4ab6ThsIa4/crNyEoQDdio8Z ymIjyD6PofmoYgKMMPaccFtDaMzSb+/Wxy16Kbjk6q41pqUnemwUyGbV8yr6zWwPC+le3h 0d2fVGQfQkcCUkgZU+jijEJ9MlMt7bRxhXu7LqOq2YeGKGflhgUM8aH92VUpprCbPxCLOe 8eRFZp7vnUgEpbS0Wwr1LdVpdviKpYgn3Ud1oYkDjgTL1wFC+O3y+Jzv/l0UghHyW73Afm kOyTn+QJAScKncu/K1rxc0b8RyXalRxZz3N8qAgKZzlfZHrsYyBEJqmUH/6rag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711832467; 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=Ort38J/UuIBVmN2nJhWFbWujAjjcPUh84Uw2PkTYXpM=; b=IT7baLcPENNEe7qFRaqxP2uzbKP4q8WnsQtoPzu5bSQ3+yc8sY/jxID+9AZXeAoSslv/wO WzrFTncoA4USeCaX04Ji1klxh8ZAddJ13lZniU63uM//mquO1aPrft8rk8ntsO3AKyMItC cSxAHZhttnNbJLdUbVNedvN9C/ppDBmm57QA+sbJs8NqAdDeIpqv/g3UbQAdm0fTcfY+50 5RC6OMtQnID2aV1OqLQ8Dd7QyCmCEOs1LoiVoEsSZ9U90MGY/C9O3XcUFZ/RSkA8iD4cEf NZzOi6m8muqk7zWFEWfI0cDf0D3iugynpq1B59FlIw4/VwkJbpnlzj/OTdGhDQ== 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 4V6V7748n1z18YD; Sat, 30 Mar 2024 21:01:07 +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 42UL17k5007312; Sat, 30 Mar 2024 21:01:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42UL17jd007309; Sat, 30 Mar 2024 21:01:07 GMT (envelope-from git) Date: Sat, 30 Mar 2024 21:01:07 GMT Message-Id: <202403302101.42UL17jd007309@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 322412b83bef - stable/13 - vfs_vnops.c: Use va_bytes >= va_size hint to avoid SEEK_DATA/SEEKHOLE List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 322412b83bef927afb6c807636a37a95d415422e Auto-Submitted: auto-generated The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=322412b83bef927afb6c807636a37a95d415422e commit 322412b83bef927afb6c807636a37a95d415422e Author: Rick Macklem AuthorDate: 2024-03-15 00:35:32 +0000 Commit: Rick Macklem CommitDate: 2024-03-30 20:56:17 +0000 vfs_vnops.c: Use va_bytes >= va_size hint to avoid SEEK_DATA/SEEKHOLE vn_generic_copy_file_range() tries to maintain holes in file ranges being copied, using SEEK_DATA/SEEK_HOLE where possible. Unfortunately SEEK_DATA/SEEK_HOLE operations can take a long time under certain circumstances. Although it is not currently possible to know if a file has unallocated data regions, the case where va_bytes >= va_size is a strong hint that there are no unallocated data regions. This hint does not work well for file systems doing compression, but since it is only a hint, it is still useful. For the case of va_bytes >= va_size, avoid doing SEEK_DATA/SEEK_HOLE. (cherry picked from commit 89f1dcb3eb468e4cbaebd1ccde9a643d85f1282e) --- sys/kern/vfs_vnops.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index e095fb9df13b..6591b543ddea 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -3296,7 +3296,7 @@ vn_generic_copy_file_range(struct vnode *invp, off_t *inoffp, off_t startoff, endoff, xfer, xfer2; u_long blksize; int error, interrupted; - bool cantseek, readzeros, eof, lastblock, holetoeof; + bool cantseek, readzeros, eof, lastblock, holetoeof, sparse; ssize_t aresid, r = 0; size_t copylen, len, savlen; char *dat; @@ -3315,10 +3315,25 @@ vn_generic_copy_file_range(struct vnode *invp, off_t *inoffp, if (VOP_PATHCONF(invp, _PC_MIN_HOLE_SIZE, &holein) != 0) holein = 0; error = VOP_GETATTR(invp, &inva, incred); + if (error == 0 && inva.va_size > OFF_MAX) + error = EFBIG; VOP_UNLOCK(invp); if (error != 0) goto out; + /* + * Use va_bytes >= va_size as a hint that the file does not have + * sufficient holes to justify the overhead of doing FIOSEEKHOLE. + * This hint does not work well for file systems doing compression + * and may fail when allocations for extended attributes increases + * the value of va_bytes to >= va_size. + */ + sparse = true; + if (holein != 0 && inva.va_bytes >= inva.va_size) { + holein = 0; + sparse = false; + } + mp = NULL; error = vn_start_write(outvp, &mp, V_WAIT); if (error == 0) @@ -3372,7 +3387,7 @@ vn_generic_copy_file_range(struct vnode *invp, off_t *inoffp, if (error != 0) goto out; - if (holein == 0 && holeout > 0) { + if (sparse && holein == 0 && holeout > 0) { /* * For this special case, the input data will be scanned * for blocks of all 0 bytes. For these blocks, the @@ -3506,6 +3521,8 @@ vn_generic_copy_file_range(struct vnode *invp, off_t *inoffp, cantseek = false; } else { cantseek = true; + if (!sparse) + cantseek = false; startoff = *inoffp; copylen = len; error = 0;