[PATCH 04/16] vmalloc: pass in pgd pointer for vmap{__vunmap}_range_noflush()
Lorenzo Stoakes (ARM)
ljs at kernel.org
Wed Jul 29 02:32:20 PDT 2026
On Wed, Jul 15, 2026 at 11:04:06AM -0700, Yang Shi wrote:
> vmap{__vunmap}_range_noflush() assume manipulate init_mm pgd. The
It's not an assumption, it's a requirement.
There is now (and really should have always been) strictly a locking requirement
that the mm being manipulated is init_mm.
> following patch will map percpu local mapping into percpu page table by
> calling them, so the assumption will no longer stand. Make them take
> pgd pointer as an parameter.
No, this isn't OK.
vmalloc is expressly for manipulating kernel mappings in init_mm.
>
> Also make vmap_range_noflush() non static, it will be called outside
> vmalloc in the following patch.
Hmm not loving the exposure of an internal function ehre.
>
> There is no functional change.
>
> Signed-off-by: Yang Shi <yang at os.amperecomputing.com>
You're fundamentally changing something here, conceptually. I'm not sure why you
specifically need vmalloc to do it but it doesn't strike me as worthwhile for
what you're doing.
> ---
> mm/internal.h | 5 ++++-
> mm/kmsan/hooks.c | 14 +++++++-------
> mm/vmalloc.c | 25 +++++++++++++------------
> 3 files changed, 24 insertions(+), 20 deletions(-)
>
> diff --git a/mm/internal.h b/mm/internal.h
> index 181e79f1d6a2..9d9f08cb26a1 100644
> --- a/mm/internal.h
> +++ b/mm/internal.h
> @@ -1552,10 +1552,13 @@ void clear_vm_uninitialized_flag(struct vm_struct *vm);
> int __must_check __vmap_pages_range_noflush(unsigned long addr,
> unsigned long end, pgprot_t prot,
> struct page **pages, unsigned int page_shift);
> +int __must_check vmap_range_noflush(pgd_t *pgdir, unsigned long addr,
> + unsigned long end, phys_addr_t phys_addr,
> + pgprot_t prot, unsigned int max_page_shift);
>
> void vunmap_range_noflush(unsigned long start, unsigned long end);
>
> -void __vunmap_range_noflush(unsigned long start, unsigned long end);
> +void __vunmap_range_noflush(pgd_t *pgdir, unsigned long start, unsigned long end);
>
> static inline bool vma_is_single_threaded_private(struct vm_area_struct *vma)
> {
> diff --git a/mm/kmsan/hooks.c b/mm/kmsan/hooks.c
> index 8f22d1f22981..e2a0faf344b9 100644
> --- a/mm/kmsan/hooks.c
> +++ b/mm/kmsan/hooks.c
> @@ -135,8 +135,8 @@ static unsigned long vmalloc_origin(unsigned long addr)
>
> void kmsan_vunmap_range_noflush(unsigned long start, unsigned long end)
> {
> - __vunmap_range_noflush(vmalloc_shadow(start), vmalloc_shadow(end));
> - __vunmap_range_noflush(vmalloc_origin(start), vmalloc_origin(end));
> + __vunmap_range_noflush(init_mm.pgd, vmalloc_shadow(start), vmalloc_shadow(end));
> + __vunmap_range_noflush(init_mm.pgd, vmalloc_origin(start), vmalloc_origin(end));
> flush_cache_vmap(vmalloc_shadow(start), vmalloc_shadow(end));
> flush_cache_vmap(vmalloc_origin(start), vmalloc_origin(end));
> }
> @@ -181,7 +181,7 @@ int kmsan_ioremap_page_range(unsigned long start, unsigned long end,
> vmalloc_origin(start + off + PAGE_SIZE), prot, &origin,
> PAGE_SHIFT);
> if (mapped) {
> - __vunmap_range_noflush(
> + __vunmap_range_noflush(init_mm.pgd,
> vmalloc_shadow(start + off),
> vmalloc_shadow(start + off + PAGE_SIZE));
> err = mapped;
> @@ -203,10 +203,10 @@ int kmsan_ioremap_page_range(unsigned long start, unsigned long end,
> __free_pages(shadow, 1);
> if (origin)
> __free_pages(origin, 1);
> - __vunmap_range_noflush(
> + __vunmap_range_noflush(init_mm.pgd,
> vmalloc_shadow(start),
> vmalloc_shadow(start + clean * PAGE_SIZE));
> - __vunmap_range_noflush(
> + __vunmap_range_noflush(init_mm.pgd,
> vmalloc_origin(start),
> vmalloc_origin(start + clean * PAGE_SIZE));
> }
> @@ -233,8 +233,8 @@ void kmsan_iounmap_page_range(unsigned long start, unsigned long end)
> i++, v_shadow += PAGE_SIZE, v_origin += PAGE_SIZE) {
> shadow = kmsan_vmalloc_to_page_or_null((void *)v_shadow);
> origin = kmsan_vmalloc_to_page_or_null((void *)v_origin);
> - __vunmap_range_noflush(v_shadow, vmalloc_shadow(end));
> - __vunmap_range_noflush(v_origin, vmalloc_origin(end));
> + __vunmap_range_noflush(init_mm.pgd, v_shadow, vmalloc_shadow(end));
> + __vunmap_range_noflush(init_mm.pgd, v_origin, vmalloc_origin(end));
> if (shadow)
> __free_pages(shadow, 1);
> if (origin)
> diff --git a/mm/vmalloc.c b/mm/vmalloc.c
> index 1afca3568b9b..17c26e9796b2 100644
> --- a/mm/vmalloc.c
> +++ b/mm/vmalloc.c
> @@ -295,9 +295,9 @@ static int vmap_p4d_range(pgd_t *pgd, unsigned long addr, unsigned long end,
> return err;
> }
>
> -static int vmap_range_noflush(unsigned long addr, unsigned long end,
> - phys_addr_t phys_addr, pgprot_t prot,
> - unsigned int max_page_shift)
> +int vmap_range_noflush(pgd_t *pgdir, unsigned long addr, unsigned long end,
> + phys_addr_t phys_addr, pgprot_t prot,
> + unsigned int max_page_shift)
> {
> pgd_t *pgd;
> unsigned long start;
> @@ -314,7 +314,7 @@ static int vmap_range_noflush(unsigned long addr, unsigned long end,
> BUG_ON(addr >= end);
>
> start = addr;
> - pgd = pgd_offset_k(addr);
> + pgd = pgd_offset_pgd(pgdir, addr);
> do {
> next = pgd_addr_end(addr, end);
> err = vmap_p4d_range(pgd, addr, next, phys_addr, prot,
> @@ -334,8 +334,8 @@ int vmap_page_range(unsigned long addr, unsigned long end,
> {
> int err;
>
> - err = vmap_range_noflush(addr, end, phys_addr, pgprot_nx(prot),
> - ioremap_max_page_shift);
> + err = vmap_range_noflush(init_mm.pgd, addr, end, phys_addr,
> + pgprot_nx(prot), ioremap_max_page_shift);
> flush_cache_vmap(addr, end);
> if (!err)
> err = kmsan_ioremap_page_range(addr, end, phys_addr, prot,
> @@ -478,7 +478,7 @@ static void vunmap_p4d_range(pgd_t *pgd, unsigned long addr, unsigned long end,
> *
> * This is an internal function only. Do not use outside mm/.
> */
> -void __vunmap_range_noflush(unsigned long start, unsigned long end)
> +void __vunmap_range_noflush(pgd_t *pgdir, unsigned long start, unsigned long end)
> {
> unsigned long next;
> pgd_t *pgd;
> @@ -486,7 +486,7 @@ void __vunmap_range_noflush(unsigned long start, unsigned long end)
> pgtbl_mod_mask mask = 0;
>
> BUG_ON(addr >= end);
> - pgd = pgd_offset_k(addr);
> + pgd = pgd_offset_pgd(pgdir, addr);
> do {
> next = pgd_addr_end(addr, end);
> if (pgd_bad(*pgd))
> @@ -503,7 +503,7 @@ void __vunmap_range_noflush(unsigned long start, unsigned long end)
> void vunmap_range_noflush(unsigned long start, unsigned long end)
> {
> kmsan_vunmap_range_noflush(start, end);
> - __vunmap_range_noflush(start, end);
> + __vunmap_range_noflush(init_mm.pgd, start, end);
> }
>
> /**
> @@ -670,9 +670,10 @@ int __vmap_pages_range_noflush(unsigned long addr, unsigned long end,
> for (i = 0; i < nr; i += 1U << (page_shift - PAGE_SHIFT)) {
> int err;
>
> - err = vmap_range_noflush(addr, addr + (1UL << page_shift),
> - page_to_phys(pages[i]), prot,
> - page_shift);
> + err = vmap_range_noflush(init_mm.pgd, addr,
> + addr + (1UL << page_shift),
> + page_to_phys(pages[i]), prot,
> + page_shift);
> if (err)
> return err;
>
> --
> 2.47.0
>
>
>
Cheers, Lorenzo
More information about the linux-arm-kernel
mailing list