The quilt patch titled
Subject: smaps: support "THPeligible" semantics for mTHP with anonymous shmem
has been removed from the -mm tree. Its filename was
support-thpeligible-semantics-for-mthp-with-anonymous-shmem.patch
This patch was dropped because it is obsolete
------------------------------------------------------
From: "Bang Li" <libang.li@xxxxxxxxxxxx>
Subject: smaps: support "THPeligible" semantics for mTHP with anonymous shmem
Date: Fri, 28 Jun 2024 18:49:26 +0800
After the commit 7fb1b252afb5 ("mm: shmem: add mTHP support for
anonymous shmem"), we can configure different policies through
the multi-size THP sysfs interface for anonymous shmem. But
currently "THPeligible" indicates only whether the mapping is
eligible for allocating THP-pages as well as the THP is PMD
mappable or not for anonymous shmem, we need to support semantics
for mTHP with anonymous shmem similar to those for mTHP with
anonymous memory.
Link: https://lkml.kernel.org/r/20240628104926.34209-1-libang.li@xxxxxxxxxxxx
Signed-off-by: Bang Li <libang.li@xxxxxxxxxxxx>
Cc: Baolin Wang <baolin.wang@xxxxxxxxxxxxxxxxx>
Cc: David Hildenbrand <david@xxxxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: Kefeng Wang <wangkefeng.wang@xxxxxxxxxx>
Cc: Ryan Roberts <ryan.roberts@xxxxxxx>
Cc: Zi Yan <ziy@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/proc/task_mmu.c | 10 +++++++---
include/linux/huge_mm.h | 11 +++++++++++
mm/shmem.c | 9 +--------
3 files changed, 19 insertions(+), 11 deletions(-)
--- a/fs/proc/task_mmu.c~support-thpeligible-semantics-for-mthp-with-anonymous-shmem
+++ a/fs/proc/task_mmu.c
@@ -1145,6 +1145,7 @@ static int show_smap(struct seq_file *m,
{
struct vm_area_struct *vma = v;
struct mem_size_stats mss = {};
+ bool thp_eligible;
smap_gather_stats(vma, &mss, 0);
@@ -1157,9 +1158,12 @@ static int show_smap(struct seq_file *m,
__show_smap(m, &mss, false);
- seq_printf(m, "THPeligible: %8u\n",
- !!thp_vma_allowable_orders(vma, vma->vm_flags,
- TVA_SMAPS | TVA_ENFORCE_SYSFS, THP_ORDERS_ALL));
+ thp_eligible = !!thp_vma_allowable_orders(vma, vma->vm_flags,
+ TVA_SMAPS | TVA_ENFORCE_SYSFS, THP_ORDERS_ALL);
+ if (vma_is_anon_shmem(vma))
+ thp_eligible = !!shmem_allowable_huge_orders(file_inode(vma->vm_file),
+ vma, vma->vm_pgoff, thp_eligible);
+ seq_printf(m, "THPeligible: %8u\n", thp_eligible);
if (arch_pkeys_enabled())
seq_printf(m, "ProtectionKey: %8u\n", vma_pkey(vma));
--- a/include/linux/huge_mm.h~support-thpeligible-semantics-for-mthp-with-anonymous-shmem
+++ a/include/linux/huge_mm.h
@@ -267,6 +267,10 @@ unsigned long thp_vma_allowable_orders(s
return __thp_vma_allowable_orders(vma, vm_flags, tva_flags, orders);
}
+unsigned long shmem_allowable_huge_orders(struct inode *inode,
+ struct vm_area_struct *vma, pgoff_t index,
+ bool global_huge);
+
struct thpsize {
struct kobject kobj;
struct list_head node;
@@ -462,6 +466,13 @@ static inline unsigned long thp_vma_allo
{
return 0;
}
+
+static inline unsigned long shmem_allowable_huge_orders(struct inode *inode,
+ struct vm_area_struct *vma, pgoff_t index,
+ bool global_huge)
+{
+ return 0;
+}
#define transparent_hugepage_flags 0UL
--- a/mm/shmem.c~support-thpeligible-semantics-for-mthp-with-anonymous-shmem
+++ a/mm/shmem.c
@@ -1622,7 +1622,7 @@ static gfp_t limit_gfp_mask(gfp_t huge_g
}
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
-static unsigned long shmem_allowable_huge_orders(struct inode *inode,
+unsigned long shmem_allowable_huge_orders(struct inode *inode,
struct vm_area_struct *vma, pgoff_t index,
bool global_huge)
{
@@ -1707,13 +1707,6 @@ static unsigned long shmem_suitable_orde
return orders;
}
#else
-static unsigned long shmem_allowable_huge_orders(struct inode *inode,
- struct vm_area_struct *vma, pgoff_t index,
- bool global_huge)
-{
- return 0;
-}
-
static unsigned long shmem_suitable_orders(struct inode *inode, struct vm_fault *vmf,
struct address_space *mapping, pgoff_t index,
unsigned long orders)
_
Patches currently in -mm which might be from libang.li@xxxxxxxxxxxx are
mm-shmem-fix-input-and-output-inconsistencies.patch
