From patchwork Thu Jul 4 11:23:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Pankaj Raghav \\(Samsung\\)" X-Patchwork-Id: 13723626 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D3B81C30653 for ; Thu, 4 Jul 2024 11:23:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 60CEC6B0093; Thu, 4 Jul 2024 07:23:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5983D6B00CF; Thu, 4 Jul 2024 07:23:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 39BB96B00D1; Thu, 4 Jul 2024 07:23:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 1A4BC6B0093 for ; Thu, 4 Jul 2024 07:23:56 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 919451A0DB0 for ; Thu, 4 Jul 2024 11:23:55 +0000 (UTC) X-FDA: 82301835630.30.A0DE55C Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [80.241.56.171]) by imf02.hostedemail.com (Postfix) with ESMTP id 9D25880012 for ; Thu, 4 Jul 2024 11:23:53 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b="1c/bZo2D"; spf=pass (imf02.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.171 as permitted sender) smtp.mailfrom=kernel@pankajraghav.com; dmarc=pass (policy=quarantine) header.from=pankajraghav.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720092208; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Gfht+/mcjWMyUHlg9kllIj+qSNuX0vmSWQJZg9AkiWg=; b=PA2gwQ9AM+g8dbCivT+gb12tMm43nv/ZiTkir4THv6k2zm1li6+wTGkSTQ1sBAzeAhuTnq WPWflxdYiUlLkf0Iwy7hRvFbp+qzr93vDJsuHTE7HZL2o5R0ITbq9jkkLna1wDAQA1LUM3 +usyOXLoBdwNVHa6Fc0NHuue087W+2A= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720092208; a=rsa-sha256; cv=none; b=V7V0IjhEMHC6q+Acr+V3FMPrd6mHC613yC7gUdlDXYvh9OVbadzq8p/spSFkn9qQIy2UsX fJ4TGMApvJS1m/3BIPW7U3Q8L2tc7taR07sZAqXSv0iXx8Lg7CR2ECmb2gS5Q/p6sw2Gw9 wsL0NumCJ3xu/9ZlYni8Wcf7LHfIs/A= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b="1c/bZo2D"; spf=pass (imf02.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.171 as permitted sender) smtp.mailfrom=kernel@pankajraghav.com; dmarc=pass (policy=quarantine) header.from=pankajraghav.com Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (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) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4WFDmk32Xtz9tVk; Thu, 4 Jul 2024 13:23:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1720092230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Gfht+/mcjWMyUHlg9kllIj+qSNuX0vmSWQJZg9AkiWg=; b=1c/bZo2DFVFSh00aNqJfY3XUAtqix7N6b+uVXOKdORYGdc1xjJy3rTLQ5W8llczuo5DVgR /QYzeBYGO9EZUMHjLGiOg9T/NSGNIRjczm0WXDKG8IY4TiXehlnoyXlL1Xg/cef9ImXWtv 3paeM8k5/0NdSc1jmbFS2KNDToj0ZgKnnmY8x6qe47cVI9S+owu51lBGQM7rHZrg+vXQuz IqGwrPi+6BUvEh5AuiJF/DDwXDM8pFo00jsT9wD5G2xyaL6zb3lYAx6JxmPqluUU2mJGv0 7o/1N6pOtzmJ6yTRQZdO8lezDbwD4sJfBkA83zROIyjkuulMCleUtdZlft397w== From: "Pankaj Raghav (Samsung)" To: david@fromorbit.com, willy@infradead.org, chandan.babu@oracle.com, djwong@kernel.org, brauner@kernel.org, akpm@linux-foundation.org Cc: yang@os.amperecomputing.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, john.g.garry@oracle.com, linux-fsdevel@vger.kernel.org, hare@suse.de, p.raghav@samsung.com, mcgrof@kernel.org, gost.dev@samsung.com, cl@os.amperecomputing.com, linux-xfs@vger.kernel.org, kernel@pankajraghav.com, hch@lst.de, Zi Yan Subject: [PATCH v9 06/10] iomap: fix iomap_dio_zero() for fs bs > system page size Date: Thu, 4 Jul 2024 11:23:16 +0000 Message-ID: <20240704112320.82104-7-kernel@pankajraghav.com> In-Reply-To: <20240704112320.82104-1-kernel@pankajraghav.com> References: <20240704112320.82104-1-kernel@pankajraghav.com> MIME-Version: 1.0 X-Stat-Signature: g3tju3u7qcw8hxr9rtiqknbypxhs5f3y X-Rspamd-Queue-Id: 9D25880012 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1720092233-759987 X-HE-Meta: U2FsdGVkX18MMOEYUXZOAWIDrG59ucr/OdU/3ijSlY5KeYGQ5t+m5DxLqRO/RBLHR9S/ORukbgS0ob2SlB+NyrkKarOZo6c3xTXkHMwLRABoYhb1oThfaHYORnVs+4c/ZbwoAQnV1ZMnl/SWKryOTklvcbeJkuHYOaZZWca+c7J+GpiYj9LyyhQ49u1Kv+azUbC5wXmUCPt2AA+3eYRZLrQIMpTWD/LMgkV980dzzZadi4t+vL0iIM0JHK856rCYa2VNDcznOGCfpeuPIHW26Xx40+7Kj3xRyQt0jGr6oj5WVjDXcl1lh1G2UKDV09AVjUqGRToSIlJdlFrNdyvRU87fWL5S88RJ89+7wa7cGBpyThdoJt89sOqdFxxK5ouPiIzIoh75o29712kblxh3vdiXGiIcGFFCxpCPIWzkacAswN9Ba+bGCxtk2niCX0k7AIikLBxRq5LhA3l4Q23VJj7xY7vPuypCwlpyGwl+zEPYEl0CP4nOQq9UyJtTZQgzMzpQNZaOZNhlb4K6ZwHwDhAjG9RVqVvxR+7dX4VWE5w7sxWhkAwzpy+jNw+DezTOTDUMcuXhfg4EGcz3zQNG58aGNBQflBfTZF9dEiATN88l5noVVpCcB5/wZpO7JkkezMsjfv6bK0imqwpj38lHq/oeoxr9qcPz7IIZ/HryHODzKps7QpXxH5XoDuHHncIh/+K1CbdgKJT67u3Hyf41J+inbxKWuQxY0aiEzq9DpOFiVkOu9OP0QYe23HDLLPueax+MO3ZAR3h0bGB2gvmiLTkOnnHf+IqdBxW8npq6wwEylXwRyCWvfJWjZechcoDnXLIWYTj4+UEZzqBKC4dvcHY09z5WhlMw1speBJpHWxFM1GbJ9ihpZT3ObipTs99fIY6NHr3L4sNhPwkIvyJReI7irlFHt/rheh93AzrjC0cE3COKYr0/cisFKBkr7y0KDgISv1i5IHLVPa0V6Dv b3FK5niM x+1uC6PcpNo2dBbaJXZZXoXwcwS1HcfNxBvxuQNTJyjaJeO66mBIvOWB/yRNbU53T0gsYcwTJNeObJ/fVzghQlrO8As3hk+WFMMGkyx8kEf0w/B9JKmHBZZ1+aFstKQntc28FWsOuXXt8ia1idK2HRPEvXDerp2NhRErO5wEknOxCG3t/BFyWdILCqIlOr6uXS4e1W/BTxlr9RgP8nZwwld+f6rHRzwbF8k+B4712OapBUGjCjOXzoe7cLPOx7C/0nY6TjL8LFSx0oDqxWBiAGC2jTPxA7JWLu6NRBrDKqxdMU+0sM77S6zVEbQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Pankaj Raghav iomap_dio_zero() will pad a fs block with zeroes if the direct IO size < fs block size. iomap_dio_zero() has an implicit assumption that fs block size < page_size. This is true for most filesystems at the moment. If the block size > page size, this will send the contents of the page next to zero page(as len > PAGE_SIZE) to the underlying block device, causing FS corruption. iomap is a generic infrastructure and it should not make any assumptions about the fs block size and the page size of the system. Signed-off-by: Pankaj Raghav Reviewed-by: Hannes Reinecke Reviewed-by: Darrick J. Wong Reviewed-by: Dave Chinner --- fs/iomap/buffered-io.c | 4 ++-- fs/iomap/direct-io.c | 45 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index f420c53d86acc..d745f718bcde8 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -2007,10 +2007,10 @@ iomap_writepages(struct address_space *mapping, struct writeback_control *wbc, } EXPORT_SYMBOL_GPL(iomap_writepages); -static int __init iomap_init(void) +static int __init iomap_buffered_init(void) { return bioset_init(&iomap_ioend_bioset, 4 * (PAGE_SIZE / SECTOR_SIZE), offsetof(struct iomap_ioend, io_bio), BIOSET_NEED_BVECS); } -fs_initcall(iomap_init); +fs_initcall(iomap_buffered_init); diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c index f3b43d223a46e..c02b266bba525 100644 --- a/fs/iomap/direct-io.c +++ b/fs/iomap/direct-io.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include "trace.h" @@ -27,6 +28,13 @@ #define IOMAP_DIO_WRITE (1U << 30) #define IOMAP_DIO_DIRTY (1U << 31) +/* + * Used for sub block zeroing in iomap_dio_zero() + */ +#define IOMAP_ZERO_PAGE_SIZE (SZ_64K) +#define IOMAP_ZERO_PAGE_ORDER (get_order(IOMAP_ZERO_PAGE_SIZE)) +static struct page *zero_page; + struct iomap_dio { struct kiocb *iocb; const struct iomap_dio_ops *dops; @@ -232,13 +240,20 @@ void iomap_dio_bio_end_io(struct bio *bio) } EXPORT_SYMBOL_GPL(iomap_dio_bio_end_io); -static void iomap_dio_zero(const struct iomap_iter *iter, struct iomap_dio *dio, +static int iomap_dio_zero(const struct iomap_iter *iter, struct iomap_dio *dio, loff_t pos, unsigned len) { struct inode *inode = file_inode(dio->iocb->ki_filp); - struct page *page = ZERO_PAGE(0); struct bio *bio; + if (!len) + return 0; + /* + * Max block size supported is 64k + */ + if (WARN_ON_ONCE(len > IOMAP_ZERO_PAGE_SIZE)) + return -EINVAL; + bio = iomap_dio_alloc_bio(iter, dio, 1, REQ_OP_WRITE | REQ_SYNC | REQ_IDLE); fscrypt_set_bio_crypt_ctx(bio, inode, pos >> inode->i_blkbits, GFP_KERNEL); @@ -246,8 +261,9 @@ static void iomap_dio_zero(const struct iomap_iter *iter, struct iomap_dio *dio, bio->bi_private = dio; bio->bi_end_io = iomap_dio_bio_end_io; - __bio_add_page(bio, page, len, 0); + __bio_add_page(bio, zero_page, len, 0); iomap_dio_submit_bio(iter, dio, bio, pos); + return 0; } /* @@ -356,8 +372,10 @@ static loff_t iomap_dio_bio_iter(const struct iomap_iter *iter, if (need_zeroout) { /* zero out from the start of the block to the write offset */ pad = pos & (fs_block_size - 1); - if (pad) - iomap_dio_zero(iter, dio, pos - pad, pad); + + ret = iomap_dio_zero(iter, dio, pos - pad, pad); + if (ret) + goto out; } /* @@ -431,7 +449,8 @@ static loff_t iomap_dio_bio_iter(const struct iomap_iter *iter, /* zero out from the end of the write to the end of the block */ pad = pos & (fs_block_size - 1); if (pad) - iomap_dio_zero(iter, dio, pos, fs_block_size - pad); + ret = iomap_dio_zero(iter, dio, pos, + fs_block_size - pad); } out: /* Undo iter limitation to current extent */ @@ -753,3 +772,17 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, return iomap_dio_complete(dio); } EXPORT_SYMBOL_GPL(iomap_dio_rw); + +static int __init iomap_dio_init(void) +{ + zero_page = alloc_pages(GFP_KERNEL | __GFP_ZERO, + IOMAP_ZERO_PAGE_ORDER); + + if (!zero_page) + return -ENOMEM; + + set_memory_ro((unsigned long)page_address(zero_page), + 1U << IOMAP_ZERO_PAGE_ORDER); + return 0; +} +fs_initcall(iomap_dio_init);