From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 240423EF64E; Thu, 19 Mar 2026 17:03:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773939810; cv=none; b=mLgnkomynIxD8y0aqUK6FjxFYob2EBxFOudbKNki31dirhLlNPktGet0H01/h2Ya2oWtgULE9AIYXujXvE0ISNI55dH75pNOyA1LYz2vYUBTgYcjcrJJlhmiM5V+Lw6D5upE7esFtpo1ypXmys90ouAEWjgdPropsJ9yOCGJHnM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773939810; c=relaxed/simple; bh=I/8+DzAvLh2pfUeBWtzNeQb78331oAV1YMqkgQUmods=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=L6lQaff/cPJFSKiuJlVBDw0Rgb0b9ibzwKee+8Zou3auJJstFVBz/OoS9ljYSGAfsIXtSNITMcbXQu37n8S+wIYDdOLpsgsvJr9wnLI3yf8AIrfCOpNuOlp7nHc5sBoPeLbsgTCIl/j5z6KW7VpqTggVD8QFmCG+dgWT/fU5wns= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=d7RppmZ6; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="d7RppmZ6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CEC69C2BCB2; Thu, 19 Mar 2026 17:03:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773939810; bh=I/8+DzAvLh2pfUeBWtzNeQb78331oAV1YMqkgQUmods=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d7RppmZ6Wpew7VasSGeBhcGpfcDE804EKYVPhFqsHKe5Tp2TUav+7gnPsuda/9GX2 xhEznC8FyPQE5bjwyXGqX+2tEaCBgsOMPijYd5CSoMml9KZe+6LFOLDcevPNDTHf4T nFnRSN8PaBrFejIHndX8peXt7Ox1Qb6YCBmM/VVJ+idkc7l+c8ltNAerRzTfH99eRM M8ZhhJ2k2XuiELeoHLG2YcB4xadXUJHCrD3faVw/nL1ab+z5nCPIhKtKc+AuJ4sQw5 OASel6pWlll7WzEUtkonkZmmFWefToUp05uATq13ljl7jTj6mVVtltGUempuXtXyhm +aLNb2tZeAOdw== From: Andrey Albershteyn To: linux-xfs@vger.kernel.org, fsverity@lists.linux.dev, linux-fsdevel@vger.kernel.org, ebiggers@kernel.org Cc: Andrey Albershteyn , hch@lst.de, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-btrfs@vger.kernel.org, djwong@kernel.org Subject: [PATCH v5 19/25] xfs: remove unwritten extents after preallocations in fsverity metadata Date: Thu, 19 Mar 2026 18:02:06 +0100 Message-ID: <20260319170231.1455553-20-aalbersh@kernel.org> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20260319170231.1455553-1-aalbersh@kernel.org> References: <20260319170231.1455553-1-aalbersh@kernel.org> Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit XFS preallocates spaces during writes. In normal I/O this space, if unused, is removed by truncate. For files with fsverity XFS does not use truncate as fsverity metadata is stored past EOF. After we're done with writing fsverity metadata iterate over extents in that region and remove any unwritten ones. These would be left overs in the holes in the merkle tree and past fsverity descriptor. Signed-off-by: Andrey Albershteyn --- fs/xfs/xfs_fsverity.c | 67 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/fs/xfs/xfs_fsverity.c b/fs/xfs/xfs_fsverity.c index 5a6a48fcf843..b193009a1bdb 100644 --- a/fs/xfs/xfs_fsverity.c +++ b/fs/xfs/xfs_fsverity.c @@ -21,6 +21,8 @@ #include "xfs_iomap.h" #include "xfs_error.h" #include "xfs_health.h" +#include "xfs_bmap.h" +#include "xfs_bmap_util.h" #include #include #include @@ -173,6 +175,63 @@ xfs_fsverity_delete_metadata( return error; } +static int +xfs_fsverity_cancel_unwritten( + struct xfs_inode *ip, + xfs_fileoff_t start, + xfs_fileoff_t end) +{ + struct xfs_mount *mp = ip->i_mount; + struct xfs_trans *tp; + xfs_fileoff_t offset_fsb = XFS_B_TO_FSB(mp, start); + xfs_fileoff_t end_fsb = XFS_B_TO_FSB(mp, end); + struct xfs_bmbt_irec imap; + int nimaps; + int error = 0; + int done; + + + while (offset_fsb < end_fsb) { + nimaps = 1; + + error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write, 0, 0, + 0, &tp); + if (error) + return error; + + xfs_ilock(ip, XFS_ILOCK_EXCL); + error = xfs_bmapi_read(ip, offset_fsb, end_fsb - offset_fsb, + &imap, &nimaps, 0); + if (error) + goto out_cancel; + + if (nimaps == 0) + goto out_cancel; + + if (imap.br_state == XFS_EXT_UNWRITTEN) { + xfs_trans_ijoin(tp, ip, 0); + + error = xfs_bunmapi(tp, ip, imap.br_startoff, + imap.br_blockcount, 0, 1, &done); + if (error) + goto out_cancel; + + error = xfs_trans_commit(tp); + } else { + xfs_trans_cancel(tp); + } + xfs_iunlock(ip, XFS_ILOCK_EXCL); + + offset_fsb = imap.br_startoff + imap.br_blockcount; + } + + return error; +out_cancel: + xfs_trans_cancel(tp); + xfs_iunlock(ip, XFS_ILOCK_EXCL); + return error; +} + /* * Prepare to enable fsverity by clearing old metadata. @@ -248,6 +307,14 @@ xfs_fsverity_end_enable( if (error) goto out; + /* + * Remove unwritten extents left by COW preallocations and write + * preallocation in the merkle tree holes and past descriptor + */ + error = xfs_fsverity_cancel_unwritten(ip, range_start, LLONG_MAX); + if (error) + goto out; + /* * Proactively drop any delayed allocations in COW fork, the fsverity * files are read-only -- 2.51.2