Commit 04def1b9 authored by Marco Elver's avatar Marco Elver Committed by Paul E. McKenney
Browse files

asm-generic/bitops, kcsan: Add instrumentation for barriers 



Adds the required KCSAN instrumentation for barriers of atomic bitops.

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

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

+3 −0
Original line number Diff line number Diff line
@@ -67,6 +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)

{

	kcsan_mb();

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

	return arch_test_and_set_bit(nr, addr);

}
@@ -80,6 +81,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)

{

	kcsan_mb();

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

	return arch_test_and_clear_bit(nr, addr);

}
@@ -93,6 +95,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)

{

	kcsan_mb();

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

	return arch_test_and_change_bit(nr, addr);

}

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

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
 */

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

{

	kcsan_release();

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

	arch_clear_bit_unlock(nr, addr);

}
@@ -37,6 +38,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)

{

	kcsan_release();

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

	arch___clear_bit_unlock(nr, addr);

}
@@ -71,6 +73,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)

{

	kcsan_release();

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

	return arch_clear_bit_unlock_is_negative_byte(nr, addr);

}