Re: [RFC v5 PATCH] mm: shmem: make stat.st_blksize return huge page size if THP is on
From: Andrew Morton
Date: Mon Apr 30 2018 - 19:40:08 EST
On Wed, 25 Apr 2018 22:13:53 +0800 Yang Shi <yang.shi@xxxxxxxxxxxxxxxxx> wrote:
> Since tmpfs THP was supported in 4.8, hugetlbfs is not the only
> filesystem with huge page support anymore. tmpfs can use huge page via
> THP when mounting by "huge=" mount option.
>
> When applications use huge page on hugetlbfs, it just need check the
> filesystem magic number, but it is not enough for tmpfs. Make
> stat.st_blksize return huge page size if it is mounted by appropriate
> "huge=" option to give applications a hint to optimize the behavior with
> THP.
>
> Some applications may not do wisely with THP. For example, QEMU may mmap
> file on non huge page aligned hint address with MAP_FIXED, which results
> in no pages are PMD mapped even though THP is used. Some applications
> may mmap file with non huge page aligned offset. Both behaviors make THP
> pointless.
>
> statfs.f_bsize still returns 4KB for tmpfs since THP could be split, and it
> also may fallback to 4KB page silently if there is not enough huge page.
> Furthermore, different f_bsize makes max_blocks and free_blocks
> calculation harder but without too much benefit. Returning huge page
> size via stat.st_blksize sounds good enough.
>
> Since PUD size huge page for THP has not been supported, now it just
> returns HPAGE_PMD_SIZE.
>
> ...
>
> --- a/mm/shmem.c
> +++ b/mm/shmem.c
> @@ -571,6 +571,16 @@ static unsigned long shmem_unused_huge_shrink(struct shmem_sb_info *sbinfo,
> }
> #endif /* CONFIG_TRANSPARENT_HUGE_PAGECACHE */
>
> +static inline bool is_huge_enabled(struct shmem_sb_info *sbinfo)
> +{
> + if (IS_ENABLED(CONFIG_TRANSPARENT_HUGE_PAGECACHE) &&
> + (shmem_huge == SHMEM_HUGE_FORCE || sbinfo->huge) &&
> + shmem_huge != SHMEM_HUGE_DENY)
> + return true;
> + else
> + return false;
> +}
Nit: we don't need that `else'. Checkpatch normally warns about this,
but not in this case.
--- a/mm/shmem.c~mm-shmem-make-statst_blksize-return-huge-page-size-if-thp-is-on-fix
+++ a/mm/shmem.c
@@ -577,8 +577,7 @@ static inline bool is_huge_enabled(struc
(shmem_huge == SHMEM_HUGE_FORCE || sbinfo->huge) &&
shmem_huge != SHMEM_HUGE_DENY)
return true;
- else
- return false;
+ return false;
}
/*
_