Commit f0f6928c authored by Marco Elver's avatar Marco Elver Committed by Ingo Molnar
Browse files

kcsan: Move interfaces that affects checks to kcsan-checks.h 



This moves functions that affect state changing the behaviour of
kcsan_check_access() to kcsan-checks.h. Since these are likely used with
kcsan_check_access() it makes more sense to have them in kcsan-checks.h,
to avoid including all of 'include/linux/kcsan.h'.

No functional change intended.

Acked-by: default avatarJohn Hubbard <jhubbard@nvidia.com>
Signed-off-by: default avatarMarco Elver <elver@google.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 3a5b45e5

include/linux/kcsan-checks.h

+46 −2
Original line number Diff line number Diff line
@@ -32,10 +32,54 @@ 
 */

void __kcsan_check_access(const volatile void *ptr, size_t size, int type);



#else

/**

 * kcsan_nestable_atomic_begin - begin nestable atomic region

 *

 * Accesses within the atomic region may appear to race with other accesses but

 * should be considered atomic.

 */

void kcsan_nestable_atomic_begin(void);



/**

 * kcsan_nestable_atomic_end - end nestable atomic region

 */

void kcsan_nestable_atomic_end(void);



/**

 * kcsan_flat_atomic_begin - begin flat atomic region

 *

 * Accesses within the atomic region may appear to race with other accesses but

 * should be considered atomic.

 */

void kcsan_flat_atomic_begin(void);



/**

 * kcsan_flat_atomic_end - end flat atomic region

 */

void kcsan_flat_atomic_end(void);



/**

 * kcsan_atomic_next - consider following accesses as atomic

 *

 * Force treating the next n memory accesses for the current context as atomic

 * operations.

 *

 * @n number of following memory accesses to treat as atomic.

 */

void kcsan_atomic_next(int n);



#else /* CONFIG_KCSAN */



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

					int type) { }

#endif



static inline void kcsan_nestable_atomic_begin(void)	{ }

static inline void kcsan_nestable_atomic_end(void)	{ }

static inline void kcsan_flat_atomic_begin(void)	{ }

static inline void kcsan_flat_atomic_end(void)		{ }

static inline void kcsan_atomic_next(int n)		{ }



#endif /* CONFIG_KCSAN */



/*

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

include/linux/kcsan.h

+0 −41
Original line number Diff line number Diff line
@@ -56,52 +56,11 @@ void kcsan_disable_current(void); 
 */

void kcsan_enable_current(void);



/**

 * kcsan_nestable_atomic_begin - begin nestable atomic region

 *

 * Accesses within the atomic region may appear to race with other accesses but

 * should be considered atomic.

 */

void kcsan_nestable_atomic_begin(void);



/**

 * kcsan_nestable_atomic_end - end nestable atomic region

 */

void kcsan_nestable_atomic_end(void);



/**

 * kcsan_flat_atomic_begin - begin flat atomic region

 *

 * Accesses within the atomic region may appear to race with other accesses but

 * should be considered atomic.

 */

void kcsan_flat_atomic_begin(void);



/**

 * kcsan_flat_atomic_end - end flat atomic region

 */

void kcsan_flat_atomic_end(void);



/**

 * kcsan_atomic_next - consider following accesses as atomic

 *

 * Force treating the next n memory accesses for the current context as atomic

 * operations.

 *

 * @n number of following memory accesses to treat as atomic.

 */

void kcsan_atomic_next(int n);



#else /* CONFIG_KCSAN */



static inline void kcsan_init(void)			{ }

static inline void kcsan_disable_current(void)		{ }

static inline void kcsan_enable_current(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)	{ }

static inline void kcsan_flat_atomic_end(void)		{ }

static inline void kcsan_atomic_next(int n)		{ }



#endif /* CONFIG_KCSAN */