linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: "Pankaj Raghav (Samsung)" <kernel@pankajraghav.com>
To: david@fromorbit.com, djwong@kernel.org, chandan.babu@oracle.com,
	brauner@kernel.org, akpm@linux-foundation.org,
	willy@infradead.org
Cc: mcgrof@kernel.org, linux-mm@kvack.org, hare@suse.de,
	linux-kernel@vger.kernel.org, yang@os.amperecomputing.com,
	Zi Yan <zi.yan@sent.com>,
	linux-xfs@vger.kernel.org, p.raghav@samsung.com,
	linux-fsdevel@vger.kernel.org, kernel@pankajraghav.com,
	hch@lst.de, gost.dev@samsung.com, cl@os.amperecomputing.com,
	john.g.garry@oracle.com
Subject: [PATCH v7 10/11] xfs: make the calculation generic in xfs_sb_validate_fsb_count()
Date: Fri,  7 Jun 2024 14:59:01 +0000	[thread overview]
Message-ID: <20240607145902.1137853-11-kernel@pankajraghav.com> (raw)
In-Reply-To: <20240607145902.1137853-1-kernel@pankajraghav.com>

From: Pankaj Raghav <p.raghav@samsung.com>

Instead of assuming that PAGE_SHIFT is always higher than the blocklog,
make the calculation generic so that page cache count can be calculated
correctly for LBS.

Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Pankaj Raghav <p.raghav@samsung.com>
---
 fs/xfs/xfs_mount.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 09eef1721ef4..46cb0384143b 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -132,11 +132,19 @@ xfs_sb_validate_fsb_count(
 	xfs_sb_t	*sbp,
 	uint64_t	nblocks)
 {
+	uint64_t		max_index;
+	uint64_t		max_bytes;
+
 	ASSERT(PAGE_SHIFT >= sbp->sb_blocklog);
 	ASSERT(sbp->sb_blocklog >= BBSHIFT);
 
+	if (check_shl_overflow(nblocks, sbp->sb_blocklog, &max_bytes))
+		return -EFBIG;
+
 	/* Limited by ULONG_MAX of page cache index */
-	if (nblocks >> (PAGE_SHIFT - sbp->sb_blocklog) > ULONG_MAX)
+	max_index = max_bytes >> PAGE_SHIFT;
+
+	if (max_index > ULONG_MAX)
 		return -EFBIG;
 	return 0;
 }
-- 
2.44.1



  parent reply	other threads:[~2024-06-07 15:00 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-07 14:58 [PATCH v7 00/11] enable bs > ps in XFS Pankaj Raghav (Samsung)
2024-06-07 14:58 ` [PATCH v7 01/11] readahead: rework loop in page_cache_ra_unbounded() Pankaj Raghav (Samsung)
2024-06-07 14:58 ` [PATCH v7 02/11] fs: Allow fine-grained control of folio sizes Pankaj Raghav (Samsung)
2024-06-12 15:38   ` Darrick J. Wong
2024-06-07 14:58 ` [PATCH v7 03/11] filemap: allocate mapping_min_order folios in the page cache Pankaj Raghav (Samsung)
2024-06-12  9:01   ` Hannes Reinecke
2024-06-12 15:40   ` Darrick J. Wong
2024-06-12 17:24   ` Matthew Wilcox
2024-06-13  8:44   ` Christoph Hellwig
2024-06-17  9:58     ` Pankaj Raghav (Samsung)
2024-06-17 12:34       ` Matthew Wilcox
2024-06-07 14:58 ` [PATCH v7 04/11] readahead: allocate folios with mapping_min_order in readahead Pankaj Raghav (Samsung)
2024-06-12 18:50   ` Matthew Wilcox
2024-06-14  9:26     ` Pankaj Raghav (Samsung)
2024-06-17 12:32       ` Matthew Wilcox
2024-06-17 16:04         ` Pankaj Raghav (Samsung)
2024-06-17 16:10           ` Matthew Wilcox
2024-06-17 16:39             ` Pankaj Raghav (Samsung)
2024-06-18  6:56               ` Hannes Reinecke
2024-06-21 12:19                 ` Pankaj Raghav (Samsung)
2024-06-21 13:28                   ` Hannes Reinecke
2024-06-18  6:52             ` Hannes Reinecke
2024-06-07 14:58 ` [PATCH v7 05/11] mm: split a folio in minimum folio order chunks Pankaj Raghav (Samsung)
2024-06-07 16:58   ` Zi Yan
2024-06-07 17:01     ` Matthew Wilcox
2024-06-07 20:45       ` Pankaj Raghav (Samsung)
2024-06-07 20:30     ` Pankaj Raghav (Samsung)
2024-06-07 20:51       ` Zi Yan
2024-06-10  7:26         ` Pankaj Raghav (Samsung)
2024-06-12  9:02   ` Hannes Reinecke
2024-06-07 14:58 ` [PATCH v7 06/11] filemap: cap PTE range to be created to allowed zero fill in folio_map_range() Pankaj Raghav (Samsung)
2024-06-12 19:08   ` Matthew Wilcox
2024-06-13  7:57     ` Luis Chamberlain
2024-06-13  8:07       ` David Hildenbrand
2024-06-13  8:13         ` Luis Chamberlain
2024-06-13  8:16           ` David Hildenbrand
2024-06-13 15:27             ` Luis Chamberlain
2024-06-13 15:32               ` Matthew Wilcox
2024-06-13 15:38                 ` Luis Chamberlain
2024-06-13 15:40                   ` Matthew Wilcox
2024-06-13 19:39                     ` Luis Chamberlain
2024-06-07 14:58 ` [PATCH v7 07/11] iomap: fix iomap_dio_zero() for fs bs > system page size Pankaj Raghav (Samsung)
2024-06-11  7:38   ` John Garry
2024-06-11  9:41     ` Pankaj Raghav (Samsung)
2024-06-11 10:00       ` John Garry
2024-06-12 20:40   ` Darrick J. Wong
2024-06-17 15:08     ` Pankaj Raghav (Samsung)
2024-06-07 14:58 ` [PATCH v7 08/11] xfs: use kvmalloc for xattr buffers Pankaj Raghav (Samsung)
2024-06-07 14:59 ` [PATCH v7 09/11] xfs: expose block size in stat Pankaj Raghav (Samsung)
2024-06-07 14:59 ` Pankaj Raghav (Samsung) [this message]
2024-06-13  8:45   ` [PATCH v7 10/11] xfs: make the calculation generic in xfs_sb_validate_fsb_count() Christoph Hellwig
2024-06-17 16:09     ` Pankaj Raghav (Samsung)
2024-06-07 14:59 ` [PATCH v7 11/11] xfs: enable block size larger than page size support Pankaj Raghav (Samsung)
2024-06-13  8:47   ` Christoph Hellwig
2024-06-17  1:29     ` Dave Chinner
2024-06-17  6:51       ` Christoph Hellwig
2024-06-17 16:31         ` Pankaj Raghav (Samsung)
2024-06-17 23:18         ` Dave Chinner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240607145902.1137853-11-kernel@pankajraghav.com \
    --to=kernel@pankajraghav.com \
    --cc=akpm@linux-foundation.org \
    --cc=brauner@kernel.org \
    --cc=chandan.babu@oracle.com \
    --cc=cl@os.amperecomputing.com \
    --cc=david@fromorbit.com \
    --cc=djwong@kernel.org \
    --cc=gost.dev@samsung.com \
    --cc=hare@suse.de \
    --cc=hch@lst.de \
    --cc=john.g.garry@oracle.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux-xfs@vger.kernel.org \
    --cc=mcgrof@kernel.org \
    --cc=p.raghav@samsung.com \
    --cc=willy@infradead.org \
    --cc=yang@os.amperecomputing.com \
    --cc=zi.yan@sent.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox