Skip to content

Commit de6ee65

Browse files
Liu Yuntaotorvalds
authored andcommitted
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/[email protected] Fixes: f3f0e1d ("khugepaged: add support of collapse for tmpfs/shmem pages") Signed-off-by: Liu Yuntao <[email protected]> Acked-by: Kirill A. Shutemov <[email protected]> Acked-by: Hugh Dickins <[email protected]> Cc: wuxu.wu <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 8670502 commit de6ee65

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

mm/shmem.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -490,9 +490,9 @@ bool shmem_is_huge(struct vm_area_struct *vma,
490490
case SHMEM_HUGE_ALWAYS:
491491
return true;
492492
case SHMEM_HUGE_WITHIN_SIZE:
493-
index = round_up(index, HPAGE_PMD_NR);
493+
index = round_up(index + 1, HPAGE_PMD_NR);
494494
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)
496496
return true;
497497
fallthrough;
498498
case SHMEM_HUGE_ADVISE:

0 commit comments

Comments
 (0)