From nobody Sat Apr 15 21:36:34 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 4PzRTZ6Jtpz457PB; Sat, 15 Apr 2023 21:36:34 +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 4PzRTZ5kwTz3yBg; Sat, 15 Apr 2023 21:36:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681594594; 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=5H/DK6VGgbgaJO5f/8uNsWIeXfel9r2O354bFfMyYJA=; b=DUKVfYiwi1+khrCUCQlalQ4brEHryJR1cmeppowQRy8Bqc/fvstNJzwBIjzjbxDIZEHuPt gA7c7hAqSZVIViXRyAID6tw6Nr1SiO8Vo8T8/JzhQAiVSG/MZGU/tduydQCz23wSMjFE/8 jWmdo5vJtkxeh242NhB7ikx2uNYGj5FP8RyUl3WvWNfdyhK0BJgo4m9+ZIeRgKuPY4g7PQ 6+hMwVVUi4BX5fudNgo4iSxGZnoSc/iU+FegWrR5HiWT/52psv2+/PapPWtHWlC/rA7ggw Vte+fh1QNAbzbDPsPAKdVwnSgFPTLHL34sU54XkYIsQp8HqV1NPWr4Wl2rrxiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681594594; 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=5H/DK6VGgbgaJO5f/8uNsWIeXfel9r2O354bFfMyYJA=; b=lVclwAJcHcSACDncbka1pOaNoro9XPf/UQqZlMHpVi7kDsQIWSppLZ4zFiwi6tQ7t9PU0b kQ6yit/58PPcGG8biAjlnrUZxRGu+1kDGjw9+b4oP5gmZS1UvG6VnsF0MOpdeO5TOyXwVt lztTVdMRNHhjzENqNzMtA0E7eb4RxsNiYmFFupLdfW4LxhCodHpqpTzpfq3pUFIV26h9tD CwmKSSdb5M53R9pokv1HjH78mo6quXzDN6eYdfes0cybcCMGfsVY35iAbyQ77v7+bHe5Dp 6jDXdmfB6ebSFYgFYC2bmKHqrNdxgnNEpCHtGtIkyBMw6oWDMuNW8JC15hW0sA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681594594; a=rsa-sha256; cv=none; b=SSO/Zja7QyvnuELVIvVOHuR6J1MC2efHJ8d/S3Loiujv+IP7gz6p438wek6PaJNiMGe/uW ulhNoZCaFMz/Up8Ko33En5Z+4MfK/0gmiS1NT2FpZJVJfQrFbZa53casrkEx8DYZszI0SL jiqEAF8YBFrVzQPqHuADax3I12zbgEy9GwGUBRq2tuyQxCl6KqCt5oqxbRP4uXhvuQX7EQ cVQQR9MQaDTiW7Z9cl1QJPDYgu0VtvtKjRuZwaODSCRz/qrwvT4PIqeoHUZVy03akwMphL 0zrPayaSCTfGAGKJGrJmRkVZrisOu0GkHqVTyX3yKGzMbZrjMsJlwgr+w/bFIg== 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 4PzRTZ4psQzMXj; Sat, 15 Apr 2023 21:36:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33FLaYdL004803; Sat, 15 Apr 2023 21:36:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33FLaYvO004802; Sat, 15 Apr 2023 21:36:34 GMT (envelope-from git) Date: Sat, 15 Apr 2023 21:36:34 GMT Message-Id: <202304152136.33FLaYvO004802@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 46ac8f2e7d96 - main - zfs: don't use zfs_freebsd_copy_file_range 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 46ac8f2e7d9601311eb9b3cd2fed138ff4a11a66 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=46ac8f2e7d9601311eb9b3cd2fed138ff4a11a66 commit 46ac8f2e7d9601311eb9b3cd2fed138ff4a11a66 Author: Mateusz Guzik AuthorDate: 2023-04-15 20:23:24 +0000 Commit: Mateusz Guzik CommitDate: 2023-04-15 21:34:54 +0000 zfs: don't use zfs_freebsd_copy_file_range There is one data corruption problem reported and fixed upstream, not cherry-picked here yet. On top of it the following fires under load: VERIFY(zil_replaying(zfsvfs->z_log, tx)); The patch which introduced the entire machinery is a revert candidate, but as the machinery came with a dedicated feature flag, doing so would render affected pools read-only at best. To be figured out. As a temporary bandaid at least stop the active usage. Note this patch does not make the feature disappear from zpool upgrade. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 8a0a1d07c590..7b5fe8a3abe0 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 @@ -6214,6 +6214,7 @@ zfs_deallocate(struct vop_deallocate_args *ap) } #endif +#if 0 #ifndef _SYS_SYSPROTO_H_ struct vop_copy_file_range_args { struct vnode *a_invp; @@ -6309,6 +6310,7 @@ bad_write_fallback: ap->a_incred, ap->a_outcred, ap->a_fsizetd); return (error); } +#endif struct vop_vector zfs_vnodeops; struct vop_vector zfs_fifoops; @@ -6373,7 +6375,6 @@ struct vop_vector zfs_vnodeops = { #if __FreeBSD_version >= 1400043 .vop_add_writecount = vop_stdadd_writecount_nomsync, #endif - .vop_copy_file_range = zfs_freebsd_copy_file_range, }; VFS_VOP_VECTOR_REGISTER(zfs_vnodeops);