[PATCH V2] arm64/hugetlb: Define __hugetlb_valid_size()

* [PATCH V2] arm64/hugetlb: Define __hugetlb_valid_size()
@ 2022-02-10 11:16 Anshuman Khandual
  2022-02-10 11:22 ` Catalin Marinas
  2022-02-15 16:48 ` Will Deacon
  0 siblings, 2 replies; 6+ messages in thread
From: Anshuman Khandual @ 2022-02-10 11:16 UTC (permalink / raw)
  To: linux-arm-kernel
  Cc: Anshuman Khandual, Catalin Marinas, Will Deacon, linux-kernel

arch_hugetlb_valid_size() can be just factored out to create another helper
to be used in arch_hugetlb_migration_supported() as well. This just defines
__hugetlb_valid_size() for that purpose.

Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
This applies on v5.17-rc3

Changes in V2:

- s/arm64_hugetlb_valid_size/__hugetlb_valid_size per Catalin
- Restored back warning in arch_hugetlb_migration_supported() per Catalin
- Updated the commit message subject line as required

Changes in V1:

https://lore.kernel.org/all/1644197468-26755-1-git-send-email-anshuman.khandual@arm.com/

 arch/arm64/mm/hugetlbpage.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c
index ffb9c229610a..72ed07fe2c84 100644
--- a/arch/arm64/mm/hugetlbpage.c
+++ b/arch/arm64/mm/hugetlbpage.c
@@ -56,24 +56,19 @@ void __init arm64_hugetlb_cma_reserve(void)
 }
 #endif /* CONFIG_CMA */
 
+static bool __hugetlb_valid_size(unsigned long size);
+
 #ifdef CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION
 bool arch_hugetlb_migration_supported(struct hstate *h)
 {
 	size_t pagesize = huge_page_size(h);
 
-	switch (pagesize) {
-#ifndef __PAGETABLE_PMD_FOLDED
-	case PUD_SIZE:
-		return pud_sect_supported();
-#endif
-	case PMD_SIZE:
-	case CONT_PMD_SIZE:
-	case CONT_PTE_SIZE:
-		return true;
-	}
-	pr_warn("%s: unrecognized huge page size 0x%lx\n",
+	if (!__hugetlb_valid_size(pagesize)) {
+		pr_warn("%s: unrecognized huge page size 0x%lx\n",
 			__func__, pagesize);
-	return false;
+		return false;
+	}
+	return true;
 }
 #endif
 
@@ -504,7 +499,7 @@ static int __init hugetlbpage_init(void)
 }
 arch_initcall(hugetlbpage_init);
 
-bool __init arch_hugetlb_valid_size(unsigned long size)
+static bool __hugetlb_valid_size(unsigned long size)
 {
 	switch (size) {
 #ifndef __PAGETABLE_PMD_FOLDED
@@ -519,3 +514,8 @@ bool __init arch_hugetlb_valid_size(unsigned long size)
 
 	return false;
 }
+
+bool __init arch_hugetlb_valid_size(unsigned long size)
+{
+	return __hugetlb_valid_size(size);
+}
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread