Skip to content

[PW_SID:1103856] mm/sparse-vmemmap: Provide generic vmemmap_set_pmd() and vmemmap_check_pmd() #2037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
linux-riscv-bot wants to merge 5 commits into
base: workflow__riscv__fixes
Choose a base branch
from
Open

[PW_SID:1103856] mm/sparse-vmemmap: Provide generic vmemmap_set_pmd() and vmemmap_check_pmd() #2037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0835cb1
mm/sparse-vmemmap: provide generic vmemmap_set_pmd() and vmemmap_chec…
songmuchun Jun 1, 2026
76fe120
arm64/mm: drop vmemmap_pmd helpers and use generic code
songmuchun Jun 1, 2026
f677af8
riscv/mm: drop vmemmap_pmd helpers and use generic code
songmuchun Jun 1, 2026
1136e0e
loongarch/mm: drop vmemmap_check_pmd helper and use generic code
songmuchun Jun 1, 2026
4190cf4
sparc/mm: drop vmemmap_check_pmd helper and use generic code
songmuchun Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions arch/arm64/mm/mmu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1775,20 +1775,6 @@ static void free_empty_tables(unsigned long addr, unsigned long end,
}
#endif

void __meminit vmemmap_set_pmd(pmd_t *pmdp, void *p, int node,
unsigned long addr, unsigned long next)
{
pmd_set_huge(pmdp, __pa(p), __pgprot(PROT_SECT_NORMAL));
}

int __meminit vmemmap_check_pmd(pmd_t *pmdp, int node,
unsigned long addr, unsigned long next)
{
vmemmap_verify((pte_t *)pmdp, node, addr, next);

return pmd_leaf(READ_ONCE(*pmdp));
}

int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,
struct vmem_altmap *altmap)
{
Expand Down
11 changes: 0 additions & 11 deletions arch/loongarch/mm/init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,17 +143,6 @@ void __meminit vmemmap_set_pmd(pmd_t *pmd, void *p, int node,
set_pmd_at(&init_mm, addr, pmd, entry);
}

int __meminit vmemmap_check_pmd(pmd_t *pmd, int node,
unsigned long addr, unsigned long next)
{
int huge = pmd_val(pmdp_get(pmd)) & _PAGE_HUGE;

if (huge)
vmemmap_verify((pte_t *)pmd, node, addr, next);

return huge;
}

int __meminit vmemmap_populate(unsigned long start, unsigned long end,
int node, struct vmem_altmap *altmap)
{
Expand Down
13 changes: 0 additions & 13 deletions arch/riscv/mm/init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1359,19 +1359,6 @@ void __init misc_mem_init(void)
}

#ifdef CONFIG_SPARSEMEM_VMEMMAP
void __meminit vmemmap_set_pmd(pmd_t *pmd, void *p, int node,
unsigned long addr, unsigned long next)
{
pmd_set_huge(pmd, virt_to_phys(p), PAGE_KERNEL);
}

int __meminit vmemmap_check_pmd(pmd_t *pmdp, int node,
unsigned long addr, unsigned long next)
{
vmemmap_verify((pte_t *)pmdp, node, addr, next);
return 1;
}

int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,
struct vmem_altmap *altmap)
{
Expand Down
11 changes: 0 additions & 11 deletions arch/sparc/mm/init_64.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2579,17 +2579,6 @@ void __meminit vmemmap_set_pmd(pmd_t *pmd, void *p, int node,
pmd_val(*pmd) = pte_base | __pa(p);
}

int __meminit vmemmap_check_pmd(pmd_t *pmdp, int node,
unsigned long addr, unsigned long next)
{
int large = pmd_leaf(*pmdp);

if (large)
vmemmap_verify((pte_t *)pmdp, node, addr, next);

return large;
}

int __meminit vmemmap_populate(unsigned long vstart, unsigned long vend,
int node, struct vmem_altmap *altmap)
{
Expand Down
7 changes: 6 additions & 1 deletion mm/sparse-vmemmap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,12 +391,17 @@ int __meminit vmemmap_populate_hvo(unsigned long addr, unsigned long end,
void __weak __meminit vmemmap_set_pmd(pmd_t *pmd, void *p, int node,
unsigned long addr, unsigned long next)
{
WARN_ON_ONCE(!pmd_set_huge(pmd, virt_to_phys(p), PAGE_KERNEL));
}

int __weak __meminit vmemmap_check_pmd(pmd_t *pmd, int node,
unsigned long addr, unsigned long next)
{
return 0;
if (!pmd_leaf(pmdp_get(pmd)))
return 0;
vmemmap_verify((pte_t *)pmd, node, addr, next);

return 1;
}

int __meminit vmemmap_populate_hugepages(unsigned long start, unsigned long end,
Expand Down
Loading