Commit 19acd03d authored by Marco Elver's avatar Marco Elver Committed by Paul E. McKenney
Browse files

kcsan: Add __kcsan_{enable,disable}_current() variants 



The __kcsan_{enable,disable}_current() variants only call into KCSAN if
KCSAN is enabled for the current compilation unit. Note: This is
typically not what we want, as we usually want to ensure that even calls
into other functions still have KCSAN disabled.

These variants may safely be used in header files that are shared
between regular kernel code and code that does not link the KCSAN
runtime.

Signed-off-by: default avatarMarco Elver <elver@google.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent 5099a722

include/linux/kcsan-checks.h

+14 −3
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ void kcsan_disable_current(void); 
 * Supports nesting.

 */

void kcsan_enable_current(void);

void kcsan_enable_current_nowarn(void); /* Safe in uaccess regions. */



/**

 * kcsan_nestable_atomic_begin - begin nestable atomic region
@@ -149,6 +150,7 @@ static inline void __kcsan_check_access(const volatile void *ptr, size_t size, 


static inline void kcsan_disable_current(void)		{ }

static inline void kcsan_enable_current(void)		{ }

static inline void kcsan_enable_current_nowarn(void)	{ }

static inline void kcsan_nestable_atomic_begin(void)	{ }

static inline void kcsan_nestable_atomic_end(void)	{ }

static inline void kcsan_flat_atomic_begin(void)	{ }
@@ -165,15 +167,24 @@ static inline void kcsan_end_scoped_access(struct kcsan_scoped_access *sa) { } 


#endif /* CONFIG_KCSAN */



#ifdef __SANITIZE_THREAD__

/*

 * kcsan_*: Only calls into the runtime when the particular compilation unit has

 * KCSAN instrumentation enabled. May be used in header files.

 * Only calls into the runtime when the particular compilation unit has KCSAN

 * instrumentation enabled. May be used in header files.

 */

#ifdef __SANITIZE_THREAD__

#define kcsan_check_access __kcsan_check_access



/*

 * Only use these to disable KCSAN for accesses in the current compilation unit;

 * calls into libraries may still perform KCSAN checks.

 */

#define __kcsan_disable_current kcsan_disable_current

#define __kcsan_enable_current kcsan_enable_current_nowarn

#else

static inline void kcsan_check_access(const volatile void *ptr, size_t size,

				      int type) { }

static inline void __kcsan_enable_current(void)  { }

static inline void __kcsan_disable_current(void) { }

#endif



/**

kernel/kcsan/core.c

+7 −0
Original line number Diff line number Diff line
@@ -625,6 +625,13 @@ void kcsan_enable_current(void) 
}

EXPORT_SYMBOL(kcsan_enable_current);



void kcsan_enable_current_nowarn(void)

{

	if (get_ctx()->disable_count-- == 0)

		kcsan_disable_current();

}

EXPORT_SYMBOL(kcsan_enable_current_nowarn);



void kcsan_nestable_atomic_begin(void)

{

	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE