From patchwork Tue Jun 25 11:44: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: 13710925 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 BECD1C30653 for ; Tue, 25 Jun 2024 11:44:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 55E716B02F2; Tue, 25 Jun 2024 07:44:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 50E846B02F4; Tue, 25 Jun 2024 07:44:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 339EC6B02F3; Tue, 25 Jun 2024 07:44:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 146A56B02F1 for ; Tue, 25 Jun 2024 07:44:54 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id C1C0DC15A7 for ; Tue, 25 Jun 2024 11:44:53 +0000 (UTC) X-FDA: 82269229266.09.C754CD4 Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) by imf01.hostedemail.com (Postfix) with ESMTP id EE8584000E for ; Tue, 25 Jun 2024 11:44:51 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=0cMOTi7n; spf=pass (imf01.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.151 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=1719315885; 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=Df5ZWch5fTpYhlPxb9yx/HDWdwemGo64pl9vSh29I64=; b=Aj+B/zfHIk/mQAZ4F3UCttXV3ka4s/3A5X5m9Kj37LSSa96GnYrLFNHibh0QCpZKij5yYK BajtYmy+s+3D/tvTHNIoZ1VSwmKGKtSBo3d0Dg6w6/APKEsKTFJUM0C2fMNRs/NUX+RCdx WuNSpL6JFNDjEL7ckdh5m4144hj/eJY= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=0cMOTi7n; spf=pass (imf01.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.151 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=1719315885; a=rsa-sha256; cv=none; b=c1s/Hq/0/6WWzzxCpAPh0Q3JLF9OjB2830SHltgdqviUw+dhyODt+KtydN7PR1WaMafH9m M7n+eloWjaj+/PFwJcwTyJ0RmOihjCKIROgYFbOTD2wFx15L5tv4tWjelUxq+Zh0CldCga M0UkzUyOpbIJ7rdfZs5XT7p8BJPxYrQ= 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-101.mailbox.org (Postfix) with ESMTPS id 4W7jg46VmYz9srB; Tue, 25 Jun 2024 13:44:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1719315888; 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=Df5ZWch5fTpYhlPxb9yx/HDWdwemGo64pl9vSh29I64=; b=0cMOTi7n0+bdIMypet/TOlug5hdj2GY0J3E8OdTB3YdQViT4ac5M8lASCbutH2h880yREb tDEJPZXkCWLc5f5xi939GQJiOTTFwOzK8RiPXTtOPaQUEwJo4T1XHrpuXme0gWrsaiYiM5 mzVvtZ0g5bpklzaTG3OhLBLLuh+hOmD7UDtC0KxOxJbCB5drbeB11NDM+OOcsB4zsv7QYS wntij5YskAvs78MC+oNNtEZHdKqobtc7gd+mWqvcyAsVNeUcyP8RWJsF8xBBL6G7xrivsc 9pk+zuB0Rztwcxm7L5xVShD0/TlZjTuyzaSak7c+rjdmP+RNJDoRAS1m7c4uYw== 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: linux-kernel@vger.kernel.org, yang@os.amperecomputing.com, 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 v8 06/10] iomap: fix iomap_dio_zero() for fs bs > system page size Date: Tue, 25 Jun 2024 11:44:16 +0000 Message-ID: <20240625114420.719014-7-kernel@pankajraghav.com> In-Reply-To: <20240625114420.719014-1-kernel@pankajraghav.com> References: <20240625114420.719014-1-kernel@pankajraghav.com> MIME-Version: 1.0 X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: EE8584000E X-Stat-Signature: 8k1ye9r6uoymqb15xqxumoun1aixdkco X-HE-Tag: 1719315891-96218 X-HE-Meta: U2FsdGVkX19ZE2XDuqoSVkxTCslFl+XGp2H5GBobgUjV9su1IAfjmuX5kZ+8z2VCeQjKwd0bl1kbzjJ+s7CTAwqa+Yn0gkkHbIs5DNEq4nHWGJnSRfXR/gASQB3+FCkxU92U2CySJ5Ywu4mnH00RdPMCzgiMSpQQdB3gAZ6Ngu5l9Lgr4eUMPMyR5zVQNlLiphBo2KrgQtm+OHKHOXH1z3JDplZ8CQdU/MnG5TjlWs3/Ou3oNwKLQDxUkRCEPhoi2P63Ubf60h0/bXc+h2xg+xFzZS13xLrsHDr2VRB8kywjnk4wcjNDOBSilznBig1m6HrZrGBMxNaN9zXyx+2vn6oCCqbhMG+PCvFlhKjjtrbxned9c3+vVcOLDtanLzXszKpdp1+BMOfYlSbPW1UtIlWUMXs64lvaSjTWKiMDAC03qEF9857GpvudhWo502OR+z+BoVhPjdNl2JYHFHZ4wYNOvlARusq+jCHditROL3OJGzojV+wYjG9iIO/bQHwV0DTg+0B0lk67IXlQEWa/bd/e2QRgq5lSYQsc0YaxBNktMo8qiPJqEF8zZLSdkksuJS+omPUhI7z8Ea2PPIJ7/kzWNraec3MS3lyddzosii+45eAvWkpvkm5KgzpgBnbfOPxkO1iKNnzrRhjrQqIwq16QnVvdhVQiYbb0/EhOLOp8K7po6qcflCFlK48M2ih2aapJOZdxpcz1DghJj0D2GEns7/l889zSw72XHQZrIXV8dlctckb4xAZgs81oT7OGxVni2IHeL7BOP1f8JowsomH7qsIIcrRvVGtPUBp4cKIbbScNes0twGqC3kmRBEHR9lzkZ1fMiYacI3OMmHJRDIorMMB9OXQCwYdCO5tN5xsu+P+kwpcf+HgBRb7liHd8Da2Qd/1v9TF6CX2Czcg5l7vbDJGDRXA9r5T+jeCuAoiMzsrRnASu8izxuCm7JcYVPufO1Xc2Xwp67RElpLU LNd15D+w 4jCu2ecWR2aVFaUhnIzX1vRV2mkxgnqGKu24PnyxN9LH3L7zPNSmR9Jajdc1nIBEOKB5K9U1d3hWb7zZdyMkf9yuYMT5dmoc2WhPv0uKiW8pSHcyOcuMAkLJ/3ND59n6lPo3IIbC2rpnGKlOoLKvmsfrI44gNx+0iSrKo30kW73qEddUYWzZIy4hsBqKeauQ8b3YI+K5B3rkQD+0/S496/QhN2zo8zzmnRJbEkgJdckw5ez49nRmuRcc4mdTK7U3/WOFIq3I5DL+yH/W/DNNfA1+fpsdwuIm3m7p3ISCrKGOs9hA1WmVJ5Sprag== 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: Dave Chinner Reviewed-by: Darrick J. Wong --- fs/iomap/buffered-io.c | 4 ++-- fs/iomap/direct-io.c | 30 ++++++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index f420c53d86ac..9a9e94c7ed1d 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_pagecache_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_pagecache_init); diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c index f3b43d223a46..61d09d2364f7 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 ZERO_PAGE_64K_SIZE (65536) +#define ZERO_PAGE_64K_ORDER (get_order(ZERO_PAGE_64K_SIZE)) +static struct page *zero_page_64k; + struct iomap_dio { struct kiocb *iocb; const struct iomap_dio_ops *dops; @@ -236,9 +244,13 @@ static void 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; + /* + * Max block size supported is 64k + */ + WARN_ON_ONCE(len > ZERO_PAGE_64K_SIZE); + 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,7 +258,7 @@ 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_64k, len, 0); iomap_dio_submit_bio(iter, dio, bio, pos); } @@ -753,3 +765,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_64k = alloc_pages(GFP_KERNEL | __GFP_ZERO, + ZERO_PAGE_64K_ORDER); + + if (!zero_page_64k) + return -ENOMEM; + + set_memory_ro((unsigned long)page_address(zero_page_64k), + 1U << ZERO_PAGE_64K_ORDER); + return 0; +} +fs_initcall(iomap_dio_init);