From patchwork Fri Jul 26 11:59:52 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: 13742705 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 C7693C3DA7F for ; Fri, 26 Jul 2024 12:00:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 568D76B00B0; Fri, 26 Jul 2024 08:00:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4F26D6B00B1; Fri, 26 Jul 2024 08:00:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 36DC36B00B2; Fri, 26 Jul 2024 08:00:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 154B06B00B0 for ; Fri, 26 Jul 2024 08:00:39 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id AF550141805 for ; Fri, 26 Jul 2024 12:00:38 +0000 (UTC) X-FDA: 82381761756.07.E20B901 Received: from mout-p-103.mailbox.org (mout-p-103.mailbox.org [80.241.56.161]) by imf20.hostedemail.com (Postfix) with ESMTP id C05131C002E for ; Fri, 26 Jul 2024 12:00:35 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=JdIOde58; spf=pass (imf20.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.161 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=1721995234; 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=92ifPOSk+9xMdQXjuWHjR+cARiQXMVhXQNki2unPXuQ=; b=jb6Ao7dHE3ds5d5odVkO2KaPzN4qbWRMrCg7KHn67pVrkXXYRQqQp/W0LrxPrYkpzwcN7Z d0ChCwjhF0aCkcE/ZYPfPQrxN8cC2XnOvo0wp1y6Kt8hOIkMs67ig+F/cTy9DO+N5V0/Sl z5mb3b0njnsPBxd0N1vVB5h/zz8pFpI= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=JdIOde58; spf=pass (imf20.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.161 as permitted sender) smtp.mailfrom=kernel@pankajraghav.com; dmarc=pass (policy=quarantine) header.from=pankajraghav.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1721995234; a=rsa-sha256; cv=none; b=xU2IAzD2wD3InI3KPhhFNxSrE1sWX/br/0LoZbHJLDZOYvjyMr7rn3CiB7X71yPUYHjpGV KXDLkdSnP2Ms3OuPSXKhn3Yj+eT6hoJgcLeuW581kUYgn3rHXKjBdz79PQnFntxVUv4UzC pQXLOarqssRuoGlQ8zNWuGaX++YtCW8= Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::102]) (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-103.mailbox.org (Postfix) with ESMTPS id 4WVmXw2Gq6z9scY; Fri, 26 Jul 2024 14:00:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1721995232; 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=92ifPOSk+9xMdQXjuWHjR+cARiQXMVhXQNki2unPXuQ=; b=JdIOde58VBAj2fkp/TpLSqvA4CB7syv6NihQWUQIPHWoe1mCge7hwFXUnes0Ts6ZSjKVGG W6YN1FaIHWe8VMN3FfrRoa8z9AZgUiH1qaZIrT7XkEzvDNGcCOC3WOb03+vl346+GUeyjc KEqK7oSuGPLmQDIrYgIjGXlqY7aaO59QbVgWeZem9CkKWmKWzF9nGRg96mtW5wc8mIL/M0 5mIz769OOStN7yKtnverR+89bsHtms8eD97GIGfPjcJvn16IS0eUjCJcINvkO/0VTfn28N 7MuFZWwaLgJRw32CHpeKgmHS5QsGaAzmWpYwn5YH4Ymj2/29hBakOE4tVN1aEQ== 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, ryan.roberts@arm.com, hch@lst.de, Zi Yan , Dave Chinner Subject: [PATCH v11 06/10] iomap: fix iomap_dio_zero() for fs bs > system page size Date: Fri, 26 Jul 2024 13:59:52 +0200 Message-ID: <20240726115956.643538-7-kernel@pankajraghav.com> In-Reply-To: <20240726115956.643538-1-kernel@pankajraghav.com> References: <20240726115956.643538-1-kernel@pankajraghav.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: 8jq86zt84xp7bedrjjafm7gp338mywzn X-Rspamd-Queue-Id: C05131C002E X-Rspamd-Server: rspam11 X-HE-Tag: 1721995235-686337 X-HE-Meta: U2FsdGVkX1/+WJ/ladvdfkx+m1iwAMt8jxTbUzumt2JshCklZW8JOeUhRK1Zi7vs0tkPLZvNrtrt0EMbKZukpWL2F8DSYFr6bOfGj+tThkQt6Zx6zsDlbeZlbANtjb1HdZYte3xBugp48l+3bB7JQtuZ+Rntkc8atNZyuaK1oasgZqcPx8TJN3JMeLeWVYTFXUCPzXRy9+5HTvaeyGMHRLJ99F0Ty+C6wvEWexZjs21itwwgLG4oQHOeNNOjTV+GkeiCmEZrw0oph0HIirdX4TtQPgIunYgLrNevfAjys9TSCF+nv2Rfo37dOPyh7Gxfpn+533fRwSX7oQfBdeM44kIMQkUfTLSlFPckVyHmV8TWthsR66URvLrlFI93Q0arcNVLqe9W7xS0ofqf9XEd2+eI5b/zqpOttZoegUsoWMJoK1v2K2pYebIUTgeTGgQWgxtd+5I+vuPxOmpi+bUsYFB+wNSOTrMnEfRfPRFuuJiGBspIoKyX1ju4HnbpsR97ozlbIxFCUtMAqPnz1oc99MFH2iWy441a6DCNhNUKWF2fhkkazGMIupAt/zH7rxWOtHdWz0+aBprwY5cal1EW3Xuh2mmz9NAbVI8jVCuaYuXaIPri05bjg7kpe8QXbQSblLafaP4mHf2FPHerhPo+XPdezsdQbdXUJIR80GwE8Hpmx/xTBG0Qxj+uqP5LdCri4wJySIeGqlYkKYSSkZ5wrFrgmVHvr//P/cSQQCIsqK4tVhxma7nKOl6NPuCO6sLwyksYaZzNQrWwuOQmBN41jAg64K4lfvn/7LjdBrg5cfIolAqRnItIniTw6BBlijWwTOeGpVyq9Guu1mzK/CCaw5mQWxTvaFwteeKhHptMdZCm1eKwAxcC3THXcu9+RKJe6S33lIM+dS/VYxCHtZIS66yiPmV+ok0HB3U5tHnymQ3IB7YGnXEmMRYSXKw3a5ic45pgpkRRbFGbQe3WY/x 5PwlXGzf ty0PqDUf7OGSpGvMHjvDi9kvelgwO6jqzoBpQah2vkd6B+g6zZKgrgKNUNqeI2hcLzvgvanBWeB2CbUC1ly9QmJXeKZ3b7wz6K4TeWV2uMwzIeZf9EAISLr7Sa+Oule12VE40QLr6jFwI2OfaMZwwKTCfq55Z3Gwz5lq9EWgwGT7akCopoX+eIwC9O6B/CKny45thm9RMqiPbZ5AINuz9JsEM3+nGsg2K2fmDa5VQ2ywPidjyq0TQpP+lRWIQ9EAb5USpUIrDRYFszHs3WW4DIoi6tzKPib/2gU73L6cewp0FCHZuJlKSvvWKRf9LzZbI8VwopcVhi0iibKnGROc9R3ztEJ3t6pn5lMlrPhjCjh3Y+iJ0a6LZpsmCxp5AlrBGvSfNX49y0iXcBow= 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);