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

asm-generic, kcsan: Add KCSAN instrumentation for bitops 



Add explicit KCSAN checks for bitops.

Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
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 ed8af2e4

include/asm-generic/bitops/instrumented-atomic.h

+7 −7
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#ifndef _ASM_GENERIC_BITOPS_INSTRUMENTED_ATOMIC_H

#define _ASM_GENERIC_BITOPS_INSTRUMENTED_ATOMIC_H



#include <linux/kasan-checks.h>

#include <linux/instrumented.h>



/**

 * set_bit - Atomically set a bit in memory
@@ -25,7 +25,7 @@ 
 */

static inline void set_bit(long nr, volatile unsigned long *addr)

{

	kasan_check_write(addr + BIT_WORD(nr), sizeof(long));

	instrument_atomic_write(addr + BIT_WORD(nr), sizeof(long));

	arch_set_bit(nr, addr);

}
@@ -38,7 +38,7 @@ static inline void set_bit(long nr, volatile unsigned long *addr) 
 */

static inline void clear_bit(long nr, volatile unsigned long *addr)

{

	kasan_check_write(addr + BIT_WORD(nr), sizeof(long));

	instrument_atomic_write(addr + BIT_WORD(nr), sizeof(long));

	arch_clear_bit(nr, addr);

}
@@ -54,7 +54,7 @@ static inline void clear_bit(long nr, volatile unsigned long *addr) 
 */

static inline void change_bit(long nr, volatile unsigned long *addr)

{

	kasan_check_write(addr + BIT_WORD(nr), sizeof(long));

	instrument_atomic_write(addr + BIT_WORD(nr), sizeof(long));

	arch_change_bit(nr, addr);

}
@@ -67,7 +67,7 @@ static inline void change_bit(long nr, volatile unsigned long *addr) 
 */

static inline bool test_and_set_bit(long nr, volatile unsigned long *addr)

{

	kasan_check_write(addr + BIT_WORD(nr), sizeof(long));

	instrument_atomic_write(addr + BIT_WORD(nr), sizeof(long));

	return arch_test_and_set_bit(nr, addr);

}
@@ -80,7 +80,7 @@ static inline bool test_and_set_bit(long nr, volatile unsigned long *addr) 
 */

static inline bool test_and_clear_bit(long nr, volatile unsigned long *addr)

{

	kasan_check_write(addr + BIT_WORD(nr), sizeof(long));

	instrument_atomic_write(addr + BIT_WORD(nr), sizeof(long));

	return arch_test_and_clear_bit(nr, addr);

}
@@ -93,7 +93,7 @@ static inline bool test_and_clear_bit(long nr, volatile unsigned long *addr) 
 */

static inline bool test_and_change_bit(long nr, volatile unsigned long *addr)

{

	kasan_check_write(addr + BIT_WORD(nr), sizeof(long));

	instrument_atomic_write(addr + BIT_WORD(nr), sizeof(long));

	return arch_test_and_change_bit(nr, addr);

}

include/asm-generic/bitops/instrumented-lock.h

+5 −5
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#ifndef _ASM_GENERIC_BITOPS_INSTRUMENTED_LOCK_H

#define _ASM_GENERIC_BITOPS_INSTRUMENTED_LOCK_H



#include <linux/kasan-checks.h>

#include <linux/instrumented.h>



/**

 * clear_bit_unlock - Clear a bit in memory, for unlock
@@ -22,7 +22,7 @@ 
 */

static inline void clear_bit_unlock(long nr, volatile unsigned long *addr)

{

	kasan_check_write(addr + BIT_WORD(nr), sizeof(long));

	instrument_atomic_write(addr + BIT_WORD(nr), sizeof(long));

	arch_clear_bit_unlock(nr, addr);

}
@@ -37,7 +37,7 @@ static inline void clear_bit_unlock(long nr, volatile unsigned long *addr) 
 */

static inline void __clear_bit_unlock(long nr, volatile unsigned long *addr)

{

	kasan_check_write(addr + BIT_WORD(nr), sizeof(long));

	instrument_write(addr + BIT_WORD(nr), sizeof(long));

	arch___clear_bit_unlock(nr, addr);

}
@@ -52,7 +52,7 @@ static inline void __clear_bit_unlock(long nr, volatile unsigned long *addr) 
 */

static inline bool test_and_set_bit_lock(long nr, volatile unsigned long *addr)

{

	kasan_check_write(addr + BIT_WORD(nr), sizeof(long));

	instrument_atomic_write(addr + BIT_WORD(nr), sizeof(long));

	return arch_test_and_set_bit_lock(nr, addr);

}
@@ -71,7 +71,7 @@ static inline bool test_and_set_bit_lock(long nr, volatile unsigned long *addr) 
static inline bool

clear_bit_unlock_is_negative_byte(long nr, volatile unsigned long *addr)

{

	kasan_check_write(addr + BIT_WORD(nr), sizeof(long));

	instrument_atomic_write(addr + BIT_WORD(nr), sizeof(long));

	return arch_clear_bit_unlock_is_negative_byte(nr, addr);

}

/* Let everybody know we have it. */

include/asm-generic/bitops/instrumented-non-atomic.h

+8 −8
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#ifndef _ASM_GENERIC_BITOPS_INSTRUMENTED_NON_ATOMIC_H

#define _ASM_GENERIC_BITOPS_INSTRUMENTED_NON_ATOMIC_H



#include <linux/kasan-checks.h>

#include <linux/instrumented.h>



/**

 * __set_bit - Set a bit in memory
@@ -24,7 +24,7 @@ 
 */

static inline void __set_bit(long nr, volatile unsigned long *addr)

{

	kasan_check_write(addr + BIT_WORD(nr), sizeof(long));

	instrument_write(addr + BIT_WORD(nr), sizeof(long));

	arch___set_bit(nr, addr);

}
@@ -39,7 +39,7 @@ static inline void __set_bit(long nr, volatile unsigned long *addr) 
 */

static inline void __clear_bit(long nr, volatile unsigned long *addr)

{

	kasan_check_write(addr + BIT_WORD(nr), sizeof(long));

	instrument_write(addr + BIT_WORD(nr), sizeof(long));

	arch___clear_bit(nr, addr);

}
@@ -54,7 +54,7 @@ static inline void __clear_bit(long nr, volatile unsigned long *addr) 
 */

static inline void __change_bit(long nr, volatile unsigned long *addr)

{

	kasan_check_write(addr + BIT_WORD(nr), sizeof(long));

	instrument_write(addr + BIT_WORD(nr), sizeof(long));

	arch___change_bit(nr, addr);

}
@@ -68,7 +68,7 @@ static inline void __change_bit(long nr, volatile unsigned long *addr) 
 */

static inline bool __test_and_set_bit(long nr, volatile unsigned long *addr)

{

	kasan_check_write(addr + BIT_WORD(nr), sizeof(long));

	instrument_write(addr + BIT_WORD(nr), sizeof(long));

	return arch___test_and_set_bit(nr, addr);

}
@@ -82,7 +82,7 @@ static inline bool __test_and_set_bit(long nr, volatile unsigned long *addr) 
 */

static inline bool __test_and_clear_bit(long nr, volatile unsigned long *addr)

{

	kasan_check_write(addr + BIT_WORD(nr), sizeof(long));

	instrument_write(addr + BIT_WORD(nr), sizeof(long));

	return arch___test_and_clear_bit(nr, addr);

}
@@ -96,7 +96,7 @@ static inline bool __test_and_clear_bit(long nr, volatile unsigned long *addr) 
 */

static inline bool __test_and_change_bit(long nr, volatile unsigned long *addr)

{

	kasan_check_write(addr + BIT_WORD(nr), sizeof(long));

	instrument_write(addr + BIT_WORD(nr), sizeof(long));

	return arch___test_and_change_bit(nr, addr);

}
@@ -107,7 +107,7 @@ static inline bool __test_and_change_bit(long nr, volatile unsigned long *addr) 
 */

static inline bool test_bit(long nr, const volatile unsigned long *addr)

{

	kasan_check_read(addr + BIT_WORD(nr), sizeof(long));

	instrument_atomic_read(addr + BIT_WORD(nr), sizeof(long));

	return arch_test_bit(nr, addr);

}