[012/192] mm/huge_memory.c: remove dedicated macro HPAGE_CACHE_INDEX_MASK

Commit Message

Andrew Morton July 1, 2021, 1:47 a.m. UTC

From: Miaohe Lin <[e-mail]>
Subject: mm/huge_memory.c: remove dedicated macro HPAGE_CACHE_INDEX_MASK

Patch series "Cleanup and fixup for huge_memory:, v3.

This series contains cleanups to remove dedicated macro and remove
unnecessary tlb_remove_page_size() for huge zero pmd.  Also this adds
missing read-only THP checking for transparent_hugepage_enabled() and
avoids discarding hugepage if other processes are mapping it.  More
details can be found in the respective changelogs.


Thi patch (of 5):

Rewrite the pgoff checking logic to remove macro HPAGE_CACHE_INDEX_MASK
which is only used here to simplify the code.

Link: https://lkml.kernel.org/r/[e-mail]
Link: https://lkml.kernel.org/r/[e-mail]
Signed-off-by: Miaohe Lin <[e-mail]>
Reviewed-by: Yang Shi <[e-mail]>
Reviewed-by: Anshuman Khandual <[e-mail]>
Reviewed-by: David Hildenbrand <[e-mail]>
Cc: Zi Yan <[e-mail]>
Cc: William Kucharski <[e-mail]>
Cc: Matthew Wilcox <[e-mail]>
Cc: "Aneesh Kumar K . V" <[e-mail]>
Cc: Ralph Campbell <[e-mail]>
Cc: Song Liu <[e-mail]>
Cc: Kirill A. Shutemov <[e-mail]>
Cc: Rik van Riel <[e-mail]>
Cc: Johannes Weiner <[e-mail]>
Cc: Minchan Kim <[e-mail]>
Cc: Hugh Dickins <[e-mail]>
Cc: Alexey Dobriyan <[e-mail]>
Cc: Mike Kravetz <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

 include/linux/huge_mm.h |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Patch

--- a/include/linux/huge_mm.h~mm-huge_memoryc-remove-dedicated-macro-hpage_cache_index_mask
+++ a/include/linux/huge_mm.h
@@ -152,15 +152,13 @@  static inline bool __transparent_hugepag
 
 bool transparent_hugepage_enabled(struct vm_area_struct *vma);
 
-#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))
+		if (!IS_ALIGNED((vma->vm_start >> PAGE_SHIFT) - vma->vm_pgoff,
+				HPAGE_PMD_NR))
 			return false;
 	}