From patchwork Thu Aug 22 13:50:14 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: 13773527 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 BCD32C3DA4A for ; Thu, 22 Aug 2024 13:51:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 279848002D; Thu, 22 Aug 2024 09:51:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2043F8001E; Thu, 22 Aug 2024 09:51:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 006FC8002D; Thu, 22 Aug 2024 09:51:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id D0EE28001E for ; Thu, 22 Aug 2024 09:51:04 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 99AA0416F3 for ; Thu, 22 Aug 2024 13:51:04 +0000 (UTC) X-FDA: 82480017648.19.DD13697 Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [80.241.56.172]) by imf12.hostedemail.com (Postfix) with ESMTP id C592C4000C for ; Thu, 22 Aug 2024 13:51:02 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=ZMob7FDY; dmarc=pass (policy=quarantine) header.from=pankajraghav.com; spf=pass (imf12.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.172 as permitted sender) smtp.mailfrom=kernel@pankajraghav.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1724334572; 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=pD3Ip9aPdQ9e51emhRiUmYHymg6Mc2qCEYPgRqwWlxo=; b=HBFTTSKcZqAcyzQ7L8pIdyA+icWiCpXYADHhJ5WtzjUvJh9WEYrBia90wczxwix5TczsLc sS9+6Gg7eaPoHv3/E818rf4EXrC49ecyLFFacPzNXs0aXVznO5OBRyPelRWj69E35vdgQG sQKTUdetabVQN3ZuAOGab7b1lXsP0cw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724334572; a=rsa-sha256; cv=none; b=jPWYFTYR3cSrX2sUIRaYLXegEDXxqsG/0tGHmf/2+lC59xjnKi99n05FqQ3IMEruuCaQjK HzuKQHRgFZMq1qJK0bI3Tfxokmf7WH5AvqwrtcAxy5fDMdhBrMDfIhj0CJBDomq53zlQk/ o95SMYfM2lv0dBhbfgU836ckz5/Xyrc= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=ZMob7FDY; dmarc=pass (policy=quarantine) header.from=pankajraghav.com; spf=pass (imf12.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.172 as permitted sender) smtp.mailfrom=kernel@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-202.mailbox.org (Postfix) with ESMTPS id 4WqPjv43nRz9sny; Thu, 22 Aug 2024 15:50:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1724334659; 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=pD3Ip9aPdQ9e51emhRiUmYHymg6Mc2qCEYPgRqwWlxo=; b=ZMob7FDYE+lhI6JG4HexlL05VAspa1JRUwCDmQRJj/A5r1kZWc4UD0yVvBjU/pAQZOh2ul O4SuqWb0onFo/HRZIvoPlMP/hDFZIOnijx18xKM6E3Hiz79nJMLtzjRCcuS5OmV0FH8iyl 3G8acOSnKK5HhZqRcf6qIzNjTVoQipNTYl0XBj5LXmucXWOg/Op0LW7hborfeVOeMmOpxk CA/8w6S+xRSq+OX2KQkQQR5arFkJxE+WRZZsZlqPH5FlRRVnHHs6sMmki+wDEzZ4YsIBMx FHJ7ktDsFE28pwe8KJds/Et3uhEi56dSEy0LldN5SWMwLLDBd7otktq+Vy6KAw== From: "Pankaj Raghav (Samsung)" To: brauner@kernel.org, akpm@linux-foundation.org Cc: chandan.babu@oracle.com, linux-fsdevel@vger.kernel.org, djwong@kernel.org, hare@suse.de, gost.dev@samsung.com, linux-xfs@vger.kernel.org, kernel@pankajraghav.com, hch@lst.de, david@fromorbit.com, Zi Yan , yang@os.amperecomputing.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, willy@infradead.org, john.g.garry@oracle.com, cl@os.amperecomputing.com, p.raghav@samsung.com, mcgrof@kernel.org, ryan.roberts@arm.com, Dave Chinner Subject: [PATCH v13 06/10] iomap: fix iomap_dio_zero() for fs bs > system page size Date: Thu, 22 Aug 2024 15:50:14 +0200 Message-ID: <20240822135018.1931258-7-kernel@pankajraghav.com> In-Reply-To: <20240822135018.1931258-1-kernel@pankajraghav.com> References: <20240822135018.1931258-1-kernel@pankajraghav.com> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: C592C4000C X-Stat-Signature: q8uof64dhf1jbzjgr4rjcdc3wf3bccei X-Rspam-User: X-HE-Tag: 1724334662-402031 X-HE-Meta: U2FsdGVkX19YMxbNFYk+DksFalTxfdZkUw6PbQjRJbq7vjZ1ZJeaFMWh3ocYWaqcGxfAMd+qsPloZjJOhSGAJf2Wl7wlEnoldQ43zTDtxDyENc5YWNeATckznFsOJgMsBUSeMkLmJ6FT3L+LvM+2hxL3PJiuXEqFHecwkqmPkMM0GaRozapfcJRgyl0qiXxkw+rZM42Rv5xPPgLcWKcmoBHdPWstE3jmpVZEjS9kVnoI8BFpdBTuBTNQkmEg+zuM/2vuOjFx/bJqShDnl6FCg7y9V+FTnTyvBVtDig2f/M3atpIxo1+0rFi+3aXR6gIBC2hD7x7cbI5kdHnCNNGFlsIzEOCrMa1U/AQtro1QgbYamn8ifmm3s/tpvnqh5/2Ca0y1NbpSb2IBZ32eVMyb96qv+qHkEd6gHRVmJANc3k5TkCkBmOpp89g1pruWcxoM2OToGM7lZK9gTaiK3XRwYu9yfTFtm2nowY1inRIiXEjegZEk+MK3FhzhWp3ytUCrQrJFrecDbb3dpL+0nHjY6o3XXpesGYt6ofr6gMqx3rx5PpM9FSlMtzvOB8dN+8O/C92mXhYJKxZpczx1TAEyfDa7nIvLpXhA0ifj3x9ELI608lY0vMo8/dy4rMBzFfKN14OevKXinYH64gxhbu0S0sHmwNxh2t/3ncKWonOvxFMxpQg7EyZp0pPfGN87kjVjZSk+MiNlyRGnZncLT07N+bKzb/jIQaAzAYMiFKcw7YXOgPcN/9fQ8tpZzDEpQVw4DIx1tmcMklJ/6yphPY63w7ZvUjOv4KCCS+tAj7jaThl1cz8VGylHVM2bOFtUX8JZ4+4I4UjrGHXh876RgUTCIw1FWtfjPpoMS2PIJca99kCH+bip2hRSXk2Al58mN92KSGZAQiYYuTccTUyqd4AP809JBftB008k65kwONZWuZVHFU4PrPE323jaEYtz+De/2I/0nuarpxPAt6R6dsU IOEehP76 zJtD1KpZfqk3bZd5TO05Him+DXKjcFx/lCLWZw6GS4ilb7xI8Zx5+PqzgtjrUr97OEfMLEgJj2vPyU8E8Nox78Sg89/fnZ10ypDiUqL7fhmaFDKyd3UY3+LfRDDoIiN8cqa7kj+AeIOesBijdaAgKUjObaqTrAvyrAf+o4xRJbfVl5sNKJL9pO3pppsBaQ5B3BoVOg+Uxzc/FQqN/XHaQNdWhuLd2jFoDIzRlZRmUrzbtOQejR9KE/tJbILGejBtbjE4F5FI2MB7CBucHsiUqpYtQaPEdCufj3WV1P6c2rpKerSp1TMcVsjvhVZOCg6lQilggzKaK00ygl44iF5iDqrAc5QIdnQ2bzJe7Pp3CpTzi4QB6p+9b/m8GHxDBrNao20gc20Jn+IrJpM8= 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 9b4ca3811a242..cdab801e9d635 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);