Re: [PATCH v4 2/9] mm/kmsan: skip vunmap_range_noflush when KMSAN is disabled

From
Hao Ge <hao.ge@linux.dev>
Date
2026-11-12 07:31:37
Also in
linux-mm, lkml
Reply to
Suren Baghdasaryan, 2026-11-11
Hi Suren

On 2026/11/12 06:10, Suren Baghdasaryan wrote:
On Tue, Nov 10, 2026 at 11:24 AM Hao Ge [off-list ref] wrote:
quoted
kmsan_vmap_pages_range_noflush() returns 0 when kmsan_enabled is
false.  The unmap side does not, so it still walks the shadow and
origin page tables even though KMSAN never installed any metadata
there.
Note that KMSAN_WARN_ON() can reset kmsan_enabled flag, so the fact
that it's false does not mean that metadata was never installed. I
think a proper bailout should depend on CONFIG_KMSAN, not on
kmsan_enabled.
Sorry, I did not realize this logic.

I will go through the code again and will probably drop
this patch in the next version.

Thanks
Best Regards
Hao
quoted
Add the matching early return.

Reported-by: Sashiko <sashiko-bot@kernel.org>
Reviewed-by: Dev Jain <dev.jain@arm.com>
Signed-off-by: Hao Ge <hao.ge@linux.dev>
---
 mm/kmsan/hooks.c | 3 +++
 1 file changed, 3 insertions(+)
diff --git a/mm/kmsan/hooks.c b/mm/kmsan/hooks.c
index a706666db097..107f66841274 100644
--- a/mm/kmsan/hooks.c
+++ b/mm/kmsan/hooks.c
@@ -138,6 +138,9 @@ static unsigned long vmalloc_origin(unsigned long addr)

 void kmsan_vunmap_range_noflush(unsigned long start, unsigned long end)
 {
+       if (!kmsan_enabled)
+               return;
+
        __vunmap_range_noflush(vmalloc_shadow(start), vmalloc_shadow(end));
        __vunmap_range_noflush(vmalloc_origin(start), vmalloc_origin(end));
        flush_cache_vmap(vmalloc_shadow(start), vmalloc_shadow(end));
--
2.25.1
  
Thread (33 messages) 33 messages, 4 authors, last reply 14h ago
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help