On Mon, Nov 16, 2026 at 03:13:15PM +0800, Hao Ge wrote:
> The vmap failure paths can be reached with GFP_ATOMIC or GFP_NOWAIT
> since commit b186a94227b7 ("kmsan: remove hard-coded GFP_KERNEL
> flags") and commit 8da89ba18ed4 ("mm/vmalloc: handle non-blocking
> GFP in __vmalloc_area_node()"), so an undo of a partially installed
> mapping may have to run in atomic context, where the cond_resched()
> in vunmap_pmd_range() cannot schedule.
> 
> Give __vunmap_range_noflush() and kmsan_vunmap_range_noflush() a
> can_resched argument and skip the cond_resched() when it is false.
> The existing callers are on sleepable paths and pass true, so nothing
> changes for them.
> 
> Fixes: 47ebd0310e89 ("mm: kmsan: handle alloc failures in 
> kmsan_vmap_pages_range_noflush()")
> Cc: [email protected]
> Reported-by: Sashiko <[email protected]>
> Closes: https://lore.kernel.org/all/[email protected]/
> Signed-off-by: Hao Ge <[email protected]>
> ---
>  include/linux/kmsan.h |  8 ++++++--
>  mm/kmsan/hooks.c      | 14 +++++++++-----
>  mm/vmalloc.c          | 24 ++++++++++++++----------
>  mm/vmalloc.h          |  3 ++-
>  4 files changed, 31 insertions(+), 18 deletions(-)
> 
> diff --git a/include/linux/kmsan.h b/include/linux/kmsan.h
> index 7da9fd506b39..0016c032d1e7 100644
> --- a/include/linux/kmsan.h
> +++ b/include/linux/kmsan.h
> @@ -150,11 +150,14 @@ int __must_check 
> kmsan_vmap_pages_range_noflush(unsigned long start,
>   * kmsan_vunmap_kernel_range_noflush() - Notify KMSAN about a vunmap.
>   * @start: start of vunmapped range.
>   * @end:   end of vunmapped range.
> + * @can_resched: whether the unmap walk may call cond_resched(); pass
> + * false from atomic context.
>   *
>   * KMSAN unmaps the contiguous metadata ranges created by
>   * kmsan_map_kernel_range_noflush().
>   */
> -void kmsan_vunmap_range_noflush(unsigned long start, unsigned long end);
> +void kmsan_vunmap_range_noflush(unsigned long start, unsigned long end,
> +                             bool can_resched);
>  
>  /**
>   * kmsan_ioremap_page_range() - Notify KMSAN about a ioremap_page_range() 
> call.
> @@ -355,7 +358,8 @@ static inline int __must_check 
> kmsan_vmap_pages_range_noflush(
>  }
>  
>  static inline void kmsan_vunmap_range_noflush(unsigned long start,
> -                                           unsigned long end)
> +                                           unsigned long end,
> +                                           bool can_resched)
>  {
>  }
>  
> diff --git a/mm/kmsan/hooks.c b/mm/kmsan/hooks.c
> index a706666db097..69008b085658 100644
> --- a/mm/kmsan/hooks.c
> +++ b/mm/kmsan/hooks.c
> @@ -136,10 +136,13 @@ static unsigned long vmalloc_origin(unsigned long addr)
>                                                KMSAN_META_ORIGIN);
>  }
>  
> -void kmsan_vunmap_range_noflush(unsigned long start, unsigned long end)
> +void kmsan_vunmap_range_noflush(unsigned long start, unsigned long end,
> +                             bool can_resched)
>  {
> -     __vunmap_range_noflush(vmalloc_shadow(start), vmalloc_shadow(end));
> -     __vunmap_range_noflush(vmalloc_origin(start), vmalloc_origin(end));
> +     __vunmap_range_noflush(vmalloc_shadow(start), vmalloc_shadow(end),
> +                            can_resched);
> +     __vunmap_range_noflush(vmalloc_origin(start), vmalloc_origin(end),
> +                            can_resched);
>       flush_cache_vmap(vmalloc_shadow(start), vmalloc_shadow(end));
>       flush_cache_vmap(vmalloc_origin(start), vmalloc_origin(end));
>  }
> @@ -168,8 +171,9 @@ static void kmsan_iounmap_pages(unsigned long start, 
> unsigned long end)
>               if (origin)
>                       __free_pages(origin, KMSAN_IOREMAP_META_ORDER);
>       }
> -     __vunmap_range_noflush(shadow_start, shadow_end);
> -     __vunmap_range_noflush(origin_start, origin_end);
> +     /* ioremap metadata mappings are always GFP_KERNEL, so resched is safe. 
> */
> +     __vunmap_range_noflush(shadow_start, shadow_end, true);
> +     __vunmap_range_noflush(origin_start, origin_end, true);
>       flush_tlb_kernel_range(shadow_start, shadow_end);
>       flush_tlb_kernel_range(origin_start, origin_end);
>  }
> diff --git a/mm/vmalloc.c b/mm/vmalloc.c
> index ccaf158c5b7f..3c0d9e69b886 100644
> --- a/mm/vmalloc.c
> +++ b/mm/vmalloc.c
> @@ -429,7 +429,7 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long 
> addr, unsigned long end,
>  }
>  
>  static void vunmap_pmd_range(pud_t *pud, unsigned long addr, unsigned long 
> end,
> -                          pgtbl_mod_mask *mask)
> +                          pgtbl_mod_mask *mask, bool can_resched)
>  {
>       pmd_t *pmd;
>       unsigned long next;
> @@ -451,12 +451,14 @@ static void vunmap_pmd_range(pud_t *pud, unsigned long 
> addr, unsigned long end,
>                       continue;
>               vunmap_pte_range(pmd, addr, next, mask);
>  
> -             cond_resched();
> +             /* The undo path may run in atomic context. */
> +             if (can_resched)
> +                     cond_resched();
>       } while (pmd++, addr = next, addr != end);
>  }
>  
>  static void vunmap_pud_range(p4d_t *p4d, unsigned long addr, unsigned long 
> end,
> -                          pgtbl_mod_mask *mask)
> +                          pgtbl_mod_mask *mask, bool can_resched)
>  {
>       pud_t *pud;
>       unsigned long next;
> @@ -476,12 +478,12 @@ static void vunmap_pud_range(p4d_t *p4d, unsigned long 
> addr, unsigned long end,
>               }
>               if (pud_none_or_clear_bad(pud))
>                       continue;
> -             vunmap_pmd_range(pud, addr, next, mask);
> +             vunmap_pmd_range(pud, addr, next, mask, can_resched);
>       } while (pud++, addr = next, addr != end);
>  }
>  
>  static void vunmap_p4d_range(pgd_t *pgd, unsigned long addr, unsigned long 
> end,
> -                          pgtbl_mod_mask *mask)
> +                          pgtbl_mod_mask *mask, bool can_resched)
>  {
>       p4d_t *p4d;
>       unsigned long next;
> @@ -496,7 +498,7 @@ static void vunmap_p4d_range(pgd_t *pgd, unsigned long 
> addr, unsigned long end,
>  
>               if (p4d_none_or_clear_bad(p4d))
>                       continue;
> -             vunmap_pud_range(p4d, addr, next, mask);
> +             vunmap_pud_range(p4d, addr, next, mask, can_resched);
>       } while (p4d++, addr = next, addr != end);
>  }
>  
> @@ -512,7 +514,8 @@ 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(unsigned long start, unsigned long end,
> +                         bool can_resched)
>  {
>       unsigned long next;
>       pgd_t *pgd;
> @@ -527,7 +530,7 @@ void __vunmap_range_noflush(unsigned long start, unsigned 
> long end)
>                       mask |= PGTBL_PGD_MODIFIED;
>               if (pgd_none_or_clear_bad(pgd))
>                       continue;
> -             vunmap_p4d_range(pgd, addr, next, &mask);
> +             vunmap_p4d_range(pgd, addr, next, &mask, can_resched);
>       } while (pgd++, addr = next, addr != end);
>  
>       if (mask & ARCH_PAGE_TABLE_SYNC_MASK)
> @@ -536,8 +539,9 @@ 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);
> +     /* The unmap paths are sleepable, keep the resched point. */
> +     kmsan_vunmap_range_noflush(start, end, true);
> +     __vunmap_range_noflush(start, end, true);
>  }
>  
>  /**
> diff --git a/mm/vmalloc.h b/mm/vmalloc.h
> index d8372a4f65c4..4ec114a75f04 100644
> --- a/mm/vmalloc.h
> +++ b/mm/vmalloc.h
> @@ -44,6 +44,7 @@ int __must_check __vmap_pages_range_noflush(unsigned long 
> addr,
>  
>  void vunmap_range_noflush(unsigned long start, unsigned long end);
>  
> -void __vunmap_range_noflush(unsigned long start, unsigned long end);
> +void __vunmap_range_noflush(unsigned long start, unsigned long end,
> +                         bool can_resched);
>  
>  #endif /* __MM_VMALLOC_H */
> -- 
> 2.25.1
> 
This looks good to me. I am not sure if passing gfp_mask is better
here since it is only for checking if-allow-blocking.

--
Uladzislau Rezki

Reply via email to