From: Joseph Qi via Ocfs2-devel <ocfs2-devel@oss.oracle.com>
To: Jan Kara <jack@suse.cz>, akpm <akpm@linux-foundation.org>
Cc: ocfs2-devel@oss.oracle.com
Subject: Re: [Ocfs2-devel] [PATCH] ocfs2: Fix data corruption after failed write
Date: Fri, 3 Mar 2023 18:55:48 +0800 [thread overview]
Message-ID: <2df624fc-b463-5f28-7953-c368f9f9dd8e@linux.alibaba.com> (raw)
In-Reply-To: <20230302153843.18499-1-jack@suse.cz>
On 3/2/23 11:38 PM, Jan Kara wrote:
> When buffered write fails to copy data into underlying page cache page,
> ocfs2_write_end_nolock() just zeroes out and dirties the page. This can
> leave dirty page beyond EOF and if page writeback tries to write this
> page before write succeeds and expands i_size, page gets into
> inconsistent state where page dirty bit is clear but buffer dirty bits
> stay set resulting in page data never getting written and so data copied
> to the page is lost. Fix the problem by invalidating page beyond EOF
> after failed write.
>
> Fixes: 6dbf7bb55598 ("fs: Don't invalidate page buffers in block_write_full_page()")
> CC: stable@vger.kernel.org
> Signed-off-by: Jan Kara <jack@suse.cz>
Looks good.
Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
> ---
> fs/ocfs2/aops.c | 19 +++++++++++++++++--
> 1 file changed, 17 insertions(+), 2 deletions(-)
>
> diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
> index 1d65f6ef00ca..0394505fdce3 100644
> --- a/fs/ocfs2/aops.c
> +++ b/fs/ocfs2/aops.c
> @@ -1977,11 +1977,26 @@ int ocfs2_write_end_nolock(struct address_space *mapping,
> }
>
> if (unlikely(copied < len) && wc->w_target_page) {
> + loff_t new_isize;
> +
> if (!PageUptodate(wc->w_target_page))
> copied = 0;
>
> - ocfs2_zero_new_buffers(wc->w_target_page, start+copied,
> - start+len);
> + new_isize = max_t(loff_t, i_size_read(inode), pos + copied);
> + if (new_isize > page_offset(wc->w_target_page))
> + ocfs2_zero_new_buffers(wc->w_target_page, start+copied,
> + start+len);
> + else {
> + /*
> + * When page is fully beyond new isize (data copy
> + * failed), do not bother zeroing the page. Invalidate
> + * it instead so that writeback does not get confused
> + * put page & buffer dirty bits into inconsistent
> + * state.
> + */
> + block_invalidate_folio(page_folio(wc->w_target_page),
> + 0, PAGE_SIZE);
> + }
> }
> if (wc->w_target_page)
> flush_dcache_page(wc->w_target_page);
_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel
next prev parent reply other threads:[~2023-03-03 10:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-02 15:38 [Ocfs2-devel] [PATCH] ocfs2: Fix data corruption after failed write Jan Kara via Ocfs2-devel
2023-03-03 10:55 ` Joseph Qi via Ocfs2-devel [this message]
2023-03-20 11:57 [Ocfs2-devel] FAILED: patch "[PATCH] ocfs2: fix data corruption after failed write" failed to apply to 5.10-stable tree gregkh--- via Ocfs2-devel
2023-03-21 3:00 ` [Ocfs2-devel] [PATCH] ocfs2: fix data corruption after failed write Joseph Qi via Ocfs2-devel
2023-03-20 11:57 [Ocfs2-devel] FAILED: patch "[PATCH] ocfs2: fix data corruption after failed write" failed to apply to 4.19-stable tree gregkh--- via Ocfs2-devel
2023-03-21 3:20 ` [Ocfs2-devel] [PATCH] ocfs2: fix data corruption after failed write Joseph Qi via Ocfs2-devel
2023-03-28 13:52 ` Greg KH via Ocfs2-devel
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=2df624fc-b463-5f28-7953-c368f9f9dd8e@linux.alibaba.com \
--to=ocfs2-devel@oss.oracle.com \
--cc=akpm@linux-foundation.org \
--cc=jack@suse.cz \
--cc=joseph.qi@linux.alibaba.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).