Commit c28432ac authored by Sabyrzhan Tasbolatov's avatar Sabyrzhan Tasbolatov Committed by Andrew Morton
Browse files

kasan: use EXPORT_SYMBOL_IF_KUNIT to export symbols 

Patch series "kasan: few improvements on kunit tests".

This patch series addresses the issue [1] with KASAN symbols used in the
Kunit test, but exported as EXPORT_SYMBOL_GPL.

Also a small tweak of marking kasan_atomics() as KUNIT_CASE_SLOW to avoid
kunit report that the test should be marked as slow.


This patch (of 2):

Replace EXPORT_SYMBOL_GPL with EXPORT_SYMBOL_IF_KUNIT to mark the symbols
as visible only if CONFIG_KUNIT is enabled.

KASAN Kunit test should import the namespace EXPORTED_FOR_KUNIT_TESTING to
use these marked symbols.

Link: https://lkml.kernel.org/r/20241101184011.3369247-1-snovitoll@gmail.com
Link: https://lkml.kernel.org/r/20241101184011.3369247-2-snovitoll@gmail.com


Signed-off-by: default avatarSabyrzhan Tasbolatov <snovitoll@gmail.com>
Reported-by: default avatarAndrey Konovalov <andreyknvl@gmail.com>
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218315


Reviewed-by: default avatarAndrey Konovalov <andreyknvl@gmail.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Marco Elver <elver@google.com>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent ad2bc881

mm/kasan/hw_tags.c

+4 −3
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


#define pr_fmt(fmt) "kasan: " fmt



#include <kunit/visibility.h>

#include <linux/init.h>

#include <linux/kasan.h>

#include <linux/kernel.h>
@@ -394,12 +395,12 @@ void kasan_enable_hw_tags(void) 


#if IS_ENABLED(CONFIG_KASAN_KUNIT_TEST)



EXPORT_SYMBOL_GPL(kasan_enable_hw_tags);

EXPORT_SYMBOL_IF_KUNIT(kasan_enable_hw_tags);



void kasan_force_async_fault(void)

VISIBLE_IF_KUNIT void kasan_force_async_fault(void)

{

	hw_force_async_tag_fault();

}

EXPORT_SYMBOL_GPL(kasan_force_async_fault);

EXPORT_SYMBOL_IF_KUNIT(kasan_force_async_fault);



#endif

mm/kasan/kasan_test_c.c

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 


#define OOB_TAG_OFF (IS_ENABLED(CONFIG_KASAN_GENERIC) ? 0 : KASAN_GRANULE_SIZE)



MODULE_IMPORT_NS(EXPORTED_FOR_KUNIT_TESTING);



static bool multishot;



/* Fields set based on lines observed in the console. */

mm/kasan/report.c

+9 −8
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 */



#include <kunit/test.h>

#include <kunit/visibility.h>

#include <linux/bitops.h>

#include <linux/ftrace.h>

#include <linux/init.h>
@@ -134,18 +135,18 @@ static bool report_enabled(void) 


#if IS_ENABLED(CONFIG_KASAN_KUNIT_TEST)



bool kasan_save_enable_multi_shot(void)

VISIBLE_IF_KUNIT 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);

EXPORT_SYMBOL_IF_KUNIT(kasan_save_enable_multi_shot);



void kasan_restore_multi_shot(bool enabled)

VISIBLE_IF_KUNIT void kasan_restore_multi_shot(bool enabled)

{

	if (!enabled)

		clear_bit(KASAN_BIT_MULTI_SHOT, &kasan_flags);

}

EXPORT_SYMBOL_GPL(kasan_restore_multi_shot);

EXPORT_SYMBOL_IF_KUNIT(kasan_restore_multi_shot);



#endif
@@ -157,17 +158,17 @@ EXPORT_SYMBOL_GPL(kasan_restore_multi_shot); 
 */

static bool kasan_kunit_executing;



void kasan_kunit_test_suite_start(void)

VISIBLE_IF_KUNIT void kasan_kunit_test_suite_start(void)

{

	WRITE_ONCE(kasan_kunit_executing, true);

}

EXPORT_SYMBOL_GPL(kasan_kunit_test_suite_start);

EXPORT_SYMBOL_IF_KUNIT(kasan_kunit_test_suite_start);



void kasan_kunit_test_suite_end(void)

VISIBLE_IF_KUNIT void kasan_kunit_test_suite_end(void)

{

	WRITE_ONCE(kasan_kunit_executing, false);

}

EXPORT_SYMBOL_GPL(kasan_kunit_test_suite_end);

EXPORT_SYMBOL_IF_KUNIT(kasan_kunit_test_suite_end);



static bool kasan_kunit_test_suite_executing(void)

{