From patchwork Thu Aug 15 09:08:45 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: 13764599 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 5E465C52D7D for ; Thu, 15 Aug 2024 09:09:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E5D756B00AC; Thu, 15 Aug 2024 05:09:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E0C796B00AD; Thu, 15 Aug 2024 05:09:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CD5076B00AE; Thu, 15 Aug 2024 05:09:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id ACAF96B00AC for ; Thu, 15 Aug 2024 05:09:38 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 66D4CC141C for ; Thu, 15 Aug 2024 09:09:38 +0000 (UTC) X-FDA: 82453906836.01.43C3A44 Received: from mout-p-103.mailbox.org (mout-p-103.mailbox.org [80.241.56.161]) by imf03.hostedemail.com (Postfix) with ESMTP id 96AA820025 for ; Thu, 15 Aug 2024 09:09:36 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=g5YsTPzC; spf=pass (imf03.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=1723712904; 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=TEeO5btmd1wqAzlviEQHSKonkcmbF/LMx8C7J83KGkNMpz4rZeTJAReGSN0m6+q89Bw0yw gSzs+q07vs6dMyxuH/ynM/iwAkKDEmVOlFu9SLXnrBxstPkFVw+wW4dlDlL6uJjNzZfC3O 9zsIGmbwu8QnfOoH3SRCv6eFaT39sxM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1723712904; a=rsa-sha256; cv=none; b=aMs9wtUw623MFnGHJAzPxVQNqvwU14gRoO52Q6SETSsvJZN8NOF2VRz7fpWphwcm7eX0Tb C2X7CvHvPQ0AZhTVF8aHVGQyUNro4UVaYIxs1u63nJP2Jh5XsGrAG9cGyuPU5WDRH99J0G A5UXvHE6hsYOlnMltvu/VWNZyBtJAgs= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=g5YsTPzC; spf=pass (imf03.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 Received: from smtp1.mailbox.org (smtp1.mailbox.org [10.196.197.1]) (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 4WkzpP3gpKz9sJ5; Thu, 15 Aug 2024 11:09:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1723712973; 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=g5YsTPzCJdXMe2XqBBy5uwNDho3d0T0MASOfQB/BuSmN0Jw9inUNRVS8yAatpBqD+mdGIi ncUDQjk/x9hdDzqlrrU7PT0F5UXY4msksN4AJfteMn832+L8jKdYKJpGCc1RKivDW6ZGS5 io1vkhJxCHZ5QeGFXkaxumijXUZFKPAlvJboRRVwJAuy/5QOqXrSGWyUOEu9aYmyCRL1H0 PjbiY2nlpKa6LdXLymv9wSy0u5S5BmceZdrwJDQDEjCgSVoIPW3s9/A1l4pajqiBZqCLMZ 0Qz1L5esq4Sr9SngwjMo5at0QUXsn1IUReWYpQErZw7wkbj6KoIvxm3gkLMw3g== 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 v12 06/10] iomap: fix iomap_dio_zero() for fs bs > system page size Date: Thu, 15 Aug 2024 11:08:45 +0200 Message-ID: <20240815090849.972355-7-kernel@pankajraghav.com> In-Reply-To: <20240815090849.972355-1-kernel@pankajraghav.com> References: <20240815090849.972355-1-kernel@pankajraghav.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 96AA820025 X-Stat-Signature: zo9fptrjzq9rt8rwykmabpwkysteeiuj X-HE-Tag: 1723712976-35795 X-HE-Meta: U2FsdGVkX180C1oDx2Dxy1oH873qb0g3ULG2jhghIVBfTYtonwb/aMR5v5UzIWVXJQORjAQFhihb/qPohql2P5IeV1kXI656sAU2Iq5PVbSY0XOS1unlKlI/wW3nsK/rvy+IrUb8/4a/zWjw7sdb2TE+kAFi81qDHaES94S/fm4xpbgEPisyma3K+vi8aS8k3ruV9MoHOH/eKLMJACBYNf0n8WaEv/I7BpxMNduQEIyu4Lyib/WxQPXV7ftcBT7BPeDPfes+a8vJSTcEHYaiqmhz1X8pL/FqVihHN5UY/Z++EdpS+NdJ9zPFp9DPB5bUftfK7X5d0uGW3wnm6RLxWWGV63VzbOWEM5Q4JCyNzEY6xcBS25iw3CZvCiBupFmj6JRcQ0KET5hiWUqUWm5rpWx+ak6itEW8ZT4tA6CrboThglgyNk8lJQXq4PxoRDhskBb6gST2+bRLiVIxuNNhDSbeWZh+pezl+v6eI9v2IJwKLb/kBYzeA7ZoXU3QF3XKVhjQg9EkzOTKTp7z2vPo/Pi8pcvGq+hhVA0lSk5KjW/yceMMwGVxpZh3NyfJzU5WcOANYCtiT4TnN16egQlVTsLYwEF1joAoHxaG1HgHqsjaCrVKmXI4x3ZcoC/TlFoQkMm0ccF9SUkOBhSljTHv3HwLo/FEpG7doQsYVxWJlFVfo/HxwiXZhXHaZol5ImLyIGB6znmt4xyC8CEOj9+f3aKtDoPOtytrYStVitOS6jeCxrRqj+XBkpGFTkl8CD5WDfqQuYzzIbPYFscugxT8zNhfDo7NBomZnkTPPsIgzadiO8jBt6ZxjsvuDrzm6MiNGZDHWl5omU5uxPS/h3KK8yKO2Ssw00SVfsxZVfo9I/VZYF6gShPE7HGfOeMR7HOo1gVEL8/ek+c0bS2u9buINFCaA1P5BXb7oXgzJdhTndBVqPvlYfiSEHG3A9zUfCIMPr1MSDQ33bVHx5McCWO LSsuHgH2 epS3VuRnSvgeBCJYPmWVikk/gSnyTnIRM8wFJpWvs+AbYjzYx6PjWTpK5gv2nFQCdy3AC1/DPkiN8tHtmVhUUC3fshPyxmjv26eendpZp7I+2V4If9cGtvUpRACa7m2mld0vd1s523Dfelj0GNKeuC02pfbmU/j1KKm81qcJw0mnmxPNg5erxqNlf+bTwarTg/9rm/mJUErb3Mgk7UxHD7rw0Z5O5mZRYsYjAl9IXYoP1rmv2vH0SJO2MTjPgwcZfQxD0hhhjZConBxRDKd5XFssB6o17Q/hq0yiaqCq5jtZKc+TesVGi6cfYUTLAeR0Gjr1G7/21e253i1SDbDbbk8QUyCinNHdes4v9u7eGFN+DQBjlYZ0qfIw9nA== 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);