From nobody Fri Dec 01 00:38:38 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 4ShDgz2JV6z5328B; Fri, 1 Dec 2023 00:38:39 +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 4ShDgz0LzYz4Lpr; Fri, 1 Dec 2023 00:38:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701391119; 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=GMqqI3LUxlTJKHuWYaGuOBg/J7Gdn0QSpSRLiFps4BU=; b=qpFL3KP+Lrt0Phi6/W5tCEneag2jbKee6R/ObQHSKza6SCmcQCWoRpxWP4FPhPSNBtmsAB aHJy7w3l3gbee6vld04p9j680WsbB37Ufoa8pVz0DrH6AIPK0jydlsix/A2WBE9Z77bLSU P/kGLrc2/9KY/4rz8LG63DE2D247f0FmjfzWpsz62tGoU/xaprW8JApjQhvLRBJ+oOzKTC O8M42sBo28x14/4wu09SJbKDd8s/+Aw+7KRe52rKS9G3qiR3f83pa3KmaK3p3BjmO93QQt GZ8xvOxvO0jrbkPAXQ6jAqU5TM+fb1N3+CVWuj70kuTmtJ88+fRBxI/VRkV2RA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701391119; 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=GMqqI3LUxlTJKHuWYaGuOBg/J7Gdn0QSpSRLiFps4BU=; b=nZtNuTfUQIQ1XlluGSNGAUNW/2r06yiyozttRVt2dVd7lJpOYSfth9njBb0xYJuQ5WWOs9 f9e1fAmjzZYiEnOK5a7ofKrHgezAI8WFaZ8QT+Ou4Xmr7wIdM5W20SIoTStX20Gav23lSZ dmrDenjS9SnQnO3T87KRlvkMSRYnAjv/jq3lrbE96e6CpOryHkpiUFRi6sTqjUeUFr7+10 rIajPfx+46fXOVHi1cni2UDBuM+cfzUwtQLgSxsWOMmG4tZ5H1Ujw42LEHpod2gW7K3zp1 arrqo/Y68HURJMK+9ZHEIjHEsjYEv4CFubkwjT+flkoUKkQiDPYFMBGBTRwqeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701391119; a=rsa-sha256; cv=none; b=NChiIXaDpZX6vPKEHeDQSIBhuhMl5N4jsCF+UKcntzRsYIWRcMpSXgB136GjLuiRWIqdWz Shfy9f5yCdukVrgQxZSEQgyH2Aqe2uvC5nLxM9RKdilZxbgd3vuxCBHecH8ItpTRKp/TTA wmReDvakWT6Fmke/VqnYG7Taox1U0zm1kwW+72p4PXnyDlOggcfP6mpIUwU504os33ZToE CNNxcHg2fRcEXnTjr+OkcBX3OwJ9UYTHIztesbEcLZGlbSiKuKwXshNiA2moXnF5Nt0af/ ruI00/jpHXgx/FiyWeyjYCsY61+Hd6suWZYo50ItyArS9OU4ey8vjwpx1w8cuQ== 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 4ShDgy6Z5Sz1BQ2; Fri, 1 Dec 2023 00:38:38 +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 3B10ccgq056749; Fri, 1 Dec 2023 00:38:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B10cctp056746; Fri, 1 Dec 2023 00:38:38 GMT (envelope-from git) Date: Fri, 1 Dec 2023 00:38:38 GMT Message-Id: <202312010038.3B10cctp056746@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 154870526943 - releng/14.0 - 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: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 1548705269435e980c5984ba87a554d4b329d176 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=1548705269435e980c5984ba87a554d4b329d176 commit 1548705269435e980c5984ba87a554d4b329d176 Author: Rob N AuthorDate: 2023-11-28 17:53:04 +0000 Commit: Gordon Tetlow CommitDate: 2023-11-30 21:34:08 +0000 zfs: cherry-pick commit from master #15566 688514e47 dmu_buf_will_clone: fix race in transition back to NOFILL Obtained from: OpenZFS Approved by: so Security: FreeBSD-EN-23:16.openzfs (cherry picked from commit 688514e4704bdee4551d25960febd322ac26f297) (cherry picked from commit 99385ec7c2962c2b5e54161aca6ec57546229cb2) --- 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