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

asm-generic/bitops: Use instrument_read_write() where appropriate 



Use the new instrument_read_write() where appropriate.

Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarMarco Elver <elver@google.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent 00047c2e

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

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

{

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

	instrument_atomic_read_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)

{

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

	instrument_atomic_read_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)

{

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

	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

+1 −1
Original line number Diff line number Diff line
@@ -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)

{

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

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

	return arch_test_and_set_bit_lock(nr, addr);

}

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

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

{

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

	instrument_read_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)

{

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

	instrument_read_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)

{

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

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

	return arch___test_and_change_bit(nr, addr);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE