Commit eb73876c authored by Marco Elver's avatar Marco Elver Committed by Thomas Gleixner
Browse files

compiler.h: Move function attributes to compiler_types.h 



Cleanup and move the KASAN and KCSAN related function attributes to
compiler_types.h, where the rest of the same kind live.

No functional change intended.

Signed-off-by: default avatarMarco Elver <elver@google.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarWill Deacon <will@kernel.org>
Link: https://lkml.kernel.org/r/20200521142047.169334-11-elver@google.com
parent 95c094fc

include/linux/compiler.h

+0 −29
Original line number Diff line number Diff line
@@ -303,35 +303,6 @@ do { \ 
	__WRITE_ONCE(x, val);						\

} while (0)



#ifdef CONFIG_KASAN

/*

 * We can't declare function 'inline' because __no_sanitize_address conflicts

 * with inlining. Attempt to inline it may cause a build failure.

 *     https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67368

 * '__maybe_unused' allows us to avoid defined-but-not-used warnings.

 */

# define __no_kasan_or_inline __no_sanitize_address notrace __maybe_unused

# define __no_sanitize_or_inline __no_kasan_or_inline

#else

# define __no_kasan_or_inline __always_inline

#endif



#define __no_kcsan __no_sanitize_thread

#ifdef __SANITIZE_THREAD__

/*

 * Rely on __SANITIZE_THREAD__ instead of CONFIG_KCSAN, to avoid not inlining in

 * compilation units where instrumentation is disabled.

 */

# define __no_kcsan_or_inline __no_kcsan notrace __maybe_unused

# define __no_sanitize_or_inline __no_kcsan_or_inline

#else

# define __no_kcsan_or_inline __always_inline

#endif



#ifndef __no_sanitize_or_inline

#define __no_sanitize_or_inline __always_inline

#endif



static __no_sanitize_or_inline

unsigned long __read_once_word_nocheck(const void *addr)

{

include/linux/compiler_types.h

+29 −0
Original line number Diff line number Diff line
@@ -171,6 +171,35 @@ struct ftrace_likely_data { 
 */

#define noinline_for_stack noinline



#ifdef CONFIG_KASAN

/*

 * We can't declare function 'inline' because __no_sanitize_address conflicts

 * with inlining. Attempt to inline it may cause a build failure.

 *     https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67368

 * '__maybe_unused' allows us to avoid defined-but-not-used warnings.

 */

# define __no_kasan_or_inline __no_sanitize_address notrace __maybe_unused

# define __no_sanitize_or_inline __no_kasan_or_inline

#else

# define __no_kasan_or_inline __always_inline

#endif



#define __no_kcsan __no_sanitize_thread

#ifdef __SANITIZE_THREAD__

/*

 * Rely on __SANITIZE_THREAD__ instead of CONFIG_KCSAN, to avoid not inlining in

 * compilation units where instrumentation is disabled.

 */

# define __no_kcsan_or_inline __no_kcsan notrace __maybe_unused

# define __no_sanitize_or_inline __no_kcsan_or_inline

#else

# define __no_kcsan_or_inline __always_inline

#endif



#ifndef __no_sanitize_or_inline

#define __no_sanitize_or_inline __always_inline

#endif



#endif /* __KERNEL__ */



#endif /* __ASSEMBLY__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE