niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

riscv: Fix arch_hugetlb_migration_supported() for NAPOT

Browse source 
arch_hugetlb_migration_supported() must be reimplemented to add support
for NAPOT hugepages, which is done here.

Fixes: 82a1a1f3bf ("riscv: mm: support Svnapot in hugetlb page")
Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com>
Link: https://lore.kernel.org/r/20240130120114.106003-1-alexghiti@rivosinc.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
This commit is contained in:
Alexandre Ghiti 2024-01-30 13:01:14 +01:00 • committed by Palmer Dabbelt
parent 97cf301fa4
commit ce68c03545
No known key found for this signature in database
GPG key ID: 2E1319F35FBB1889
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/riscv/include/asm/hugetlb.h
View file

@ -11,6 +11,9 @@ static inline void arch_clear_hugepage_flags(struct page *page)
} }
#define arch_clear_hugepage_flags arch_clear_hugepage_flags #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 #ifdef CONFIG_RISCV_ISA_SVNAPOT
#define __HAVE_ARCH_HUGE_PTE_CLEAR #define __HAVE_ARCH_HUGE_PTE_CLEAR
void huge_pte_clear(struct mm_struct *mm, unsigned long addr, void huge_pte_clear(struct mm_struct *mm, unsigned long addr,

16
arch/riscv/mm/hugetlbpage.c
View file

@ -364,7 +364,7 @@ void huge_pte_clear(struct mm_struct *mm,
pte_clear(mm, addr, ptep); 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; unsigned long order;
@ -392,7 +392,7 @@ arch_initcall(napot_hugetlbpages_init);
#else #else
static __init bool is_napot_size(unsigned long size) static bool is_napot_size(unsigned long size)
{ {
return false; return false;
} }
@ -409,7 +409,7 @@ int pmd_huge(pmd_t pmd)
return pmd_leaf(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) if (size == HPAGE_SIZE)
return true; return true;
@ -421,6 +421,16 @@ bool __init arch_hugetlb_valid_size(unsigned long size)
return false; 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 #ifdef CONFIG_CONTIG_ALLOC
static __init int gigantic_pages_init(void) static __init int gigantic_pages_init(void)
{ {