Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mm/shmem.c: fix judgment error in shmem_is_huge()

In the case of SHMEM_HUGE_WITHIN_SIZE, the page index is not rounded up
correctly. When the page index points to the first page in a huge page,
round_up() cannot bring it to the end of the huge page, but to the end
of the previous one.

An example:

HPAGE_PMD_NR on my machine is 512(2 MB huge page size). After
allcoating a 3000 KB buffer, I access it at location 2050 KB. In
shmem_is_huge(), the corresponding index happens to be 512. After
rounded up by HPAGE_PMD_NR, it will still be 512 which is smaller than
i_size, and shmem_is_huge() will return true. As a result, my buffer
takes an additional huge page, and that shouldn't happen when
shmem_enabled is set to within_size.

Link: https://lkml.kernel.org/r/20210909032007.18353-1-liuyuntao10@huawei.com
Fixes: f3f0e1d2150b2b ("khugepaged: add support of collapse for tmpfs/shmem pages")
Signed-off-by: Liu Yuntao <liuyuntao10@huawei.com>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Hugh Dickins <hughd@google.com>
Cc: wuxu.wu <wuxu.wu@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Liu Yuntao and committed by
Linus Torvalds
de6ee659 86705024

+2 -2
+2 -2
mm/shmem.c
··· 490 490 case SHMEM_HUGE_ALWAYS: 491 491 return true; 492 492 case SHMEM_HUGE_WITHIN_SIZE: 493 - index = round_up(index, HPAGE_PMD_NR); 493 + index = round_up(index + 1, HPAGE_PMD_NR); 494 494 i_size = round_up(i_size_read(inode), PAGE_SIZE); 495 - if (i_size >= HPAGE_PMD_SIZE && (i_size >> PAGE_SHIFT) >= index) 495 + if (i_size >> PAGE_SHIFT >= index) 496 496 return true; 497 497 fallthrough; 498 498 case SHMEM_HUGE_ADVISE: