The patch titled
Subject: mm: thp: make transhuge_vma_suitable available for anonymous THP
has been added to the -mm tree. Its filename is
mm-thp-make-transhuge_vma_suitable-available-for-anonymous-thp.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-thp-make-transhuge_vma_suitable-available-for-anonymous-thp.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-thp-make-transhuge_vma_suitable-available-for-anonymous-thp.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Yang Shi <yang.shi@xxxxxxxxxxxxxxxxx>
Subject: mm: thp: make transhuge_vma_suitable available for anonymous THP
The transhuge_vma_suitable() was only available for shmem THP, but
anonymous THP has the same check except pgoff check. And, it will be used
for THP eligible check in the later patch, so make it available for all
kind of THPs. This also helps reduce code duplication slightly.
Since anonymous THP doesn't have to check pgoff, so make pgoff check
shmem vma only.
Link: http://lkml.kernel.org/r/1560401041-32207-2-git-send-email-yang.shi@xxxxxxxxxxxxxxxxx
Signed-off-by: Yang Shi <yang.shi@xxxxxxxxxxxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/huge_memory.c | 2 +-
mm/internal.h | 25 +++++++++++++++++++++++++
mm/memory.c | 13 -------------
3 files changed, 26 insertions(+), 14 deletions(-)
--- a/mm/huge_memory.c~mm-thp-make-transhuge_vma_suitable-available-for-anonymous-thp
+++ a/mm/huge_memory.c
@@ -691,7 +691,7 @@ vm_fault_t do_huge_pmd_anonymous_page(st
struct page *page;
unsigned long haddr = vmf->address & HPAGE_PMD_MASK;
- if (haddr < vma->vm_start || haddr + HPAGE_PMD_SIZE > vma->vm_end)
+ if (!transhuge_vma_suitable(vma, haddr))
return VM_FAULT_FALLBACK;
if (unlikely(anon_vma_prepare(vma)))
return VM_FAULT_OOM;
--- a/mm/internal.h~mm-thp-make-transhuge_vma_suitable-available-for-anonymous-thp
+++ a/mm/internal.h
@@ -551,4 +551,29 @@ static inline bool is_migrate_highatomic
void setup_zone_pageset(struct zone *zone);
extern struct page *alloc_new_node_page(struct page *page, unsigned long node);
+
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+#define HPAGE_CACHE_INDEX_MASK (HPAGE_PMD_NR - 1)
+static inline bool transhuge_vma_suitable(struct vm_area_struct *vma,
+ unsigned long haddr)
+{
+ /* Don't have to check pgoff for anonymous vma */
+ if (!vma_is_anonymous(vma)) {
+ if (((vma->vm_start >> PAGE_SHIFT) & HPAGE_CACHE_INDEX_MASK) !=
+ (vma->vm_pgoff & HPAGE_CACHE_INDEX_MASK))
+ return false;
+ }
+
+ if (haddr < vma->vm_start || haddr + HPAGE_PMD_SIZE > vma->vm_end)
+ return false;
+ return true;
+}
+#else
+static inline bool transhuge_vma_suitable(struct vma_area_struct *vma,
+ unsigned long haddr)
+{
+ return false;
+}
+#endif
+
#endif /* __MM_INTERNAL_H */
--- a/mm/memory.c~mm-thp-make-transhuge_vma_suitable-available-for-anonymous-thp
+++ a/mm/memory.c
@@ -3201,19 +3201,6 @@ map_pte:
}
#ifdef CONFIG_TRANSPARENT_HUGE_PAGECACHE
-
-#define HPAGE_CACHE_INDEX_MASK (HPAGE_PMD_NR - 1)
-static inline bool transhuge_vma_suitable(struct vm_area_struct *vma,
- unsigned long haddr)
-{
- if (((vma->vm_start >> PAGE_SHIFT) & HPAGE_CACHE_INDEX_MASK) !=
- (vma->vm_pgoff & HPAGE_CACHE_INDEX_MASK))
- return false;
- if (haddr < vma->vm_start || haddr + HPAGE_PMD_SIZE > vma->vm_end)
- return false;
- return true;
-}
-
static void deposit_prealloc_pte(struct vm_fault *vmf)
{
struct vm_area_struct *vma = vmf->vma;
_
Patches currently in -mm which might be from yang.shi@xxxxxxxxxxxxxxxxx are
mm-filemap-correct-the-comment-about-vm_fault_retry.patch
mm-vmscan-remove-double-slab-pressure-by-incing-sc-nr_scanned.patch
mm-vmscan-correct-some-vmscan-counters-for-thp-swapout.patch
mm-thp-make-transhuge_vma_suitable-available-for-anonymous-thp.patch
mm-thp-fix-false-negative-of-shmem-vmas-thp-eligibility.patch
