kasan-move-and-hide-kasan_save_enable-restore_multi_shot.patch removed from -mm tree
The patch titled
Subject: kasan: move and hide kasan_save_enable/restore_multi_shot
has been removed from the -mm tree. Its filename was
kasan-move-and-hide-kasan_save_enable-restore_multi_shot.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Andrey Konovalov <[email protected]>
Subject: kasan: move and hide kasan_save_enable/restore_multi_shot
- Move kasan_save_enable/restore_multi_shot() declarations to mm/kasan/kasan.h, as there is no need for them to be visible outside of KASAN implementation.
- Only define and export these functions when KASAN tests are enabled.
- Move their definitions closer to other test-related code in report.c.
---
include/linux/kasan.h | 4 ---- mm/kasan/kasan.h | 7 +++++++ mm/kasan/report.c | 30 +++++++++++++++++------------- 3 files changed, 24 insertions(+), 17 deletions(-)
include/linux/kasan.h renamed from include/linux/kasan.h~kasan-move-and-hide-kasan_save_enable-restore_multi_shot +0 -4
@@ -267,10 +267,6 @@ static __always_inline bool kasan_check_ return true; } - -bool kasan_save_enable_multi_shot (void ); -void kasan_restore_multi_shot (bool enabled); -#else /* CONFIG_KASAN */ static inline slab_flags_t kasan_never_merge (void )
mm/kasan/kasan.h renamed from mm/kasan/kasan.h~kasan-move-and-hide-kasan_save_enable-restore_multi_shot +7 -0
@@ -492,6 +492,13 @@ static inline bool kasan_arch_is_ready(v#error kasan_arch_is_ready only works in KASAN generic outline mode!#endif +#if IS_ENABLED (CONFIG_KASAN_KUNIT_TEST ) ||IS_ENABLED (CONFIG_KASAN_MODULE_TEST ) + +bool kasan_save_enable_multi_shot (void ); +void kasan_restore_multi_shot (bool enabled); + +#endif +/* * Exported functions for interfaces called from assembly or from generated * code. Declarations here to avoid warning about missing declarations.
mm/kasan/report.c renamed from mm/kasan/report.c~kasan-move-and-hide-kasan_save_enable-restore_multi_shot +17 -13
@@ -64,19 +64,6 @@ static int __init early_kasan_fault(char }early_param ("kasan.fault" , early_kasan_fault); -bool kasan_save_enable_multi_shot (void ) -{ -return test_and_set_bit (KASAN_BIT_MULTI_SHOT , &kasan_flags); -} -EXPORT_SYMBOL_GPL (kasan_save_enable_multi_shot); - -void kasan_restore_multi_shot (bool enabled) -{ -if (!enabled) -clear_bit (KASAN_BIT_MULTI_SHOT , &kasan_flags); -} -EXPORT_SYMBOL_GPL (kasan_restore_multi_shot); -static int __init kasan_set_multi_shot (char *str) {set_bit (KASAN_BIT_MULTI_SHOT , &kasan_flags);
@@ -109,6 +96,23 @@ static bool report_enabled(void)return !test_and_set_bit (KASAN_BIT_REPORTED , &kasan_flags); } +#if IS_ENABLED (CONFIG_KASAN_KUNIT_TEST ) ||IS_ENABLED (CONFIG_KASAN_MODULE_TEST ) + +bool kasan_save_enable_multi_shot (void ) +{ +return test_and_set_bit (KASAN_BIT_MULTI_SHOT , &kasan_flags); +} +EXPORT_SYMBOL_GPL (kasan_save_enable_multi_shot); + +void kasan_restore_multi_shot (bool enabled) +{ +if (!enabled) +clear_bit (KASAN_BIT_MULTI_SHOT , &kasan_flags); +} +EXPORT_SYMBOL_GPL (kasan_restore_multi_shot); + +#endif +#if IS_ENABLED (CONFIG_KASAN_KUNIT_TEST )static void update_kunit_status (bool sync) {
_
Patches currently in -mm which might be from [email protected] are
stacktrace-add-interface-based-on-shadow-call-stack.patch arm64-scs-save-scs_sp-values-per-cpu-when-switching-stacks.patch arm64-implement-stack_trace_save_shadow.patch kasan-use-stack_trace_save_shadow.patch