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 49D71C83F1A for ; Mon, 14 Jul 2025 13:17:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 99E436B009D; Mon, 14 Jul 2025 09:17:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 94F3B6B009E; Mon, 14 Jul 2025 09:17:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7EF7F6B009F; Mon, 14 Jul 2025 09:17:28 -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 6152D6B009D for ; Mon, 14 Jul 2025 09:17:28 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 31823B6AFF for ; Mon, 14 Jul 2025 13:17:28 +0000 (UTC) X-FDA: 83662921776.18.00A2368 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf19.hostedemail.com (Postfix) with ESMTP id 5E5B91A0014 for ; Mon, 14 Jul 2025 13:17:26 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=QPHh3Ehy; spf=pass (imf19.hostedemail.com: domain of bfoster@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bfoster@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752499046; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=QCOjwj+34/t9ifmYam4dh/DH4qIGBIaB0drRCZdZ628=; b=5geO/36OltibhsKhMatv0BYc8G9emmbHAQzUZbCiaoulOj269YHEfLsUPamPGG/9NTNIIv gvFoGVASe7uTqtnkrK+lE+Q7TSXtVWdzTEx8qfoVj8EZthNuIgF6LYbOCyFX90zabYVMqm 6D+egxbC3Ehh1TJHWTPLtJMS7LeTekg= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=QPHh3Ehy; spf=pass (imf19.hostedemail.com: domain of bfoster@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bfoster@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752499046; a=rsa-sha256; cv=none; b=8TL4PWbiXQZSLukszhD/EGE69bkQN++6FwoLSPGUT+wqu0YfVke+YKXfF+JPrbBRPVs6sW DDil02g2jAgjmmptGrQ2PzXOb854rl8lJflVeK5QBUrQ4fUrHaidJ2rBcNLxK/S71UdrBr atjKX9H7H9wlauY3G22vexlSRDhQvkQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752499045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QCOjwj+34/t9ifmYam4dh/DH4qIGBIaB0drRCZdZ628=; b=QPHh3EhyB4FsrHgLZp+TwxsAE7n0cZ8OdU3iuiW6VubKdxBB/MfyVQiaMeLr6kPmepvFOn x59DtLvunmLkG1QoI3GRwAwnMBq4/Bz+cS3Ru7x2lU4b4d5ROkDdXsHE0jku0fh2Wo8Ykc XP5YPlrZRXn73utwILGomvyuqlCHahs= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-313-emcqoeHGNbKehwyK1ZeI2A-1; Mon, 14 Jul 2025 09:17:22 -0400 X-MC-Unique: emcqoeHGNbKehwyK1ZeI2A-1 X-Mimecast-MFC-AGG-ID: emcqoeHGNbKehwyK1ZeI2A_1752499040 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C4A40195608F; Mon, 14 Jul 2025 13:17:20 +0000 (UTC) Received: from bfoster.redhat.com (unknown [10.22.64.43]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 87C621800285; Mon, 14 Jul 2025 13:17:19 +0000 (UTC) From: Brian Foster To: linux-fsdevel@vger.kernel.org Cc: linux-xfs@vger.kernel.org, linux-mm@kvack.org, hch@infradead.org, djwong@kernel.org, willy@infradead.org Subject: [PATCH v2 2/7] iomap: move pos+len BUG_ON() to after folio lookup Date: Mon, 14 Jul 2025 09:20:54 -0400 Message-ID: <20250714132059.288129-3-bfoster@redhat.com> In-Reply-To: <20250714132059.288129-1-bfoster@redhat.com> References: <20250714132059.288129-1-bfoster@redhat.com> MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Stat-Signature: 48i47o8rna3tkht3br6op3sy7fqp8x1e X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 5E5B91A0014 X-Rspam-User: X-HE-Tag: 1752499046-7941 X-HE-Meta: U2FsdGVkX19mYVcEQs7ZAfOnEQa6hcvp3/tBFyqxQWeLzqHgZ+CCm8uV3SgsJHH326FCl6Q9vkLCNHL49QjP/jSkVP7aeeSHz5/aIrTZj8tjvX4B56CJAjHqneiGRiYA7O5jeEceol9v48KclhnNTxykIggiTkCw05D4j9GSO1vEqAMLV1HfmO2+AXcVokf38wUaBW2MLwTmoJYkOzB3QKU2SGewRJwB/SB8s5ops67Zol7oschRAc6B5Ho123IHKWFhCwDK9zY2cGeiPH+Pc2687ZKCNb3ywk9bqnyiba/8I8x/qxDQYyuAMKUnR1G2S9LOgh16HEE0COeFFElc+fb7YRTvmwebmcFmlcrQINOn+8tWfdMUaRd4NmPGSrtai2ckMB0OiHVr/C+ans5Xm8DbOq6D+rjEgNLgkTy67NPcNpEuGAdHnu3UAL5Y1XpzJo0ZNRnno/diP3pDpRZarjUJqS0zmcjWb1XFRdY8gpl+rVbobN6J2njI2nImULzPu63UZMqdx2c3+cB9oFggUfNVwdwot7VULTePJFWwK8oN1xN0GjEyJq2qEjhctg9Vvdw8ZJZkxKyoJZ3Hf+f5tq7OvFml5QGgxQdbLk99LJHCh+NMgDib8KFKCjGDOtO69EBfyd6aXBjWH3YWs/iZpQwLCtq0mn9P6viw26XsQcb1G5tDEcpSAZTOp1Jqw4yHmDMfgMAEy9WayYcMJQBiFWCuJbuUpoJK2HFDZoG2Ft9IG6qPa7HW9k9+lL+XQ0d9yxnNdyUaI1SJkJ7VLYejsx2ohErObdM9kMwz82B0Ne07jpOy15VTwqoaCmBt4v2n7Rp9m/UjvyYQ3DLbSRIGrLQYcGLu+VzslG0TBSPxoFEWwbUz1YL/O53hqfIO6hBtK5XqqBsXZ4QNW7sRAY+UUBnnOjXpPMbZYAOVI4lQb1LMR/W0zYm992pcrHYzbJ50mT4ZAIAmBLppctGWYwY EI7j+tBb S005Kv/0Na4XY0C1OWPiu/gnDKxWK1hcU7hQPiNZNDhs4mZxAjBIhparO3ACCDraJ8sC2XAifZNAvG+vw2fejC+9W4Pwph1498a7U0jxCCd8hTGCgo9XPcfsy2nwbHf2GIocWCBPK3LcatUP5yuHWn5GNvIdh+gWa6YpUGjvSyNGnthNNmwnuxo/x9R0WtqGMaidjkKnnmpvuLiKs0SnucEHtxsul6R8Sx1wExIVxMn/RNP6bRMPXmVTH5wu2cs/llGF75r58xyNTIxGiNOMD/c6Cd+mMAXwT21olilpq2/zR+6PUYsPEQ7VXHNejx1iu3HvQ23dTAtV5XJ4noE4gA5gMPQ== 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: The bug checks at the top of iomap_write_begin() assume the pos/len reflect exactly the next range to process. This may no longer be the case once the get folio path is able to process a folio batch from the filesystem. Move the check a bit further down after the folio lookup and range trim to verify everything lines up with the current iomap. Signed-off-by: Brian Foster --- fs/iomap/buffered-io.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 3729391a18f3..38da2fa6e6b0 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -805,15 +805,12 @@ static int iomap_write_begin(struct iomap_iter *iter, struct folio **foliop, { const struct iomap_folio_ops *folio_ops = iter->iomap.folio_ops; const struct iomap *srcmap = iomap_iter_srcmap(iter); - loff_t pos = iter->pos; + loff_t pos; u64 len = min_t(u64, SIZE_MAX, iomap_length(iter)); struct folio *folio; int status = 0; len = min_not_zero(len, *plen); - BUG_ON(pos + len > iter->iomap.offset + iter->iomap.length); - if (srcmap != &iter->iomap) - BUG_ON(pos + len > srcmap->offset + srcmap->length); if (fatal_signal_pending(current)) return -EINTR; -- 2.50.0