From mboxrd@z Thu Jan 1 00:00:00 1970 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 69DFCC25B4F for ; Fri, 3 May 2024 09:54:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EBE7D6B009A; Fri, 3 May 2024 05:54:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E202C6B009D; Fri, 3 May 2024 05:54:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BFD7F6B009B; Fri, 3 May 2024 05:54:05 -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 93FFF6B009B for ; Fri, 3 May 2024 05:54:05 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 3F3C61A0AA3 for ; Fri, 3 May 2024 09:54:05 +0000 (UTC) X-FDA: 82076623650.30.762B25E Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf07.hostedemail.com (Postfix) with ESMTP id 5EEAE4000D for ; Fri, 3 May 2024 09:54:03 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=2qf468M5; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=none); spf=none (imf07.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714730043; h=from:from:sender: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=RHyoQ5MeMPOJuHOHR3udnfU/iHZQj7DT1fxrfrX8N6E=; b=o0xUhg+QzwgHmXDAtIBx9TwHkfY0EFwfd6utiyWSXhNqua//X0cWonSePk8TxBqxBvyV2p 831+BU0bXZ6QBjJyzEKWP+dBKT3kWMCi0f54603eosSetECRNvmgCNl+gGet71b/tc51Al KzmVkz6V9mHstqg9IMljTgzZjUcVaBQ= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=2qf468M5; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=none); spf=none (imf07.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714730043; a=rsa-sha256; cv=none; b=hM2lfDD1gGXnEguEdhMlJPcxioxuFsCSTi85Fuqz3TOvCuWUdpp5axCBg6zGEsDQVr5g8d TpKvsqGYI0A8bWNqZ2qwGFtG30HVm88mTroAnA9bP09bGrfcuoA4n6cf/wiA9AN6C3rdnH bk72luIzrKDxUGPjfrWzFCgGvZaTlzQ= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=RHyoQ5MeMPOJuHOHR3udnfU/iHZQj7DT1fxrfrX8N6E=; b=2qf468M5NYODQCoDLTcrc43FtK /iR7zVVzXU4Pagy9bazcOeQhZP3xF8VslzicxT/A4zbKA6ZNrv3CNhW7bXTLx76PZzyUali+yFhal lVmsI39fMAfT0NqziS1mxPlXOu6MlTrO7Deewn4YCyQmYryDehvIuFRJPb8zF1TkYkIq8LSLoTUTZ YcW+VL+WSR8OnA1unlFHaMRsNIpRAoM6Ih0lcukDeKhwHBX7f2npAVyBxDOaJE54GLKZ0XtolFeb8 IAE0CHqxKCPV18AgbZHgjKqphyJCNSH2Wq4KnC9mGNq5xBeqhNGEfjLV+wOH5qpGWlD1Wpnaddr1k /Ut43srQ==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1s2pc3-0000000Fw3m-1Iwd; Fri, 03 May 2024 09:53:55 +0000 From: Luis Chamberlain To: akpm@linux-foundation.org, willy@infradead.org, djwong@kernel.org, brauner@kernel.org, david@fromorbit.com, chandan.babu@oracle.com Cc: hare@suse.de, ritesh.list@gmail.com, john.g.garry@oracle.com, ziy@nvidia.com, linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org, linux-block@vger.kernel.org, gost.dev@samsung.com, p.raghav@samsung.com, kernel@pankajraghav.com, mcgrof@kernel.org Subject: [PATCH v5 07/11] iomap: fix iomap_dio_zero() for fs bs > system page size Date: Fri, 3 May 2024 02:53:49 -0700 Message-ID: <20240503095353.3798063-8-mcgrof@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240503095353.3798063-1-mcgrof@kernel.org> References: <20240503095353.3798063-1-mcgrof@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 5EEAE4000D X-Stat-Signature: o79ind4aig9esij9qoyfwzs711mqigo6 X-Rspam-User: X-HE-Tag: 1714730043-854815 X-HE-Meta: U2FsdGVkX19nP2GKk0ITVTR+r2aq70yc39o+LFwJLKEH1f06biE8WXfNGQkIczhBH7Pgm29ofX9EyyDjFFO6CNWiqdh8agoIUlPf/fBLTVi0QXi4+sHEVSv2lDCx56p0C2a9wFbg9ncMSsFP1NRrvFeF79I76973OEuS+Fqefmz6NiVsFnniijZVVe/mkpuFul9DdWs0pNunfPRfR4lsbJapfV5w2GJ+I7/fRVqEGzOaC2ci05p0uFL4336BH9Xcjq/KitzKbde8Nt7XBBQIwvavuXiExpkpbvkKnGsWkNRClTcXGxy+k6ekd5fU/LyLV10hIBpvWLXWCOGC7Gd/oHogSo1g9cnsR1bpJ8oFQ5vaxuNHn61Dn/O3iv1JAG/xNNZtdJV65A91dxsiCxrZQDI6I/N6tbT1bHtDmA6xrP3knF6ZxataC20R4GCNCFB8l0ILg+RgN4cYUC7qTcsR9HcPNYTxC1T48X+gne48KYlIRDNjtJr6eqE0x03vo6dsNbKldFhrCNXlJatXP4RZia2v0RHUg9nqJ8Q79hlTXBNfqyi13IkhOZGubL0VBuXbmxtDoyxMjTDNtRKUNNwiFCEDIOIwfZ5SCssM5rlg6IwFqlfUb8d+lhesf1bq18dMKYIH1KlkfEd5vAjQ8THtAJfjtqL+FlOt+LQW27LkzHxkNdeLE/bI1vk9RwPTvdEZQ9alcFk4D+v4LAAqW9TlTbu4iWbaDpWC5MIR1hCRphzm0glGwx00DXaGsJ+k2tY/sdQ7ZlOac9ILdoD3CWJibn++QICuib6jqhZVHe12TVZdunqY9Gn8JdDpCIzNECTcEGQOqo1E1FLxp/AQ43FODY37HFxM69oWAP6xpucVGiztsFwrg5yZJhIZYEFHY9p4RNba8WwxWSVjzOKQafNlDEKN1GIaZZld4FlbhEYK+BcnhdTDN3Wx0eNYLab01Hz3shwOMUcsAkWrpbLccEy h652nrWE P5osOa9K2U1ZtmxzuXcfp9Rj4jdZGWuLGA3n1x0RjaFdobVR08QRf+U1/HlIvm0ZY4NLuG13V9bzg2UjeeGeB0GChtapWA1pkicwyS3dU80+sN5sZxRSZ7y9kV2xKAE9c8oEwSmvkDweyKCB29GhnpJU6PZE4h1njGIOlvv/SSekYOycdDQXNuYGNOAXQmxZxexidRw4gNSEGzeEaeCqptAep2OmyP/PEnm4XqkpTY1gbAuxLL8D2SDTxxaZEj6gqTXHtjBCHYlAMDL6UaXZpYU0opbAPcrg/ZFX7xJAMfk4pucyXKX/oj233xWjhHajE1f74rvsT80+1palXLECJVQiNqYq47IwjpzusHZUJ7p8/p75yMpbXbKHij3HP7WetZny6YsVcAbPfY1jiONtl0LtAx5L9zEFmYdE/8aJEUuNnuM9cQePzRlfWZzdDbwkcccDQb5AFQSAuIWG39EWCCN3PZAWdSadS/gJVKaiF9X6NZad3ibU92e8AEvS00zTcBZBtjccB4cFrgMawCRqVCSxlVV2c1MjUvYUH 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: Darrick J. Wong Reviewed-by: Hannes Reinecke --- fs/iomap/direct-io.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c index f3b43d223a46..5f481068de5b 100644 --- a/fs/iomap/direct-io.c +++ b/fs/iomap/direct-io.c @@ -239,14 +239,23 @@ static void iomap_dio_zero(const struct iomap_iter *iter, struct iomap_dio *dio, struct page *page = ZERO_PAGE(0); struct bio *bio; - bio = iomap_dio_alloc_bio(iter, dio, 1, REQ_OP_WRITE | REQ_SYNC | REQ_IDLE); + WARN_ON_ONCE(len > (BIO_MAX_VECS * PAGE_SIZE)); + + bio = iomap_dio_alloc_bio(iter, dio, BIO_MAX_VECS, + REQ_OP_WRITE | REQ_SYNC | REQ_IDLE); fscrypt_set_bio_crypt_ctx(bio, inode, pos >> inode->i_blkbits, GFP_KERNEL); + bio->bi_iter.bi_sector = iomap_sector(&iter->iomap, pos); bio->bi_private = dio; bio->bi_end_io = iomap_dio_bio_end_io; - __bio_add_page(bio, page, len, 0); + while (len) { + unsigned int io_len = min_t(unsigned int, len, PAGE_SIZE); + + __bio_add_page(bio, page, io_len, 0); + len -= io_len; + } iomap_dio_submit_bio(iter, dio, bio, pos); } -- 2.43.0