From patchwork Thu Apr 25 11:37:42 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: 13643184 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 326BBC4345F for ; Thu, 25 Apr 2024 11:38:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B8FDF6B009A; Thu, 25 Apr 2024 07:38:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B189C6B009B; Thu, 25 Apr 2024 07:38:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9B9C76B009C; Thu, 25 Apr 2024 07:38:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 7D0D06B009A for ; Thu, 25 Apr 2024 07:38:23 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 0208F141224 for ; Thu, 25 Apr 2024 11:38:22 +0000 (UTC) X-FDA: 82047856086.26.3B0AED8 Received: from mout-p-103.mailbox.org (mout-p-103.mailbox.org [80.241.56.161]) by imf04.hostedemail.com (Postfix) with ESMTP id 9BEF740012 for ; Thu, 25 Apr 2024 11:38:20 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=0i4j7ORW; dmarc=pass (policy=quarantine) header.from=pankajraghav.com; spf=pass (imf04.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.161 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=1714045100; 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=SZEgKM6QrgoQBOd+qQrQCeNmZ9w7P0QsYqZWksJ5EHk=; b=wutpLplkrocvapDCD9RKuyz/yFeHrWz6cg3GO0Bh1DJotgMUOddSEO3cbWPfs3lRdF+0zc Eq46Z4qEnVLg6HtZwMagPlPFlfKC7b/NpBTBQWsAO7dH1LbMzUoTroebvF2D0o225+9njm 6AET1d9t/Z1gkFyxRSxaRs9IgMFm/1U= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=0i4j7ORW; dmarc=pass (policy=quarantine) header.from=pankajraghav.com; spf=pass (imf04.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.161 as permitted sender) smtp.mailfrom=kernel@pankajraghav.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714045100; a=rsa-sha256; cv=none; b=pRB9gkN2epUUZigOFZi6WhiWqGE804Bh1ThpGi0YedqqH3L4Dv75g2piNNrLhSvaQwmtwC eMKyaJmylqjePdTthftQw4OAsy9yjkLxBrvN2AFpmkCKz07m2AMf8y6i/CSJJK8O9y/TJx kkxLkpf+WXOY6j4fy2uqXaG+jUbbAhM= 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 4VQDPj4W0lz9st9; Thu, 25 Apr 2024 13:38:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1714045097; 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=SZEgKM6QrgoQBOd+qQrQCeNmZ9w7P0QsYqZWksJ5EHk=; b=0i4j7ORWzhspfs9ixeGdeOd0r1Eo3pwU4BtbEF6woZni4V5L14YKa90J2IqEZYFdXLtLwQ d095+992gOcqpTpvDmkxs9wjY7M3TnyMW+njvxML8bzJAjWem3m3XsWdSnSWuFuh+Sj2Qj CGfTbZEvR/uGNDzP9Z4zzf/tKBzDsE6Ugs0w6iwnqs2ybQsAfmPk1e45Pn0ZYURDU6HqQs gsvloW/OFuuUMDj24VJs5qlh3CmNhbyAybQzf8AuK0YnrBAsRuGirf1A4SpVy33vZBe5H0 nWRJZVwpcGRXpRVNm+x4Y29XeSpONlxWjPDS1jg0b1WOaVJEhEi9gXgIZO+4IQ== From: "Pankaj Raghav (Samsung)" To: willy@infradead.org, djwong@kernel.org, brauner@kernel.org, david@fromorbit.com, chandan.babu@oracle.com, akpm@linux-foundation.org Cc: linux-fsdevel@vger.kernel.org, hare@suse.de, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-xfs@vger.kernel.org, mcgrof@kernel.org, gost.dev@samsung.com, p.raghav@samsung.com Subject: [PATCH v4 07/11] iomap: fix iomap_dio_zero() for fs bs > system page size Date: Thu, 25 Apr 2024 13:37:42 +0200 Message-Id: <20240425113746.335530-8-kernel@pankajraghav.com> In-Reply-To: <20240425113746.335530-1-kernel@pankajraghav.com> References: <20240425113746.335530-1-kernel@pankajraghav.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 9BEF740012 X-Stat-Signature: 1ktjc414qkja1zb8oe33niqnteudg4xh X-HE-Tag: 1714045100-114117 X-HE-Meta: U2FsdGVkX19VE0jtywXO+lCmRC8oHrhqEOoIeT6hE15ICspCXAFwrDrDXv7MOBu0Cx+X/vJk1ToYsp+oYE2CBpVbJF5VbBLMRHgJYZAtAN3ttt5FP3se4uBmmWKdcazRvhHfqdAVKtyjL+Q/YY4c6QvfVgJYRc+Jt+febHRRsdbwnnq89lncUVyfpEFvuTI7NFcY7CYYAJUQkD1bo6ZvEtzPtRadpg1LxXkw84ECHzxK+F1Q6ZGWGlLP1TBjc/diYJATjIldWcziqxL97/o4OVLGXf4RGZJaD75H7QFAdrdHtocqfjT8Nk15lYk15iJZ9yK/wL9EWrK5PqwZ6IKyQvH4UXmX+LwJJEAJUeF+/fvHdn98GWzAcxhYY8umok1+SiofU+c6z9r0bw9k1mlu4LIKSd9b/kqgUcQMJDT2FGQyzthfLq0INNvxvM17D8QECGS2kl4yvUzGdBBmINh/Ft+nzUFRsm2bmJT1urVz6aDifpi6pYBCoimhX+lL1vosM6l1YB2wlkaH8SrRQNbq6OMNpe2FFXn5vXy47YGtS0twtQl7kF79IXnSYVJ2NBC7jv4GUp4w1KRh/7MqGQFkAGOaVVbSmimNGu+vSxNvXEym0nsAIBJO//i9V3cknZ0nQB49qkrkK5oeEvqqgWnltXeqsZRwa68k6dLbgPhCTCebv9p7bccXF7IKuUog5Tp3mXHwhM+TOU7r6YDFQ4nbEoiSUBJch1vCKAbOEwwQhQeTGEa0UCWg/+h7VPhxtRsz+LwbFSm2Uggis/kJIMkBRKRsr9YV7bNDZ9PoN7Xx9nG+RXwOQDUPmZWHL9taURxPIpM4dNgg5BWFtASjgWEFujeRw/wFjMO0c54MvFF6ghisWbATZxfypS6hFnkvZaDAskZDZFXdxbF+tkyNAbsIlwfBh5/djWVE2ypWaEMW0tHHU4EWuA58RFchpZRH1Ws0hhPjp5RfaPqEkz9gPFU F86PrXvB z8q/QG8Ifb4yLrMgIUaRbpPC92v8AIXwnP29NDLIAmKFobWPi1CoKd05433KxynCVOGaPqJ2aESlxb6FbaJ1UY2r57Y01268OG2k8aimEJwy82LlTswyj0tCZKfF0EOuydCm5u1YFQh35PWTTrzqQGuDZVE+1PkVmI4pFaJIGxGlXcRrYVtG+xOxDezSiDaTgNXk24yf/6ZZebvOb09fGW+jzxM5XMpfEDvwMexJXc5OUNMePbRw69deh5tCwQ9p0mVvs1/XhxIKPMityiSLcc6ksgY+pyGfdUcAX3y+LTheAsX62mcMf41SvMhHQtyNwFLa1H40mp0OgkwI= 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 --- 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); }