From nobody Fri Dec 01 00:38:36 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 4ShDgw670Nz531nT; Fri, 1 Dec 2023 00:38:36 +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 4ShDgw5fcHz4LV1; Fri, 1 Dec 2023 00:38:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701391116; 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=nhKN3jSXZdT1Tz7nvjzPjVNf6oWO1ysyVQ+nStbzf1g=; b=Zv4aSXmGMNFGVyaTW80xh/I6pOCDtqn31YeGN3Z5MV8PINH0v2oOQITfWiu7BG/h2sK5MT 7SWDunxZLMSVpSGfcYNrEETKpnoUGXwl8jcZQBW75vP7CY+NaOjYwKlj8oCu/IuSQvkH5r oqA0gefuNXIPHU9gFmOUEW9Fb05topT/AY0TKpUsxdWiHmbOAIsTNR36BS3IJv2SkRpoSx giGgI44DiixCeKJeMvBLPiqUHBfx6bKhOvVR1WSO6BGPBbqAJvaTFo0bkpk9vxuwjvXMUz VkswHJpgNrs93SKQ3GUp6qHZzjy0RD0h5Eo5KO7NY21c5t9TZgeDJG2MhwNavw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701391116; 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=nhKN3jSXZdT1Tz7nvjzPjVNf6oWO1ysyVQ+nStbzf1g=; b=T7tBQATGcBwYUJKNknCAbiMQCmk1fXa0LgY32WS+pmuAu9u1NRObiCMEYu/KcDdlsDewZ2 ZrfpsUGcIowREmyl6piZvU0boQYIyPccb9aZjDkilFcIchVWzDx1Qym5p1PYfuBfNtU4xh Myn6xZUOyVkdjGLtMCXOb4gEXFN5ad2d9mHqSnYE+2V+GPNHox0KybwF1jppblXgaOkr+r FQmqQe6m8eY0Eryuk4EKvhL31t9dEpkuJPGDbjEyEdQk9nxdMdaDrNWv8UpNf/Nt95Hnwo Hijbf8yaLZH+i+SDSh7L7L45c0Zbsoq/MuGvu3rZZ+CrxIMelinFn+XRO2+HLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701391116; a=rsa-sha256; cv=none; b=X/1it/HgM2P+hBYnWr1pOHd9MQU/lp76UMYms58fjrOpFkMGhZZMO8NikIvkALzCQ69PtW MFKzEdc4zShDk9o4Gbg8SgleSx/m6p85ug7oZ1wNhr65lNal8eGIbvfXrETCUKHylq3RWx wVmJWm4kDyese+3w4yAnptbZqW6GXoH77MdET3cMhPRKj4kzTivvjeI78IPMR4GdMxD1qE bb3cN2lPfJQk5YWnjd03I7edyU59nXwQifDg9UU5dh7KxriCE34j4hg9Tj3PF9ZUOlsZdO b3vFq5oybPoSwsbBxxR3c9gxTVMDVkP4Y6a9pDM7ywCET5ImiFtLm7aqrCiyAQ== 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 4ShDgw4hdNz1BQ1; Fri, 1 Dec 2023 00:38:36 +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 3B10cage056662; Fri, 1 Dec 2023 00:38:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B10caIC056659; Fri, 1 Dec 2023 00:38:36 GMT (envelope-from git) Date: Fri, 1 Dec 2023 00:38:36 GMT Message-Id: <202312010038.3B10caIC056659@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: 8c25d614b8c9 - 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: 8c25d614b8c95cb4dfe46d6903b8bb764a30c788 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=8c25d614b8c95cb4dfe46d6903b8bb764a30c788 commit 8c25d614b8c95cb4dfe46d6903b8bb764a30c788 Author: Rob N AuthorDate: 2023-11-28 17:07:57 +0000 Commit: Gordon Tetlow CommitDate: 2023-11-30 21:30:04 +0000 zfs: cherry-pick commit from master #15571 30d581121 dnode_is_dirty: check dnode and its data for dirtiness Obtained from: OpenZFS Approved by: so Security: FreeBSD-EN-23:16.openzfs (cherry picked from commit 30d581121bb122c90959658e7b28b1672d342897) (cherry picked from commit d92e0d62c9e38058fd46c97beb08764538878592) --- sys/contrib/openzfs/module/zfs/dnode.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/contrib/openzfs/module/zfs/dnode.c b/sys/contrib/openzfs/module/zfs/dnode.c index 7cf03264dce2..ad9988366ada 100644 --- a/sys/contrib/openzfs/module/zfs/dnode.c +++ b/sys/contrib/openzfs/module/zfs/dnode.c @@ -1764,7 +1764,14 @@ dnode_try_claim(objset_t *os, uint64_t object, int slots) } /* - * Checks if the dnode contains any uncommitted dirty records. + * Checks if the dnode itself is dirty, or is carrying any uncommitted records. + * It is important to check both conditions, as some operations (eg appending + * to a file) can dirty both as a single logical unit, but they are not synced + * out atomically, so checking one and not the other can result in an object + * appearing to be clean mid-way through a commit. + * + * Do not change this lightly! If you get it wrong, dmu_offset_next() can + * detect a hole where there is really data, leading to silent corruption. */ boolean_t dnode_is_dirty(dnode_t *dn) @@ -1772,7 +1779,8 @@ dnode_is_dirty(dnode_t *dn) mutex_enter(&dn->dn_mtx); for (int i = 0; i < TXG_SIZE; i++) { - if (multilist_link_active(&dn->dn_dirty_link[i])) { + if (multilist_link_active(&dn->dn_dirty_link[i]) || + !list_is_empty(&dn->dn_dirty_records[i])) { mutex_exit(&dn->dn_mtx); return (B_TRUE); }