From patchwork Fri Feb 21 22:38:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 13986412 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 71AC0C021B5 for ; Fri, 21 Feb 2025 22:38:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6EFCF280015; Fri, 21 Feb 2025 17:38:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 19C1528001A; Fri, 21 Feb 2025 17:38:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B7CE2280016; Fri, 21 Feb 2025 17:38:34 -0500 (EST) 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 E39EC280015 for ; Fri, 21 Feb 2025 17:38:33 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 8A1D58092F for ; Fri, 21 Feb 2025 22:38:33 +0000 (UTC) X-FDA: 83145417306.04.1D38316 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf25.hostedemail.com (Postfix) with ESMTP id D9C1DA0007 for ; Fri, 21 Feb 2025 22:38:31 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=j0PYVvwX; spf=none (imf25.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=quarantine) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740177511; 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=GoCon0Fq6X63chDqWaV9ZGQ+ZBO2iIy6otYzhff4lOE=; b=sXPAbcUpDLyEmKBnp7duu3hgrHE3/wytlGDnfiWarWfHJ220uUSPI4P4uNWh7d6qnFAp28 ws92rG7yESrxMJQIYM3V9LVziIdcus6HzuhJNq4dtVfuBFa2iZ3kzyUxFJuvBqv4//aiRP IGZRtNopLDI2fDGDMRkIS99gfbhyOEM= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=j0PYVvwX; spf=none (imf25.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=quarantine) ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740177511; a=rsa-sha256; cv=none; b=PQOYpcPKjPOnthu/YLE4uLqxbaT5uyYQvzAZImtzDzQ+iOvntmqwotoABZO/XMAy5xb+LG KqZRng1zae7BgvtYlbAhyiq5vNC5iU6chmGGsSG6UYY+haLwb0Xo5PlnKvwSLWuYf0c0qi K58KCbYpXByli8HiET9r333ZgcpMseg= 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=GoCon0Fq6X63chDqWaV9ZGQ+ZBO2iIy6otYzhff4lOE=; b=j0PYVvwXI7eCRUoi3gZOV2na2H Bj98iRzd1YMF4Lz6r9LwSxt53op4Q5kXHZRxGptgTBnpTPcgVrjtVTzNrCNH9l6rWodcKn1uzPvD9 5Ugsk0CiQqBqoK3Z1WXfrcTsqQ4lWh+ibde8Kyn/b37D0hn79Jyk5ikSCLn85SAI3yk2Siu3h8Rcn WBQJFYEGyP08H9hJUa6NJvNezR+bLm0zKeLxDXBLYKEHGofvghjAj8odarDyzARiJBcNYIk34HXt5 p8plBqyKTGkpOZtRcaOYmBc4TH/6BHg024qY5gApNVtEJBdUVAa+0WQsf/4QcJHNgJe3/pdPjNLkg Y+5JFOAA==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1tlbf7-000000073D5-3Plg; Fri, 21 Feb 2025 22:38:25 +0000 From: Luis Chamberlain To: brauner@kernel.org, akpm@linux-foundation.org, hare@suse.de, willy@infradead.org, dave@stgolabs.net, david@fromorbit.com, djwong@kernel.org, kbusch@kernel.org Cc: john.g.garry@oracle.com, hch@lst.de, ritesh.list@gmail.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, da.gomez@samsung.com, kernel@pankajraghav.com, mcgrof@kernel.org, Hannes Reinecke Subject: [PATCH v3 3/8] fs/mpage: avoid negative shift for large blocksize Date: Fri, 21 Feb 2025 14:38:18 -0800 Message-ID: <20250221223823.1680616-4-mcgrof@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250221223823.1680616-1-mcgrof@kernel.org> References: <20250221223823.1680616-1-mcgrof@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: D9C1DA0007 X-Stat-Signature: fizx7rwp5sbf8h4xbfgu78f6du514x3y X-Rspamd-Pre-Result: action=add header; module=dmarc; Action set by DMARC X-Rspam: Yes X-HE-Tag: 1740177511-118497 X-HE-Meta: U2FsdGVkX19JCDREopJqNuEFKUQ24FJlpi5MQ7iHc725GfhJGjGuKhhGtEWR9KeVXlBFdrkGMNWTEfLuzWEvDMvYX86xbybo8evXDz4g2zwYelxfxvbMflP9a0wMFGhlPDrbr0fs/mBPoxQXYj6Ybfv3H9xFtJVUGL15LEhgS6cO3W/FUxKR7MQ0gEgGfgipj7NCDimJDUy8Qe4MpGdB/RqzFFYm5NuxeAXGQf9HBMYH6WXQ48BBzJx4nxWARhvrSNELehLe5KcPFif/gAs0kYVcyY4mFts3haxx0VmojVdvmve72yYhpvVTXEV3KrFO5bsWveFHQPPqffjOF7czw0tnpec4hwSmmzg1vr5+tRWXqx0Qkj8Np47TZ6JtGlv8K6GRE0NwvC+z1kvm6O86tPl57KkKP47QpL/qVy7b/6d5kT7EOPdSNEO0vT4yo8hLZjNYhj1WLL+DyRVU3xLGjxDd3AVpO4f+r/i1lxQPRExiWoGKcdWrLEhZKLv+UFgPEJDTTinM//QRaO3yGYy3htgIGQSW7I3+2wXIeMME9LKPGsyuGqMwRlvcqAxztQZ4zg/3o15N1kjnfmiia15SRgVC37RgCfP+tr3IfM5w8XIQ8Le0ZxGttkx7ApQRLaIx0UoRSuVDlQVaX19Cjgg9RshuKjid+d5ra1mCKxivablbQNdRw0OUWUTacAEnW0jGzLvM0np8mGxRyKzJ56NEDq8XQM60ddqTnmgl82YwDxTBEpNaeLsaOcKiB7bVAJghQXZJIg2tuKUyP45HzeeuOiAFj9jyW1zusQ12os/PuOw4X/aRgNLe+iQA2c5ik4lD2Oc28smtAy6GhO0q2S+BMqEiuP013F83X5W1tbPkwnFV/HUoeh2tWc3A4Nm3yN8veN1S2u9IaVft8EB9Id0vBaRKP+07l8LyTro27sQOa8rBUkdYGw/Ps2Tk9Jyzu+5fWdYVha/yb179CLCFh3r 3Jk+TsuF 6n68WxtDc271a/EBIh9X+LdUzqZ8o6M7un4rAKw6i+VrmSGMk1yS2PiHjRdsEBjMUyJvqz/qP98RB/KK+oW9LKMyAwFs1MhEafXHi5hwbl/ot/BMebHlzxmUbC/b/ITs1k5i72F5DRJT1cyyuGhnn2U+HYlyGHEeXZPW55LlqPDzMBr5dyIC1d2VgseHvR+pATYD6en1BftcKGtlpAakGvs/Eo4FVbnZiuY/nol8Lap7lVKLOqF6DNX6Tm4lwU5nT3rByb31ZGg5142TcPXDvyeDlZiF3+YjTue9YlLLUHECB/+9DBQgUAyGRAIoxeVPWbL57OpHVu+ggQU5h3zfFAawOSdmal7a1SNJ0X2V3+0sRs4w4pueXp+PZD9RiZyRMebDIR0B6LpZmxFsQ6BA8Cp3+C1x0V8941prtXNZwDaECir+XcuJUmFZp9RIrV7R7DGsHGLdJweLFTzCTHQ990T/pb6/pUpf3oXbPtVO7G0WayRXgmmYV1y64b+DqsVWWe4N0zB707s08fHjLdUAxFjsaD/wKPpT98pcktVEMV3Mc0Z0Nbo1em2CMZg== 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: Hannes Reinecke For large blocksizes the number of block bits is larger than PAGE_SHIFT, so calculate the sector number from the byte offset instead. This is required to enable large folios with buffer-heads. Reviewed-by: Matthew Wilcox (Oracle) Signed-off-by: Luis Chamberlain Signed-off-by: Hannes Reinecke --- fs/mpage.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/mpage.c b/fs/mpage.c index 82aecf372743..a3c82206977f 100644 --- a/fs/mpage.c +++ b/fs/mpage.c @@ -181,7 +181,7 @@ static struct bio *do_mpage_readpage(struct mpage_readpage_args *args) if (folio_buffers(folio)) goto confused; - block_in_file = (sector_t)folio->index << (PAGE_SHIFT - blkbits); + block_in_file = folio_pos(folio) >> blkbits; last_block = block_in_file + args->nr_pages * blocks_per_page; last_block_in_file = (i_size_read(inode) + blocksize - 1) >> blkbits; if (last_block > last_block_in_file) @@ -527,7 +527,7 @@ static int __mpage_writepage(struct folio *folio, struct writeback_control *wbc, * The page has no buffers: map it to disk */ BUG_ON(!folio_test_uptodate(folio)); - block_in_file = (sector_t)folio->index << (PAGE_SHIFT - blkbits); + block_in_file = folio_pos(folio) >> blkbits; /* * Whole page beyond EOF? Skip allocating blocks to avoid leaking * space.