kmsan-allow-disabling-kmsan-checks-for-the-current-task.patch removed from -mm tree
The quilt patch titled
Subject: kmsan: allow disabling KMSAN checks for the current task
has been removed from the -mm tree. Its filename was
kmsan-allow-disabling-kmsan-checks-for-the-current-task.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: allow disabling KMSAN checks for the current task
Date: Fri, 21 Jun 2024 13:34:55 +0200
Like for KASAN, it's useful to temporarily disable KMSAN checks around, e.g., redzone accesses. Introduce kmsan_disable_current() and kmsan_enable_current(), which are similar to their KASAN counterparts.
Make them reentrant in order to handle memory allocations in interrupt context. Repurpose the allow_reporting field for this.
---
Documentation/dev-tools/kmsan.rst | 11 +++++++++-- include/linux/kmsan.h | 24 ++++++++++++++++++++++++ include/linux/kmsan_types.h | 2 +- mm/kmsan/core.c | 1 - mm/kmsan/hooks.c | 18 +++++++++++++++--- mm/kmsan/report.c | 7 ++++--- tools/objtool/check.c | 2 ++ 7 files changed, 55 insertions(+), 10 deletions(-)
Documentation/dev-tools/kmsan.rst renamed from Documentation/dev-tools/kmsan.rst~kmsan-allow-disabling-kmsan-checks-for-the-current-task +9 -2
@@ -110,6 +110,13 @@ in the Makefile. Think of this as applyi function in the file or directory. Most users won't need KMSAN_SANITIZE, unless their code gets broken by KMSAN (e.g. runs at early boot time). +KMSAN checks can also be temporarily disabled for the current task using +``kmsan_disable_current()`` and ``kmsan_enable_current()`` calls. Each +``kmsan_enable_current()`` call must be preceded by a +``kmsan_disable_current()`` call; these call pairs may be nested. One needs to +be careful with these calls, keeping the regions short and preferring other +ways to disable instrumentation, where possible. + Support =======
@@ -338,11 +345,11 @@ Per-task KMSAN state ~~~~~~~~~~~~~~~~~~~~ Every task_struct has an associated KMSAN task state that holds the KMSAN -context (see above) and a per-task flag disallowing KMSAN reports:: +context (see above) and a per-task counter disallowing KMSAN reports:: struct kmsan_context { ... - bool allow_reporting; + unsigned int depth; struct kmsan_context_state cstate; ... }
include/linux/kmsan.h renamed from include/linux/kmsan.h~kmsan-allow-disabling-kmsan-checks-for-the-current-task +24 -0
@@ -239,6 +239,22 @@ void kmsan_unpoison_entry_regs(const str*/ void *kmsan_get_metadata (void *addr,bool is_origin); +/** +* kmsan_enable_current(): Enable KMSAN for the current task. +* +* Each kmsan_enable_current() current call must be preceded by a +* kmsan_disable_current() call. These call pairs may be nested. +*/ +void kmsan_enable_current (void ); + +/** +* kmsan_disable_current(): Disable KMSAN for the current task. +* +* Each kmsan_disable_current() current call must be followed by a +* kmsan_enable_current() call. These call pairs may be nested. +*/ +void kmsan_disable_current (void ); +#else static inline void kmsan_init_shadow (void )
@@ -338,6 +354,14 @@ static inline void kmsan_unpoison_entry_ { } +static inline void kmsan_enable_current (void ) +{ +} + +static inline void kmsan_disable_current (void ) +{ +} +#endif #endif /* _LINUX_KMSAN_H */
include/linux/kmsan_types.h renamed from include/linux/kmsan_types.h~kmsan-allow-disabling-kmsan-checks-for-the-current-task +1 -1
@@ -31,7 +31,7 @@ struct kmsan_context_state {struct kmsan_ctx {struct kmsan_context_state cstate;int kmsan_in_runtime; -bool allow_reporting; +unsigned int depth; };#endif /* _LINUX_KMSAN_TYPES_H */
mm/kmsan/core.c renamed from mm/kmsan/core.c~kmsan-allow-disabling-kmsan-checks-for-the-current-task +0 -1
@@ -43,7 +43,6 @@ void kmsan_internal_task_create(struct tstruct thread_info *info =current_thread_info ();__memset (ctx,0 ,sizeof (*ctx)); - ctx->allow_reporting = true;kmsan_internal_unpoison_memory (info,sizeof (*info), false); }
mm/kmsan/hooks.c renamed from mm/kmsan/hooks.c~kmsan-allow-disabling-kmsan-checks-for-the-current-task +15 -3
@@ -39,12 +39,10 @@ void kmsan_task_create(struct task_strucvoid kmsan_task_exit (struct task_struct *task) { -struct kmsan_ctx *ctx = &task->kmsan_ctx; -if (!kmsan_enabled ||kmsan_in_runtime ())return ; - ctx->allow_reporting = false; +kmsan_disable_current (); }void kmsan_slab_alloc (struct kmem_cache *s,void *object,gfp_t flags)
@@ -424,3 +422,17 @@ void kmsan_check_memory(const void *addr REASON_ANY); }EXPORT_SYMBOL (kmsan_check_memory); + +void kmsan_enable_current (void ) +{ +KMSAN_WARN_ON (current->kmsan_ctx.depth ==0 ); + current->kmsan_ctx.depth--; +} +EXPORT_SYMBOL (kmsan_enable_current); + +void kmsan_disable_current (void ) +{ + current->kmsan_ctx.depth++; +KMSAN_WARN_ON (current->kmsan_ctx.depth ==0 ); +} +EXPORT_SYMBOL (kmsan_disable_current);
mm/kmsan/report.c renamed from mm/kmsan/report.c~kmsan-allow-disabling-kmsan-checks-for-the-current-task +4 -3
@@ -8,6 +8,7 @@*/ #include <linux/console.h> +#include <linux/kmsan.h> #include <linux/moduleparam.h> #include <linux/stackdepot.h> #include <linux/stacktrace.h>
@@ -158,12 +159,12 @@ void kmsan_report(depot_stack_handle_t oif (!kmsan_enabled)return ; -if (!current->kmsan_ctx.allow_reporting) +if (current->kmsan_ctx.depth)return ;if (!origin)return ; - current->kmsan_ctx.allow_reporting = false; +kmsan_disable_current (); ua_flags =user_access_save ();raw_spin_lock (&kmsan_report_lock);pr_err ("=====================================================\n" );
@@ -216,5 +217,5 @@ void kmsan_report(depot_stack_handle_t oif (panic_on_kmsan)panic ("kmsan.panic set ...\n" );user_access_restore (ua_flags); - current->kmsan_ctx.allow_reporting = true; +kmsan_enable_current (); }
tools/objtool/check.c renamed from tools/objtool/check.c~kmsan-allow-disabling-kmsan-checks-for-the-current-task +2 -0
@@ -1202,6 +1202,8 @@ static const char *uaccess_safe_builtin["__sanitizer_cov_trace_switch" ,/* KMSAN */ "kmsan_copy_to_user" , +"kmsan_disable_current" , +"kmsan_enable_current" ,"kmsan_report" ,"kmsan_unpoison_entry_regs" , "kmsan_unpoison_memory",
_
Patches currently in -mm which might be from [email protected] are