From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aib29ajc245.phx1.oracleemaildelivery.com (aib29ajc245.phx1.oracleemaildelivery.com [192.29.103.245]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 17FF6C76196 for ; Tue, 28 Mar 2023 14:18:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=oss-phx-1109; d=oss.oracle.com; h=Date:To:From:Subject:Message-Id:MIME-Version:Sender; bh=5Hc2NRhZShptreQQ1OofDsBLvAxdUbQ6wwR8Q3hSSNs=; b=jzyPaoVq1eWuFGGlRTwHobpslIhL0W24XFJzMYs8iobRVhjbz+n+7kmOntmRXwIHXiXYnpBvH/oE nEmXwTaaEIzxwwxBcd1dfL/Z942nwhUllhw6o/fyV1Mtk0IPaXsuds40/7KEI+Lddxc0JG/1NP8n tcIeqaZPbfW0S5oBkoq5Mhoi5gq5Kqsr8+hSUbgSfxhngxnkXYX1OEm4rQ6eJn65t74wd5lxBgnM C6hl5vSUY/d5dBQzpUNFbZWNL01uT4chd8ixpet38SUwdhtyN0E7I2VGsT+e6a6J4+HjWo0SM9Fx LkoHdJ0YLKUJZbsXFLIYGFz8iDakmuCoF7ET0g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=prod-phx-20191217; d=phx1.rp.oracleemaildelivery.com; h=Date:To:From:Subject:Message-Id:MIME-Version:Sender; bh=5Hc2NRhZShptreQQ1OofDsBLvAxdUbQ6wwR8Q3hSSNs=; b=kt12xe8JipAaUho1HgBv4JibVe4dhX/RpcewGLGN6+p5urhuXdeEvozIlFjcJouPXRxITvZrm4+B f9j86+T8DijtBIMDSIYHH044Y9vox2/AJCWGP1yS9lePTu2HQNa4iWi4MA3Yzps/QzQyvGA0JVxg 1pmV9ZyKYhWtImfgsAsoNlowW77EGwJevHuZrsjggDwo0DYnfBf8WrF6Dl00sK4Fb+WfSA6SP5Km 24qCy/NR44CjIAWW5fpuVfY2CBPqUuBeD6r8tMZsyJ0gOGlWC1+wUrfSMnkWLbtd+5Su9RM8NNwL iIcPVzY08G3jpP0jwqPohSQWI+ziMl3uDjtWVQ== Received: by omta-ad1-fd1-102-us-phoenix-1.omtaad1.vcndpphx.oraclevcn.com (Oracle Communications Messaging Server 8.1.0.1.20230317 64bit (built Mar 17 2023)) with ESMTPS id <0RS8007EDIFNEND0@omta-ad1-fd1-102-us-phoenix-1.omtaad1.vcndpphx.oraclevcn.com> for ocfs2-devel@archiver.kernel.org; Tue, 28 Mar 2023 14:18:59 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1680011653; bh=8pvFjYj4s11b/ILXCN3ZCi6ump/ToFysVMB3emDJsOI=; h=Subject:To:Cc:From:Date:From; b=aWjfD1ILg0HX9xNEhy8dbO2GO9caOjrVzw8ioZuPAJZgmfbpwSLWB7k5svlCc4AFp BeGcWTrtueuBTCKjB7993ewflNa2z0aG/bz2Re2h24bf1XxLBsu/GZbXQZk4tgglqc AfOP8hD0cVACPy0Sn+i2EW16WZ9jclxS9c+8LjkM= To: akpm@linux-foundation.org, gechangwei@live.cn, ghe@suse.com, gregkh@linuxfoundation.org, jack@suse.cz, jlbec@evilplan.org, joseph.qi@linux.alibaba.com, junxiao.bi@oracle.com, mark@fasheh.com, ocfs2-devel@oss.oracle.com, piaojun@huawei.com Date: Tue, 28 Mar 2023 15:54:10 +0200 Message-id: <1680011650157159@kroah.com> MIME-version: 1.0 X-Source-IP: 139.178.84.217 X-Proofpoint-Virus-Version: vendor=nai engine=6500 definitions=10662 signatures=596816 X-Proofpoint-Spam-Details: rule=tap_notspam policy=tap score=0 phishscore=0 impostorscore=0 spamscore=0 priorityscore=262 malwarescore=0 bulkscore=0 clxscore=197 lowpriorityscore=0 mlxscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2303280110 Cc: stable-commits@vger.kernel.org Subject: [Ocfs2-devel] Patch "ocfs2: fix data corruption after failed write" has been added to the 4.19-stable tree X-BeenThere: ocfs2-devel@oss.oracle.com X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: gregkh--- via Ocfs2-devel Reply-to: gregkh@linuxfoundation.org Content-type: text/plain; charset="us-ascii" Content-transfer-encoding: 7bit Errors-to: ocfs2-devel-bounces@oss.oracle.com X-stable: commit X-Patchwork-Hint: ignore X-ServerName: dfw.source.kernel.org X-Proofpoint-SPF-Result: pass X-Proofpoint-SPF-Record: v=spf1 ip4:72.55.140.81 ip4:52.25.139.140 ip4:139.178.84.217 ip6:2604:1380:4641:c500::1 ip4:145.40.68.75 ip6:2604:1380:4601:e00::1 ip4:145.40.73.55 ip6:2604:1380:40e1:4800::1 include:_spf.google.com include:amazonses.com include:_spf.salesforce.com -all X-Spam: Clean X-Proofpoint-GUID: vz8NP2xhkRYHrpgIQlCYkk6yU5zrd6Xn X-Proofpoint-ORIG-GUID: vz8NP2xhkRYHrpgIQlCYkk6yU5zrd6Xn Reporting-Meta: AAGF3FhZO/ZAINxItKMMg5eBeKeMLETkgSmB5MTkc+xUU8NQLm0MM9nXOLumJJsu HF/5+wfDajMqJZE6NLEGoKqo8WTf5RV0dkfUw7zpL16KHg1KeAUmefemlS4ZN094 lC5y5TbumnhLmLIqX1krS/FiskSOxNH98PREfU7OMt8pS+QSEQ7gIabWsh/teHQ/ qpKYU9/c0LmLaF2E9VdZARFkEQAGdRk55AVYJIjQwf3qDedW414th/RDg0GZ9PIa eJptH+UvR9DfMhruUx7x5gXo3ZgPBdg3v1GZNno0YOXagj2qTSRPWjr1DqHTEnwn UH9m0Eh+YMdJoKGmCwFYoNzEvBRRKE/fX6LWkrL+3CpBDxWqyXwSb7EhgL0HqSf0 QUCICl/wfivOKcatZKNk/TFy6lIYuFEhh5gc93YEAJ99LN1XsODRijat6yXTDEma KYhZt/UbD528rSylE1d7coITpkpTpMN5c2LnjlPzknfKqp4CQRPC12rFe3+Viu6r PvFhw7K9lVdvQeuFn009HUBPV5NCCYPGwuytw/2BWzP1 This is a note to let you know that I've just added the patch titled ocfs2: fix data corruption after failed write to the 4.19-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: ocfs2-fix-data-corruption-after-failed-write.patch and it can be found in the queue-4.19 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From 90410bcf873cf05f54a32183afff0161f44f9715 Mon Sep 17 00:00:00 2001 From: Jan Kara via Ocfs2-devel Date: Thu, 2 Mar 2023 16:38:43 +0100 Subject: ocfs2: fix data corruption after failed write From: Jan Kara via Ocfs2-devel commit 90410bcf873cf05f54a32183afff0161f44f9715 upstream. 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. Link: https://lkml.kernel.org/r/20230302153843.18499-1-jack@suse.cz Fixes: 6dbf7bb55598 ("fs: Don't invalidate page buffers in block_write_full_page()") Signed-off-by: Jan Kara Reviewed-by: Joseph Qi Cc: Mark Fasheh Cc: Joel Becker Cc: Junxiao Bi Cc: Changwei Ge Cc: Gang He Cc: Jun Piao Cc: Signed-off-by: Andrew Morton [ replace block_invalidate_folio to block_invalidatepage ] Signed-off-by: Joseph Qi Signed-off-by: Greg Kroah-Hartman --- fs/ocfs2/aops.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c @@ -2003,11 +2003,25 @@ int ocfs2_write_end_nolock(struct addres } 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_invalidatepage(wc->w_target_page, 0, PAGE_SIZE); + } } if (wc->w_target_page) flush_dcache_page(wc->w_target_page); Patches currently in stable-queue which might be from ocfs2-devel@oss.oracle.com are queue-4.19/ocfs2-fix-data-corruption-after-failed-write.patch _______________________________________________ Ocfs2-devel mailing list Ocfs2-devel@oss.oracle.com https://oss.oracle.com/mailman/listinfo/ocfs2-devel