From nobody Tue Apr 4 14:17:17 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 4PrVFs13Bpz43dPd; Tue, 4 Apr 2023 14:17:21 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PrVFr6mDVz3Jt7; Tue, 4 Apr 2023 14:17:20 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTP id jgz2pvdR9jvm1jhTMpiZjH; Tue, 04 Apr 2023 14:17:20 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id jhTKpMBFsHFsOjhTLpACIG; Tue, 04 Apr 2023 14:17:19 +0000 X-Authority-Analysis: v=2.4 cv=XZqaca15 c=1 sm=1 tr=0 ts=642c316f a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=kj9zAlcOel0A:10 a=dKHAf1wccvYA:10 a=6I5d2MoRAAAA:8 a=pGLkceISAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=M2fJS6w1KMZYCjrCEW0A:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id E9B92A30; Tue, 4 Apr 2023 07:17:17 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id B976D31C; Tue, 4 Apr 2023 07:17:17 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Martin Matuska cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 8ee579abe09e - main - zfs: fall back if block_cloning feature is disabled In-reply-to: <202304041145.334Bjx6l035872@gitrepo.freebsd.org> References: <202304041145.334Bjx6l035872@gitrepo.freebsd.org> Comments: In-reply-to Martin Matuska message dated "Tue, 04 Apr 2023 11:45:59 +0000." 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=us-ascii Date: Tue, 04 Apr 2023 07:17:17 -0700 Message-Id: <20230404141717.B976D31C@slippy.cwsent.com> X-CMAE-Envelope: MS4xfC+1P2SM4a0SHc+KHadpfONrVjf46dY/gnxF9Eg3mtVw1KTeZ5vQ4AAPKQ4/f+FiZrlxG4t0MDHmQbrcc+n4PVWWCTEU7sGYSeldIUfwie963qqCuXz4 ABYhcqSklQIBifGls4oh5CDalYIfXFlOEtTylUpuYNPUS4bZ2LbDdatKQyRyVPW2kmUsWk4E1ROiWyq9FE5MGuMrYcEaLnGohVa+HGwggE3dUh1HzXO4XUZv gCtQmxDJ44AGdF8K/zqjErZgRwQCmmiUy7aR0aX6vnogcxfJ6I4uqjOc52e6bphdQhhJLYt8jTT59S89x2UjTGRmE9uZVf/yRoccnku7XSY= X-Rspamd-Queue-Id: 4PrVFr6mDVz3Jt7 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N In message <202304041145.334Bjx6l035872@gitrepo.freebsd.org>, Martin Matuska wr ites: > The branch main has been updated by mm: > > URL: https://cgit.FreeBSD.org/src/commit/?id=8ee579abe09ec1fe15c588fc9a08370b > 83b81cd6 > > commit 8ee579abe09ec1fe15c588fc9a08370b83b81cd6 > Author: Martin Matuska > AuthorDate: 2023-04-04 11:40:41 +0000 > Commit: Martin Matuska > CommitDate: 2023-04-04 11:43:34 +0000 > > zfs: fall back if block_cloning feature is disabled > > If block_cloning is disabled, or other errors from zfs_clone_range() > return an EXDEV we should fall back to vn_generic_copy_file_range(). > > This fixes issues when copying files on the same dataset with > block_cloning disabled. > > Upstreamed as pull request to OpenZFS. > > Reviewed by: Mateusz Guzik > OpenZFS pull request: 14713 > --- > .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 17 ++++++++++----- > -- > 1 file changed, 10 insertions(+), 7 deletions(-) > > diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c b/sys/c > ontrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c > index 97429b360a36..2cd1d27e37bc 100644 > --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c > +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c > @@ -6243,13 +6243,6 @@ zfs_freebsd_copy_file_range(struct vop_copy_file_range > _args *ap) > int error; > uint64_t len = *ap->a_lenp; > > - /* > - * TODO: If offset/length is not aligned to recordsize, use > - * vn_generic_copy_file_range() on this fragment. > - * It would be better to do this after we lock the vnodes, but then we > - * need something else than vn_generic_copy_file_range(). > - */ > - > /* Lock both vnodes, avoiding risk of deadlock. */ > do { > mp = NULL; > @@ -6300,6 +6293,16 @@ unlock: > if (mp != NULL) > vn_finished_write(mp); > > + /* > + * Fall back if block_cloning feature is disabled > + * or other EXDEV failures from zfs_vnops.c > + */ > + if (error == EXDEV) { > + error = vn_generic_copy_file_range(ap->a_invp, ap->a_inoffp, > + ap->a_outvp, ap->a_outoffp, ap->a_lenp, ap->a_flags > , > + ap->a_incred, ap->a_outcred, ap->a_fsizetd); > + } > + > return (error); > } > > This is too late to fall back. On Rick's suggestion the following makes the determination at zfs_freebsd_copy_file_range() entry much earlier. diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c index d41821ff67f1..e18dcca58192 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c @@ -6243,6 +6243,18 @@ zfs_freebsd_copy_file_range(struct vop_copy_file_range_args *ap) int error; uint64_t len = *ap->a_lenp; + znode_t *outzp = VTOZ(ap->a_outvp); + zfsvfs_t *outzfsvfs = ZTOZSB(outzp); + objset_t *outos = outzfsvfs->z_os; + + if (!spa_feature_is_enabled(dmu_objset_spa(outos), + SPA_FEATURE_BLOCK_CLONING)) { + error = vn_generic_copy_file_range(ap->a_invp, ap->a_inoffp, + ap->a_outvp, ap->a_outoffp, ap->a_lenp, ap->a_flags, + ap->a_incred, ap->a_outcred, ap->a_fsizetd); + return (error); + } + /* * TODO: If offset/length is not aligned to recordsize, use * vn_generic_copy_file_range() on this fragment. Can you revert your commit and commit this, please. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0