kmsan-allow-using-__msan_instrument_asm_store-inside-runtime.patch removed from -mm tree
The quilt patch titled
Subject: kmsan: allow using __msan_instrument_asm_store() inside runtime
has been removed from the -mm tree. Its filename was
kmsan-allow-using-__msan_instrument_asm_store-inside-runtime.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Alexander Potapenko <[email protected]>
Subject: kmsan: allow using __msan_instrument_asm_store() inside runtime
Date: Mon, 28 Nov 2022 10:45:41 +0100
In certain cases (e.g. when handling a softirq) __msan_instrument_asm_store(&var, sizeof(var)) may be called with from within KMSAN runtime, but later the value of @var is used with !kmsan_in_runtime(), leading to false positives.
Because kmsan_internal_unpoison_memory() doesn't take locks, it should be fine to call it without kmsan_in_runtime() checks, which fixes the mentioned false positives.
---
mm/kmsan/instrumentation.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
mm/kmsan/instrumentation.c renamed from mm/kmsan/instrumentation.c~kmsan-allow-using-__msan_instrument_asm_store-inside-runtime +5 -3
@@ -81,12 +81,16 @@ DECLARE_METADATA_PTR_GETTER(8);* Handle a memory store performed by inline assembly. KMSAN conservatively * attempts to unpoison the outputs of asm() directives to prevent false * positives caused by missed stores. +* +* __msan_instrument_asm_store() may be called for inline assembly code when +* entering or leaving IRQ. We omit the check for kmsan_in_runtime() to ensure +* the memory written to in these cases is also marked as initialized. */ void __msan_instrument_asm_store (void *addr,uintptr_t size) {unsigned long ua_flags; -if (!kmsan_enabled ||kmsan_in_runtime ()) +if (!kmsan_enabled)return ; ua_flags =user_access_save ();
@@ -103,10 +107,8 @@ void __msan_instrument_asm_store(void *auser_access_restore (ua_flags);return ; } -kmsan_enter_runtime ();/* Unpoisoning the memory on best effort. */ kmsan_internal_unpoison_memory (addr, size,/*checked*/ false); -kmsan_leave_runtime ();user_access_restore (ua_flags); }EXPORT_SYMBOL (__msan_instrument_asm_store);
_
Patches currently in -mm which might be from [email protected] are