From: Zhang Yi <yi.zhang@huaweicloud.com>
To: linux-ext4@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz,
ojaswin@linux.ibm.com, sashal@kernel.org, yi.zhang@huawei.com,
yi.zhang@huaweicloud.com, libaokun1@huawei.com,
yukuai3@huawei.com, yangerkun@huawei.com
Subject: [PATCH v3 03/10] ext4: fix stale data if it bail out of the extents mapping loop
Date: Tue, 1 Jul 2025 21:06:28 +0800 [thread overview]
Message-ID: <20250701130635.4079595-4-yi.zhang@huaweicloud.com> (raw)
In-Reply-To: <20250701130635.4079595-1-yi.zhang@huaweicloud.com>
From: Zhang Yi <yi.zhang@huawei.com>
During the process of writing back folios, if
mpage_map_and_submit_extent() exits the extent mapping loop due to an
ENOSPC or ENOMEM error, it may result in stale data or filesystem
inconsistency in environments where the block size is smaller than the
folio size.
When mapping a discontinuous folio in mpage_map_and_submit_extent(),
some buffers may have already be mapped. If we exit the mapping loop
prematurely, the folio data within the mapped range will not be written
back, and the file's disk size will not be updated. Once the transaction
that includes this range of extents is committed, this can lead to stale
data or filesystem inconsistency.
Fix this by submitting the current processing partially mapped folio.
Suggested-by: Jan Kara <jack@suse.cz>
Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
---
fs/ext4/inode.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 50 insertions(+), 1 deletion(-)
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 38db1c186f76..62f1263d05da 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -2361,6 +2361,47 @@ static int mpage_map_one_extent(handle_t *handle, struct mpage_da_data *mpd)
return 0;
}
+/*
+ * This is used to submit mapped buffers in a single folio that is not fully
+ * mapped for various reasons, such as insufficient space or journal credits.
+ */
+static int mpage_submit_buffers(struct mpage_da_data *mpd)
+{
+ struct inode *inode = mpd->inode;
+ struct folio *folio;
+ loff_t pos;
+ int ret;
+
+ folio = filemap_get_folio(inode->i_mapping,
+ mpd->start_pos >> PAGE_SHIFT);
+ if (IS_ERR(folio))
+ return PTR_ERR(folio);
+ /*
+ * The mapped position should be within the current processing folio
+ * but must not be the folio start position.
+ */
+ pos = mpd->map.m_lblk << inode->i_blkbits;
+ if (WARN_ON_ONCE((folio_pos(folio) == pos) ||
+ !folio_contains(folio, pos >> PAGE_SHIFT)))
+ return -EINVAL;
+
+ ret = mpage_submit_folio(mpd, folio);
+ if (ret)
+ goto out;
+ /*
+ * Update start_pos to prevent this folio from being released in
+ * mpage_release_unused_pages(), it will be reset to the aligned folio
+ * pos when this folio is written again in the next round. Additionally,
+ * do not update wbc->nr_to_write here, as it will be updated once the
+ * entire folio has finished processing.
+ */
+ mpd->start_pos = pos;
+out:
+ folio_unlock(folio);
+ folio_put(folio);
+ return ret;
+}
+
/*
* mpage_map_and_submit_extent - map extent starting at mpd->lblk of length
* mpd->len and submit pages underlying it for IO
@@ -2411,8 +2452,16 @@ static int mpage_map_and_submit_extent(handle_t *handle,
*/
if ((err == -ENOMEM) ||
(err == -ENOSPC && ext4_count_free_clusters(sb))) {
- if (progress)
+ /*
+ * We may have already allocated extents for
+ * some bhs inside the folio, issue the
+ * corresponding data to prevent stale data.
+ */
+ if (progress) {
+ if (mpage_submit_buffers(mpd))
+ goto invalidate_dirty_pages;
goto update_disksize;
+ }
return err;
}
ext4_msg(sb, KERN_CRIT,
--
2.46.1
next prev parent reply other threads:[~2025-07-01 13:21 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-01 13:06 [PATCH v3 00/10] ext4: fix insufficient credits when writing back large folios Zhang Yi
2025-07-01 13:06 ` [PATCH v3 01/10] ext4: process folios writeback in bytes Zhang Yi
2025-07-02 14:00 ` Jan Kara
2025-07-03 2:03 ` Zhang Yi
2025-07-01 13:06 ` [PATCH v3 02/10] ext4: move the calculation of wbc->nr_to_write to mpage_folio_done() Zhang Yi
2025-07-01 13:06 ` Zhang Yi [this message]
2025-07-02 14:07 ` [PATCH v3 03/10] ext4: fix stale data if it bail out of the extents mapping loop Jan Kara
2025-07-03 2:05 ` Zhang Yi
2025-07-01 13:06 ` [PATCH v3 04/10] ext4: refactor the block allocation process of ext4_page_mkwrite() Zhang Yi
2025-07-02 14:10 ` Jan Kara
2025-07-01 13:06 ` [PATCH v3 05/10] ext4: restart handle if credits are insufficient during allocating blocks Zhang Yi
2025-07-02 14:18 ` Jan Kara
2025-07-03 2:13 ` Zhang Yi
2025-07-03 16:27 ` Jan Kara
2025-07-04 1:40 ` Zhang Yi
2025-07-04 8:18 ` Jan Kara
2025-07-04 8:47 ` Zhang Yi
2025-07-01 13:06 ` [PATCH v3 06/10] ext4: enhance tracepoints during the folios writeback Zhang Yi
2025-07-02 14:20 ` Jan Kara
2025-07-01 13:06 ` [PATCH v3 07/10] ext4: correct the reserved credits for extent conversion Zhang Yi
2025-07-01 13:06 ` [PATCH v3 08/10] ext4: reserved credits for one extent during the folio writeback Zhang Yi
2025-07-02 14:34 ` Jan Kara
2025-07-01 13:06 ` [PATCH v3 09/10] ext4: replace ext4_writepage_trans_blocks() Zhang Yi
2025-07-02 14:50 ` Jan Kara
2025-07-01 13:06 ` [PATCH v3 10/10] ext4: fix insufficient credits calculation in ext4_meta_trans_blocks() Zhang Yi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250701130635.4079595-4-yi.zhang@huaweicloud.com \
--to=yi.zhang@huaweicloud.com \
--cc=adilger.kernel@dilger.ca \
--cc=jack@suse.cz \
--cc=libaokun1@huawei.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ojaswin@linux.ibm.com \
--cc=sashal@kernel.org \
--cc=tytso@mit.edu \
--cc=yangerkun@huawei.com \
--cc=yi.zhang@huawei.com \
--cc=yukuai3@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).