From: Andrew Morton <akpm@linux-foundation.org>
To: mm-commits@vger.kernel.org,ziy@nvidia.com,wangkefeng.wang@huawei.com,ryan.roberts@arm.com,hughd@google.com,david@redhat.com,baolin.wang@linux.alibaba.com,libang.li@antgroup.com,akpm@linux-foundation.org
Subject: [obsolete] support-thpeligible-semantics-for-mthp-with-anonymous-shmem.patch removed from -mm tree
Date: Mon, 01 Jul 2024 20:31:26 -0700 [thread overview]
Message-ID: <20240702033126.CD8CEC116B1@smtp.kernel.org> (raw)
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@antgroup.com>
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@antgroup.com
Signed-off-by: Bang Li <libang.li@antgroup.com>
Cc: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Kefeng Wang <wangkefeng.wang@huawei.com>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
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@antgroup.com are
mm-shmem-fix-input-and-output-inconsistencies.patch
reply other threads:[~2024-07-02 3:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240702033126.CD8CEC116B1@smtp.kernel.org \
--to=akpm@linux-foundation.org \
--cc=baolin.wang@linux.alibaba.com \
--cc=david@redhat.com \
--cc=hughd@google.com \
--cc=libang.li@antgroup.com \
--cc=mm-commits@vger.kernel.org \
--cc=ryan.roberts@arm.com \
--cc=wangkefeng.wang@huawei.com \
--cc=ziy@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.