mm/thp: Rename TRANSPARENT_HUGEPAGE_NEVER_DAX to _UNSUPPORTED
Subsystems (2)
PATCH 1/1 mm/thp: Rename TRANSPARENT_HUGEPAGE_NEVER_DAX to _UNSUPPORTED
TRANSPARENT_HUGEPAGE_NEVER_DAX has nothing to do with DAX. It's set when has_transparent_hugepage() returns false, checked in hugepage_vma_check() and will disable THP completely if false. Rename it to reflect its real purpose.
--- include/linux/huge_mm.h | 2 +- mm/huge_memory.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
include/linux/huge_mm.h +1 -1
@@ -79,7 +79,7 @@ static inline vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, pfn_t pfn, }enum transparent_hugepage_flag { -TRANSPARENT_HUGEPAGE_NEVER_DAX , +TRANSPARENT_HUGEPAGE_UNSUPPORTED ,TRANSPARENT_HUGEPAGE_FLAG ,TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG ,TRANSPARENT_HUGEPAGE_DEFRAG_DIRECT_FLAG ,
mm/huge_memory.c +2 -2
@@ -88,7 +88,7 @@ bool hugepage_vma_check(struct vm_area_struct *vma, unsigned long vm_flags,/* * If the hardware/firmware marked hugepage support disabled. */ -if (transparent_hugepage_flags & (1 <<TRANSPARENT_HUGEPAGE_NEVER_DAX )) +if (transparent_hugepage_flags & (1 <<TRANSPARENT_HUGEPAGE_UNSUPPORTED ))return false;/* khugepaged doesn't collapse DAX vma, but page fault is fine. */
@@ -464,7 +464,7 @@ static int __init hugepage_init(void)* Hardware doesn't support hugepages, hence disable * DAX PMD support. */ - transparent_hugepage_flags =1 <<TRANSPARENT_HUGEPAGE_NEVER_DAX ; + transparent_hugepage_flags =1 <<TRANSPARENT_HUGEPAGE_UNSUPPORTED ;return -EINVAL ; }
Signature · 1 line
2.39.1
Quoted 5 lines · Peter Xu
TRANSPARENT_HUGEPAGE_NEVER_DAXhas nothing to do with DAX. It's set whenhas_transparent_hugepage()returns false, checked inhugepage_vma_check()and will disable THP completely if false. Rename it to reflect its real purpose.
Makes sense to me. Reviewed-by: Yang Shi <[email protected]>
Quoted 47 lines
Cc Aneesh Kumar K.V <[email protected]>Cc Yang Shi <[email protected]>Signed-off-by Peter Xu <[email protected]>--- include/linux/huge_mm.h | 2 +- mm/huge_memory.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)include/linux/huge_mm.h +1
-1@@ -79,7 +79,7 @@ static inline vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, pfn_t pfn, }enum transparent_hugepage_flag { -TRANSPARENT_HUGEPAGE_NEVER_DAX , +TRANSPARENT_HUGEPAGE_UNSUPPORTED ,TRANSPARENT_HUGEPAGE_FLAG ,TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG ,TRANSPARENT_HUGEPAGE_DEFRAG_DIRECT_FLAG ,mm/huge_memory.c +2
-3@@ -88,7 +88,7 @@ bool hugepage_vma_check(struct vm_area_struct *vma, unsigned long vm_flags,/* * If the hardware/firmware marked hugepage support disabled. */ -if (transparent_hugepage_flags & (1 <<TRANSPARENT_HUGEPAGE_NEVER_DAX )) +if (transparent_hugepage_flags & (1 <<TRANSPARENT_HUGEPAGE_UNSUPPORTED ))return false;/* khugepaged doesn't collapse DAX vma, but page fault is fine. */ @@ -464,7 +464,7 @@ static int __init hugepage_init(void)* Hardware doesn't support hugepages, hence disable * DAX PMD support. */ - transparent_hugepage_flags =1 <<TRANSPARENT_HUGEPAGE_NEVER_DAX ; + transparent_hugepage_flags =1 <<TRANSPARENT_HUGEPAGE_UNSUPPORTED ;return -EINVAL ; } --2.39.1
Quoted 40 lines · Peter Xu
TRANSPARENT_HUGEPAGE_NEVER_DAXhas nothing to do with DAX. It's set whenhas_transparent_hugepage()returns false, checked inhugepage_vma_check()and will disable THP completely if false. Rename it to reflect its real purpose.Cc Aneesh Kumar K.V <[email protected]>Cc Yang Shi <[email protected]>Signed-off-by Peter Xu <[email protected]>--- include/linux/huge_mm.h | 2 +- mm/huge_memory.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)include/linux/huge_mm.h +1
-1@@ -79,7 +79,7 @@ static inline vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, pfn_t pfn, }enum transparent_hugepage_flag { -TRANSPARENT_HUGEPAGE_NEVER_DAX , +TRANSPARENT_HUGEPAGE_UNSUPPORTED ,TRANSPARENT_HUGEPAGE_FLAG ,TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG ,TRANSPARENT_HUGEPAGE_DEFRAG_DIRECT_FLAG ,mm/huge_memory.c +1
-1@@ -88,7 +88,7 @@ bool hugepage_vma_check(struct vm_area_struct *vma, unsigned long vm_flags,/* * If the hardware/firmware marked hugepage support disabled. */ -if (transparent_hugepage_flags & (1 <<TRANSPARENT_HUGEPAGE_NEVER_DAX )) +if (transparent_hugepage_flags & (1 <<TRANSPARENT_HUGEPAGE_UNSUPPORTED ))return false;/* khugepaged doesn't collapse DAX vma, but page fault is fine. */
mm/huge_memory.c static int __init hugepage_init(void) · line 465
Quoted 2 lines
mm/huge_memory.c +0
-0@@ -464,7 +464,7 @@ static int __init hugepage_init(void)* Hardware doesn't support hugepages, hence disable * DAX PMD support.
We should also fixup that comment then, no?
Signature · 3 lines
Thanks, David / dhildenb
Quoted 36 lines · David Hildenbrand
Quoted 35 lines · Peter Xu
TRANSPARENT_HUGEPAGE_NEVER_DAXhas nothing to do with DAX. It's set whenhas_transparent_hugepage()returns false, checked inhugepage_vma_check()and will disable THP completely if false. Rename it to reflect its real purpose.Cc Aneesh Kumar K.V <[email protected]>Cc Yang Shi <[email protected]>Signed-off-by Peter Xu <[email protected]>--- include/linux/huge_mm.h | 2 +- mm/huge_memory.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)include/linux/huge_mm.h +1
-1@@ -79,7 +79,7 @@ static inline vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, pfn_t pfn, }enum transparent_hugepage_flag { -TRANSPARENT_HUGEPAGE_NEVER_DAX , +TRANSPARENT_HUGEPAGE_UNSUPPORTED ,TRANSPARENT_HUGEPAGE_FLAG ,TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG ,TRANSPARENT_HUGEPAGE_DEFRAG_DIRECT_FLAG ,mm/huge_memory.c +1
-1@@ -88,7 +88,7 @@ bool hugepage_vma_check(struct vm_area_struct *vma, unsigned long vm_flags,/* * If the hardware/firmware marked hugepage support disabled. */ -if (transparent_hugepage_flags & (1 <<TRANSPARENT_HUGEPAGE_NEVER_DAX )) +if (transparent_hugepage_flags & (1 <<TRANSPARENT_HUGEPAGE_UNSUPPORTED ))
Quoted 8 lines
mm/huge_memory.c static int __init hugepage_init(void) · line 465
Quoted 5 lines
mm/huge_memory.c +0
-0return false;/* khugepaged doesn't collapse DAX vma, but page fault is fine. */ @@ -464,7 +464,7 @@ static int __init hugepage_init(void)* Hardware doesn't support hugepages, hence disable * DAX PMD support. We should also fixup that comment then, no?
Yes, I'd drop the comment since the code explains itself. One fixup attached. Thanks.
Signature · 1 line
Peter Xu
From 0d01260fedfd9d99c1eeac10f9bddd52477823bd Mon Sep 17 00:00:00 2001
From: Peter Xu <[email protected]>
Date: Thu, 16 Mar 2023 11:08:47 -0400
Subject: [PATCH] fixup! mm/thp: rename TRANSPARENT_HUGEPAGE_NEVER_DAX to
_UNSUPPORTED
--- mm/huge_memory.c | 4 ---- 1 file changed, 4 deletions(-)
mm/huge_memory.c +0 -4
@@ -460,10 +460,6 @@ static int __init hugepage_init(void)struct kobject *hugepage_kobj;if (!has_transparent_hugepage ()) { -/* -* Hardware doesn't support hugepages, hence disable -* DAX PMD support. -*/ transparent_hugepage_flags =1 <<TRANSPARENT_HUGEPAGE_UNSUPPORTED ;return -EINVAL ; }
Signature · 1 line
2.39.1
Quoted 46 lines · Peter Xu
Quoted 36 lines · David Hildenbrand
Quoted 35 lines · Peter Xu
TRANSPARENT_HUGEPAGE_NEVER_DAXhas nothing to do with DAX. It's set whenhas_transparent_hugepage()returns false, checked inhugepage_vma_check()and will disable THP completely if false. Rename it to reflect its real purpose.Cc Aneesh Kumar K.V <[email protected]>Cc Yang Shi <[email protected]>Signed-off-by Peter Xu <[email protected]>--- include/linux/huge_mm.h | 2 +- mm/huge_memory.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)include/linux/huge_mm.h +1
-1@@ -79,7 +79,7 @@ static inline vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, pfn_t pfn, }enum transparent_hugepage_flag { -TRANSPARENT_HUGEPAGE_NEVER_DAX , +TRANSPARENT_HUGEPAGE_UNSUPPORTED ,TRANSPARENT_HUGEPAGE_FLAG ,TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG ,TRANSPARENT_HUGEPAGE_DEFRAG_DIRECT_FLAG ,mm/huge_memory.c +1
-1@@ -88,7 +88,7 @@ bool hugepage_vma_check(struct vm_area_struct *vma, unsigned long vm_flags,/* * If the hardware/firmware marked hugepage support disabled. */ -if (transparent_hugepage_flags & (1 <<TRANSPARENT_HUGEPAGE_NEVER_DAX )) +if (transparent_hugepage_flags & (1 <<TRANSPARENT_HUGEPAGE_UNSUPPORTED ))Quoted 8 lines
mm/huge_memory.c static int __init hugepage_init(void) · line 465
Quoted 5 lines
mm/huge_memory.c +0
-0return false;/* khugepaged doesn't collapse DAX vma, but page fault is fine. */ @@ -464,7 +464,7 @@ static int __init hugepage_init(void)* Hardware doesn't support hugepages, hence disable * DAX PMD support. We should also fixup that comment then, no?
Quoted 2 lines
Yes, I'd drop the comment since the code explains itself. One fixup attached. Thanks.
LGTM
Signature · 3 lines
Thanks, David / dhildenb