hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IAO6NS

--------------------------------

The large folios is not supported in dynamic pool, so we have to limit order to 0 when it will be allocated from dynamic pool. The allocation in shmem has already been limited in commit d0ef72eca876 ("mm: shmem: add mTHP support for anonymous shmem"), and now we are limit the allocation in anon/file path.

Fixes: ba572beac8be ("mm: thp: support allocation of anonymous multi-size THP") Signed-off-by: Liu Shixin liushixin2@huawei.com --- mm/filemap.c | 3 +++ mm/memory.c | 2 ++ mm/readahead.c | 3 +++ 3 files changed, 8 insertions(+)

diff --git a/mm/filemap.c b/mm/filemap.c index eb96ddf00ba8d..630a3eec5a881 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -47,6 +47,7 @@ #include <linux/splice.h> #include <linux/huge_mm.h> #include <linux/pgtable.h> +#include <linux/dynamic_pool.h> #include <asm/pgalloc.h> #include <asm/tlbflush.h> #include "internal.h" @@ -1931,6 +1932,8 @@ struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index,

if (!mapping_large_folio_support(mapping)) order = 0; + if (order && mm_in_dynamic_pool(current->mm)) + order = 0; if (order > MAX_PAGECACHE_ORDER) order = MAX_PAGECACHE_ORDER; /* If we're not aligned, allocate a smaller folio */ diff --git a/mm/memory.c b/mm/memory.c index 2771c10454e17..84ff5ac8fb968 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4395,6 +4395,8 @@ static struct folio *alloc_anon_folio(struct vm_fault *vmf) */ if (unlikely(userfaultfd_armed(vma))) goto fallback; + if (mm_in_dynamic_pool(vma->vm_mm)) + goto fallback;

/* * Get a list of all the (large) orders below PMD_ORDER that are enabled diff --git a/mm/readahead.c b/mm/readahead.c index a8911f7c161a7..d0b3de43cf23b 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -128,6 +128,7 @@ #include <linux/blk-cgroup.h> #include <linux/fadvise.h> #include <linux/sched/mm.h> +#include <linux/dynamic_pool.h>

#include "internal.h"

@@ -503,6 +504,8 @@ void page_cache_ra_order(struct readahead_control *ractl,

if (!mapping_large_folio_support(mapping) || ra->size < 4) goto fallback; + if (mm_in_dynamic_pool(current->mm)) + goto fallback;

limit = min(limit, index + ra->size - 1);

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IAO6NS

--------------------------------

When HugeTLB and THP are all disabled, HPAGE_PMD_ORDER will trigger build error:

./include/linux/huge_mm.h:109:28: note: in expansion of macro ‘BUILD_BUG’ 109 | #define HPAGE_PMD_SHIFT ({ BUILD_BUG(); 0; })

Fix it by replace HPAGE_PMD_ORDER with PMD_ORDER, which is equal when THP enabled and when THP disabled, it is no really used in shmem_alloc_folio(). So there is no effect when THP disabled.

Fixes: c7fcbe104175 ("mm: shmem: Merge shmem_alloc_hugefolio() with shmem_alloc_folio()") Signed-off-by: Liu Shixin liushixin2@huawei.com --- mm/shmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/shmem.c b/mm/shmem.c index d7a970f7accb7..7b3fa6b9aa289 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1735,7 +1735,7 @@ static struct folio *shmem_alloc_folio(gfp_t gfp, int order, struct folio *folio;

shmem_pseudo_vma_init(&pvma, info, index); - folio = vma_alloc_folio(gfp, order, &pvma, 0, order == HPAGE_PMD_ORDER); + folio = vma_alloc_folio(gfp, order, &pvma, 0, order == PMD_ORDER); shmem_pseudo_vma_destroy(&pvma);

return folio;