riscv: Fix arch_hugetlb_migration_supported() for NAPOT
PATCH 1/1 riscv: Fix arch_hugetlb_migration_supported() for NAPOT
arch_hugetlb_migration_supported() must be reimplemented to add support for NAPOT hugepages, which is done here.
Fixes 82a1a1f3bfb6 ("riscv: mm: support Svnapot in hugetlb page")
Signed-off-by Alexandre Ghiti <[email protected]>
--- arch/riscv/include/asm/hugetlb.h | 3 +++ arch/riscv/mm/hugetlbpage.c | 16 +++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-)
arch/riscv/include/asm/hugetlb.h +3 -0
@@ -11,6 +11,9 @@ static inline void arch_clear_hugepage_flags(struct page *page) }#define arch_clear_hugepage_flags arch_clear_hugepage_flags +bool arch_hugetlb_migration_supported (struct hstate *h); +#define arch_hugetlb_migration_supported arch_hugetlb_migration_supported +#ifdef CONFIG_RISCV_ISA_SVNAPOT #define __HAVE_ARCH_HUGE_PTE_CLEAR void huge_pte_clear(struct mm_struct *mm, unsigned long addr,
arch/riscv/mm/hugetlbpage.c +13 -3
@@ -364,7 +364,7 @@ void huge_pte_clear(struct mm_struct *mm,pte_clear (mm, addr, ptep); } -static __init bool is_napot_size (unsigned long size) +static bool is_napot_size (unsigned long size) {unsigned long order;
@@ -392,7 +392,7 @@ arch_initcall(napot_hugetlbpages_init);#else -static __init bool is_napot_size (unsigned long size) +static bool is_napot_size (unsigned long size) {return false; }
@@ -409,7 +409,7 @@ int pmd_huge(pmd_t pmd)return pmd_leaf (pmd); } -bool __init arch_hugetlb_valid_size (unsigned long size) +static bool __hugetlb_valid_size (unsigned long size) {if (size ==HPAGE_SIZE )return true;
@@ -421,6 +421,16 @@ 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); +} + +bool arch_hugetlb_migration_supported (struct hstate *h) +{ +return __hugetlb_valid_size (huge_page_size (h)); +} +#ifdef CONFIG_CONTIG_ALLOC static __init int gigantic_pages_init (void ) {
Signature · 1 line
2.39.2
This patch was applied to riscv/linux.git (fixes) by Palmer Dabbelt <[email protected]>:
Hello:
This patch was applied to riscv/linux.git (fixes)
by Palmer Dabbelt <[email protected]>:
Quoted 9 lines · On Tue, 30 Jan 2024 13:01:14 +0100 you wrote:
arch_hugetlb_migration_supported()must be reimplemented to add support for NAPOT hugepages, which is done here.Fixes 82a1a1f3bfb6 ("riscv: mm: support Svnapot in hugetlb page")Signed-off-by Alexandre Ghiti <[email protected]>--- arch/riscv/include/asm/hugetlb.h | 3 +++ arch/riscv/mm/hugetlbpage.c | 16 +++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-)
Here is the summary with links:
- [-fixes] riscv: Fix arch_hugetlb_migration_supported() for NAPOT
https://git.kernel.org/riscv/c/ce68c035457b
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html