From: "Pankaj Raghav (Samsung)" <kernel@pankajraghav.com>
To: david@fromorbit.com, willy@infradead.org,
chandan.babu@oracle.com, djwong@kernel.org, brauner@kernel.org,
akpm@linux-foundation.org
Cc: yang@os.amperecomputing.com, linux-kernel@vger.kernel.org,
linux-mm@kvack.org, john.g.garry@oracle.com,
linux-fsdevel@vger.kernel.org, hare@suse.de,
p.raghav@samsung.com, mcgrof@kernel.org, gost.dev@samsung.com,
cl@os.amperecomputing.com, linux-xfs@vger.kernel.org,
kernel@pankajraghav.com, hch@lst.de, Zi Yan <ziy@nvidia.com>,
Dave Chinner <dchinner@redhat.com>
Subject: [PATCH v9 09/10] xfs: make the calculation generic in xfs_sb_validate_fsb_count()
Date: Thu, 4 Jul 2024 11:23:19 +0000 [thread overview]
Message-ID: <20240704112320.82104-10-kernel@pankajraghav.com> (raw)
In-Reply-To: <20240704112320.82104-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.
Signed-off-by: Pankaj Raghav <p.raghav@samsung.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
---
fs/xfs/xfs_mount.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 09eef1721ef4f..3949f720b5354 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -132,11 +132,16 @@ xfs_sb_validate_fsb_count(
xfs_sb_t *sbp,
uint64_t nblocks)
{
+ 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)
+ if (max_bytes >> PAGE_SHIFT > ULONG_MAX)
return -EFBIG;
return 0;
}
--
2.44.1
next prev parent reply other threads:[~2024-07-04 11:24 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-04 11:23 [PATCH v9 00/10] enable bs > ps in XFS Pankaj Raghav (Samsung)
2024-07-04 11:23 ` [PATCH v9 01/10] fs: Allow fine-grained control of folio sizes Pankaj Raghav (Samsung)
2024-07-04 11:23 ` [PATCH v9 02/10] filemap: allocate mapping_min_order folios in the page cache Pankaj Raghav (Samsung)
2024-07-04 11:23 ` [PATCH v9 03/10] readahead: allocate folios with mapping_min_order in readahead Pankaj Raghav (Samsung)
2024-07-04 11:23 ` [PATCH v9 04/10] mm: split a folio in minimum folio order chunks Pankaj Raghav (Samsung)
2024-07-08 13:53 ` Zi Yan
2024-07-09 11:04 ` Pankaj Raghav (Samsung)
2024-07-09 12:49 ` Zi Yan
2024-07-04 11:23 ` [PATCH v9 05/10] filemap: cap PTE range to be created to allowed zero fill in folio_map_range() Pankaj Raghav (Samsung)
2024-07-04 11:23 ` [PATCH v9 06/10] iomap: fix iomap_dio_zero() for fs bs > system page size Pankaj Raghav (Samsung)
2024-07-04 15:37 ` Hannes Reinecke
2024-07-04 22:13 ` Dave Chinner
2024-07-05 6:14 ` Hannes Reinecke
2024-07-05 14:19 ` Pankaj Raghav (Samsung)
2024-07-08 17:56 ` Darrick J. Wong
2024-07-08 22:18 ` Dave Chinner
2024-07-04 11:23 ` [PATCH v9 07/10] xfs: use kvmalloc for xattr buffers Pankaj Raghav (Samsung)
2024-07-04 11:23 ` [PATCH v9 08/10] xfs: expose block size in stat Pankaj Raghav (Samsung)
2024-07-04 11:23 ` Pankaj Raghav (Samsung) [this message]
2024-07-04 11:23 ` [PATCH v9 10/10] xfs: enable block size larger than page size support Pankaj Raghav (Samsung)
2024-07-08 22:12 ` [PATCH v9 00/10] enable bs > ps in XFS Luis Chamberlain
2024-07-08 22:27 ` Matthew Wilcox
2024-07-08 22:40 ` Stephen Rothwell
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=20240704112320.82104-10-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=dchinner@redhat.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=ziy@nvidia.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