From nobody Tue Nov 28 21:06:28 2023 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 4Sfw446jqNz52YYx; Tue, 28 Nov 2023 21:06:28 +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 4Sfw445jRwz3Dkw; Tue, 28 Nov 2023 21:06:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701205588; 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=RbJj6/eMiV7hJoWjcXWb/MFW08vkNWkfSYbFWXk1Wj0=; b=PplqUVXD2HRd/nsFiZZXjtWMkjiWrIf9TWebfHLFVOTSWs52OQ4WKZDfyajITjg3RWNT6P CxDcsTKi/HyIOXBGrNfy8ZGFWbkcCA4GwV02J3GPxuJHaZQ+YSyiIN/mt44iNVrnHWBBgL hCt7VpkyL9xQmeonwZkYABjTKdOhYUUfjU7RyObM40q9XuvMNkV8H6VaoyUFo1ucX789S1 uNEut9ORb43xec8gEENexK/ToS16so1muFbm/9yV0r0DfnawFQNp+w0/ccvzGN7sOuEC36 7YX68iZkG01uVqqPkC+IYhl75W+1ObYRTUDQBEDmcCga2Rh1uRfAs8OSmmUFCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701205588; 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=RbJj6/eMiV7hJoWjcXWb/MFW08vkNWkfSYbFWXk1Wj0=; b=NlzmwEUr4AXDnWb+nJnVQSSKo8ToYb/+fncp3k61ixRSyUK2g7cjWiaqwxI6SPb6tUy/+E QTY8sO93VSSoFBCBGMMAvGBYSCGPWdCgLf5ztHGjysqoupEGDE2+TaLaPkRf/cSk8hgIKD TJMvwHIau/VhJqxKzVKG7mbHIa9w47KshSdOISTtEnTMlO4yYjOBRzjkLirRpKtwHN4HiQ AYp+Q/WXSoEtndbYseJzhT6fdma65K/oJ+4izeXuQiNiC5EaED+1mWkmvE0xXsjH5fgmon fqwXOKSZabaqt1Leq3zQPRbTD1cFXOByNgE9Eq6bifpyJcpn8zymat/2mBAi0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701205588; a=rsa-sha256; cv=none; b=fheJTPhYIdOMBCQNmZcRzr/KulJqVloTcK2uiGyXWtoN7Vp2VPHZbjnUT/UW+aNt0oJZTP ByF6F5RXWAAf5gzyvyVnEknRtBt+JDI1VeSG+MfkibpSoOF/RwPzbhfSBHLrC2M0DZK6KX oXbR8/UajDqggYPzn922UVDENMQiN1X0quWTpnVSBnOkKT/+8jFCgaH0xmEXB4Ao1PbFrA zkT8djqnecsuWEHnGsAJITZ+CjilumNi8yW1SZjtL5oMFKnDliW07b3mrG+BIDHoaaSSLD Mt7C7MkluQROJ0VlRXRYaa3fqdeOwOgh7ifcZKo+1ljZLXkxjg+ONV1jJ2gRag== 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 4Sfw442N1ZzdSn; Tue, 28 Nov 2023 21:06:28 +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 3ASL6Srw082211; Tue, 28 Nov 2023 21:06:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASL6Shl082208; Tue, 28 Nov 2023 21:06:28 GMT (envelope-from git) Date: Tue, 28 Nov 2023 21:06:28 GMT Message-Id: <202311282106.3ASL6Shl082208@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 99385ec7c296 - stable/14 - zfs: cherry-pick commit from master 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: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 99385ec7c2962c2b5e54161aca6ec57546229cb2 Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=99385ec7c2962c2b5e54161aca6ec57546229cb2 commit 99385ec7c2962c2b5e54161aca6ec57546229cb2 Author: Rob N AuthorDate: 2023-11-28 17:53:04 +0000 Commit: Martin Matuska CommitDate: 2023-11-28 21:00:48 +0000 zfs: cherry-pick commit from master #15566 688514e47 dmu_buf_will_clone: fix race in transition back to NOFILL Obtained from: OpenZFS (cherry picked from commit 688514e4704bdee4551d25960febd322ac26f297) --- sys/contrib/openzfs/module/zfs/dbuf.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/module/zfs/dbuf.c b/sys/contrib/openzfs/module/zfs/dbuf.c index f2831a0e8abf..5a7fe42b602a 100644 --- a/sys/contrib/openzfs/module/zfs/dbuf.c +++ b/sys/contrib/openzfs/module/zfs/dbuf.c @@ -2700,15 +2700,23 @@ dmu_buf_will_clone(dmu_buf_t *db_fake, dmu_tx_t *tx) * writes and clones into this block. */ mutex_enter(&db->db_mtx); + DBUF_VERIFY(db); VERIFY(!dbuf_undirty(db, tx)); ASSERT3P(dbuf_find_dirty_eq(db, tx->tx_txg), ==, NULL); if (db->db_buf != NULL) { arc_buf_destroy(db->db_buf, db); db->db_buf = NULL; + dbuf_clear_data(db); } + + db->db_state = DB_NOFILL; + DTRACE_SET_STATE(db, "allocating NOFILL buffer for clone"); + + DBUF_VERIFY(db); mutex_exit(&db->db_mtx); - dmu_buf_will_not_fill(db_fake, tx); + dbuf_noread(db); + (void) dbuf_dirty(db, tx); } void