kmsan-expose-kmsan_warn_on.patch removed from -mm tree
The quilt patch titled
Subject: kmsan: expose KMSAN_WARN_ON()
has been removed from the -mm tree. Its filename was
kmsan-expose-kmsan_warn_on.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: Ilya Leoshkevich <[email protected]>
Subject: kmsan: expose KMSAN_WARN_ON()
Date: Fri, 21 Jun 2024 13:35:00 +0200
KMSAN_WARN_ON() is required for implementing s390-specific KMSAN functions, but right now it's available only to the KMSAN internal functions. Expose it to subsystems through <linux/kmsan.h>.
Signed-off-by Ilya Leoshkevich <[email protected]>
Reviewed-by Alexander Potapenko <[email protected]>
Cc Alexander Gordeev <[email protected]>
Cc Christian Borntraeger <[email protected]>
Cc Christoph Lameter <[email protected]>
Cc David Rientjes <[email protected]>
Cc Dmitry Vyukov <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc Hyeonggon Yoo <[email protected]>
Cc Joonsoo Kim <[email protected]>
Cc <[email protected]>
Cc Marco Elver <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Masami Hiramatsu (Google) <[email protected]>
Cc Pekka Enberg <[email protected]>
Cc Roman Gushchin <[email protected]>
Cc Steven Rostedt (Google) <[email protected]>
Cc Sven Schnelle <[email protected]>
Cc Vasily Gorbik <[email protected]>
Cc Vlastimil Babka <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
include/linux/kmsan.h | 25 +++++++++++++++++++++++++ mm/kmsan/kmsan.h | 24 +----------------------- 2 files changed, 26 insertions(+), 23 deletions(-)
include/linux/kmsan.h renamed from include/linux/kmsan.h~kmsan-expose-kmsan_warn_on +25 -0
@@ -268,6 +268,29 @@ static inline void *memset_no_sanitize_mreturn __memset (s, c, n); } +extern bool kmsan_enabled; +extern int panic_on_kmsan; + +/* +* KMSAN performs a lot of consistency checks that are currently enabled by +* default. BUG_ON is normally discouraged in the kernel, unless used for +* debugging, but KMSAN itself is a debugging tool, so it makes little sense to +* recover if something goes wrong. +*/ +#define KMSAN_WARN_ON (cond) \ + ({ \ + const bool __cond = WARN_ON(cond); \ + if (unlikely(__cond)) { \ + WRITE_ONCE(kmsan_enabled, false); \ + if (panic_on_kmsan) { \ +/* Can't call panic() here because */ \ +/* of uaccess checks. */ \ +BUG (); \ + } \ + } \ + __cond; \ + }) +#else static inline void kmsan_init_shadow (void )
@@ -380,6 +403,8 @@ static inline void *memset_no_sanitize_mreturn memset (s, c, n); } +#define KMSAN_WARN_ON WARN_ON +#endif #endif /* _LINUX_KMSAN_H */
mm/kmsan/kmsan.h renamed from mm/kmsan/kmsan.h~kmsan-expose-kmsan_warn_on +1 -23
@@ -11,6 +11,7 @@#define __MM_KMSAN_KMSAN_H#include <linux/irqflags.h> +#include <linux/kmsan.h> #include <linux/mm.h> #include <linux/nmi.h> #include <linux/pgtable.h>
@@ -34,29 +35,6 @@#define KMSAN_META_SHADOW (false)#define KMSAN_META_ORIGIN (true) -extern bool kmsan_enabled; -extern int panic_on_kmsan; - -/* -* KMSAN performs a lot of consistency checks that are currently enabled by -* default. BUG_ON is normally discouraged in the kernel, unless used for -* debugging, but KMSAN itself is a debugging tool, so it makes little sense to -* recover if something goes wrong. -*/ -#define KMSAN_WARN_ON (cond) \ - ({ \ - const bool __cond = WARN_ON(cond); \ - if (unlikely(__cond)) { \ - WRITE_ONCE(kmsan_enabled, false); \ - if (panic_on_kmsan) { \ -/* Can't call panic() here because */ \ -/* of uaccess checks. */ \ -BUG (); \ - } \ - } \ - __cond; \ - }) -/* * A pair of metadata pointers to be returned by the instrumentation functions. */
_
Patches currently in -mm which might be from [email protected] are