If we end up supporting a larger block size than PAGE_SIZE the calculations in
shmem_default_max_blocks() need to be modified to take into account the fact
that multiple pages would be required for a single block.
Today the max number of blocks is computed based on the fact that we
will by default use half of the available memory and each block is of
PAGE_SIZE.
And so we end up with:
totalram_pages() / 2
That's becauase blocksize == PAGE_SIZE. When blocksize > PAGE_SIZE
we need to consider how how many blocks fit into totalram_pages() first,
then just divide by 2. This ends up being:
totalram_pages * PAGE_SIZE / blocksize / 2
totalram_pages * 2^PAGE_SHIFT / 2^bbits / 2
totalram_pages * 2^(PAGE_SHIFT - bbits - 1)
We know bbits > PAGE_SHIFT so we'll end up with a negative
power of 2. 2^(-some_val). We can factor the -1 out by changing
this to a division of power of 2 and flipping the values for
the signs:
-1 * (PAGE_SHIFT - bbits -1) = (-PAGE_SHIFT + bbits + 1)
= (bbits - PAGE_SHIFT + 1)
And so we end up with:
totalram_pages / 2^(bbits - PAGE_SHIFT + 1)
We use __ffs(blocksize) as this computation is needed early on before
any inode is established.
Signed-off-by: Luis Chamberlain <mcgrof@xxxxxxxxxx>
---
mm/shmem.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/mm/shmem.c b/mm/shmem.c
index 162384b58a5c..b83596467706 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -136,9 +136,11 @@ static u64 shmem_sb_blocksize(struct shmem_sb_info *sbinfo)
return sbinfo->blocksize;
}
-static unsigned long shmem_default_max_blocks(void)
+static unsigned long shmem_default_max_blocks(u64 blocksize)
{
- return totalram_pages() / 2;
+ if (blocksize == shmem_default_bsize())
+ return totalram_pages() / 2;
+ return totalram_pages() >> (__ffs(blocksize) - PAGE_SHIFT + 1);
}
static unsigned long shmem_default_max_inodes(void)
@@ -3816,7 +3818,7 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param)
}
if (*rest)
goto bad_value;
- ctx->blocks = DIV_ROUND_UP(size, PAGE_SIZE);
+ ctx->blocks = DIV_ROUND_UP(size, shmem_default_bsize());
ctx->seen |= SHMEM_SEEN_BLOCKS;
break;
case Opt_nr_blocks:
@@ -4023,7 +4025,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root)
{
struct shmem_sb_info *sbinfo = SHMEM_SB(root->d_sb);
- if (sbinfo->max_blocks != shmem_default_max_blocks())
+ if (sbinfo->max_blocks != shmem_default_max_blocks(shmem_default_bsize()))
seq_printf(seq, ",size=%luk",
sbinfo->max_blocks << (PAGE_SHIFT - 10));
if (sbinfo->max_inodes != shmem_default_max_inodes())
@@ -4105,7 +4107,7 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc)
*/
if (!(sb->s_flags & SB_KERNMOUNT)) {
if (!(ctx->seen & SHMEM_SEEN_BLOCKS))
- ctx->blocks = shmem_default_max_blocks();
+ ctx->blocks = shmem_default_max_blocks(shmem_default_bsize());
if (!(ctx->seen & SHMEM_SEEN_INODES))
ctx->inodes = shmem_default_max_inodes();
if (!(ctx->seen & SHMEM_SEEN_INUMS))
--
2.39.2
