Commit 43a28986 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull more powerpc updates from Michael Ellerman:
 "A few commits splitting the KASAN instrumented bitops header in three,
  to match the split of the asm-generic bitops headers.

  This is needed on powerpc because we use the generic bitops for the
  non-atomic case only, whereas the existing KASAN instrumented bitops
  assume all the underlying operations are provided by the arch as
  arch_foo() versions.

  Thanks to: Daniel Axtens & Christophe Leroy"

* tag 'powerpc-5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  docs/core-api: Remove possibly confusing sub-headings from Bit Operations
  powerpc: support KASAN instrumentation of bitops
  kasan: support instrumented bitops combined with generic bitops
parents f89d416a 4f4afc2c

Documentation/core-api/kernel-api.rst

+7 −1
Original line number Diff line number Diff line
@@ -57,7 +57,13 @@ The Linux kernel provides more basic utility functions. 
Bit Operations

--------------



.. kernel-doc:: include/asm-generic/bitops-instrumented.h

.. kernel-doc:: include/asm-generic/bitops/instrumented-atomic.h

   :internal:



.. kernel-doc:: include/asm-generic/bitops/instrumented-non-atomic.h

   :internal:



.. kernel-doc:: include/asm-generic/bitops/instrumented-lock.h

   :internal:



Bitmap Operations

arch/powerpc/include/asm/bitops.h

+29 −22
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 


/* Macro for generating the ***_bits() functions */

#define DEFINE_BITOP(fn, op, prefix)		\

static __inline__ void fn(unsigned long mask,	\

static inline void fn(unsigned long mask,	\

		volatile unsigned long *_p)	\

{						\

	unsigned long old;			\
@@ -86,22 +86,22 @@ DEFINE_BITOP(clear_bits, andc, "") 
DEFINE_BITOP(clear_bits_unlock, andc, PPC_RELEASE_BARRIER)

DEFINE_BITOP(change_bits, xor, "")



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

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

{

	set_bits(BIT_MASK(nr), addr + BIT_WORD(nr));

}



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

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

{

	clear_bits(BIT_MASK(nr), addr + BIT_WORD(nr));

}



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

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

{

	clear_bits_unlock(BIT_MASK(nr), addr + BIT_WORD(nr));

}



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

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

{

	change_bits(BIT_MASK(nr), addr + BIT_WORD(nr));

}
@@ -109,7 +109,7 @@ static __inline__ void change_bit(int nr, volatile unsigned long *addr) 
/* Like DEFINE_BITOP(), with changes to the arguments to 'op' and the output

 * operands. */

#define DEFINE_TESTOP(fn, op, prefix, postfix, eh)	\

static __inline__ unsigned long fn(			\

static inline unsigned long fn(			\

		unsigned long mask,			\

		volatile unsigned long *_p)		\

{							\
@@ -138,34 +138,34 @@ DEFINE_TESTOP(test_and_clear_bits, andc, PPC_ATOMIC_ENTRY_BARRIER, 
DEFINE_TESTOP(test_and_change_bits, xor, PPC_ATOMIC_ENTRY_BARRIER,

	      PPC_ATOMIC_EXIT_BARRIER, 0)



static __inline__ int test_and_set_bit(unsigned long nr,

static inline int arch_test_and_set_bit(unsigned long nr,

					volatile unsigned long *addr)

{

	return test_and_set_bits(BIT_MASK(nr), addr + BIT_WORD(nr)) != 0;

}



static __inline__ int test_and_set_bit_lock(unsigned long nr,

static inline int arch_test_and_set_bit_lock(unsigned long nr,

					     volatile unsigned long *addr)

{

	return test_and_set_bits_lock(BIT_MASK(nr),

				addr + BIT_WORD(nr)) != 0;

}



static __inline__ int test_and_clear_bit(unsigned long nr,

static inline int arch_test_and_clear_bit(unsigned long nr,

					  volatile unsigned long *addr)

{

	return test_and_clear_bits(BIT_MASK(nr), addr + BIT_WORD(nr)) != 0;

}



static __inline__ int test_and_change_bit(unsigned long nr,

static inline int arch_test_and_change_bit(unsigned long nr,

					   volatile unsigned long *addr)

{

	return test_and_change_bits(BIT_MASK(nr), addr + BIT_WORD(nr)) != 0;

}



#ifdef CONFIG_PPC64

static __inline__ unsigned long clear_bit_unlock_return_word(int nr,

						volatile unsigned long *addr)

static inline unsigned long

clear_bit_unlock_return_word(int nr, volatile unsigned long *addr)

{

	unsigned long old, t;

	unsigned long *p = (unsigned long *)addr + BIT_WORD(nr);
@@ -185,15 +185,18 @@ static __inline__ unsigned long clear_bit_unlock_return_word(int nr, 
	return old;

}



/* This is a special function for mm/filemap.c */

#define clear_bit_unlock_is_negative_byte(nr, addr)			\

	(clear_bit_unlock_return_word(nr, addr) & BIT_MASK(PG_waiters))

/*

 * This is a special function for mm/filemap.c

 * Bit 7 corresponds to PG_waiters.

 */

#define arch_clear_bit_unlock_is_negative_byte(nr, addr)		\

	(clear_bit_unlock_return_word(nr, addr) & BIT_MASK(7))



#endif /* CONFIG_PPC64 */



#include <asm-generic/bitops/non-atomic.h>



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

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

{

	__asm__ __volatile__(PPC_RELEASE_BARRIER "" ::: "memory");

	__clear_bit(nr, addr);
@@ -215,14 +218,14 @@ static __inline__ void __clear_bit_unlock(int nr, volatile unsigned long *addr) 
 * fls: find last (most-significant) bit set.

 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.

 */

static __inline__ int fls(unsigned int x)

static inline int fls(unsigned int x)

{

	return 32 - __builtin_clz(x);

}



#include <asm-generic/bitops/builtin-__fls.h>



static __inline__ int fls64(__u64 x)

static inline int fls64(__u64 x)

{

	return 64 - __builtin_clzll(x);

}
@@ -239,6 +242,10 @@ unsigned long __arch_hweight64(__u64 w); 


#include <asm-generic/bitops/find.h>



/* wrappers that deal with KASAN instrumentation */

#include <asm-generic/bitops/instrumented-atomic.h>

#include <asm-generic/bitops/instrumented-lock.h>



/* Little-endian versions */

#include <asm-generic/bitops/le.h>

arch/s390/include/asm/bitops.h

+3 −1
Original line number Diff line number Diff line
@@ -241,7 +241,9 @@ static inline void arch___clear_bit_unlock(unsigned long nr, 
	arch___clear_bit(nr, ptr);

}



#include <asm-generic/bitops-instrumented.h>

#include <asm-generic/bitops/instrumented-atomic.h>

#include <asm-generic/bitops/instrumented-non-atomic.h>

#include <asm-generic/bitops/instrumented-lock.h>



/*

 * Functions which use MSB0 bit numbering.

arch/x86/include/asm/bitops.h

+3 −1
Original line number Diff line number Diff line
@@ -388,7 +388,9 @@ static __always_inline int fls64(__u64 x) 


#include <asm-generic/bitops/const_hweight.h>



#include <asm-generic/bitops-instrumented.h>

#include <asm-generic/bitops/instrumented-atomic.h>

#include <asm-generic/bitops/instrumented-non-atomic.h>

#include <asm-generic/bitops/instrumented-lock.h>



#include <asm-generic/bitops/le.h>

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

0 → 100644
+100 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



/*

 * This file provides wrappers with sanitizer instrumentation for atomic bit

 * operations.

 *

 * To use this functionality, an arch's bitops.h file needs to define each of

 * the below bit operations with an arch_ prefix (e.g. arch_set_bit(),

 * arch___set_bit(), etc.).

 */

#ifndef _ASM_GENERIC_BITOPS_INSTRUMENTED_ATOMIC_H

#define _ASM_GENERIC_BITOPS_INSTRUMENTED_ATOMIC_H



#include <linux/kasan-checks.h>



/**

 * set_bit - Atomically set a bit in memory

 * @nr: the bit to set

 * @addr: the address to start counting from

 *

 * This is a relaxed atomic operation (no implied memory barriers).

 *

 * Note that @nr may be almost arbitrarily large; this function is not

 * restricted to acting on a single-word quantity.

 */

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

{

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

	arch_set_bit(nr, addr);

}



/**

 * clear_bit - Clears a bit in memory

 * @nr: Bit to clear

 * @addr: Address to start counting from

 *

 * This is a relaxed atomic operation (no implied memory barriers).

 */

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

{

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

	arch_clear_bit(nr, addr);

}



/**

 * change_bit - Toggle a bit in memory

 * @nr: Bit to change

 * @addr: Address to start counting from

 *

 * This is a relaxed atomic operation (no implied memory barriers).

 *

 * Note that @nr may be almost arbitrarily large; this function is not

 * restricted to acting on a single-word quantity.

 */

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

{

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

	arch_change_bit(nr, addr);

}



/**

 * test_and_set_bit - Set a bit and return its old value

 * @nr: Bit to set

 * @addr: Address to count from

 *

 * This is an atomic fully-ordered operation (implied full memory barrier).

 */

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

{

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

	return arch_test_and_set_bit(nr, addr);

}



/**

 * test_and_clear_bit - Clear a bit and return its old value

 * @nr: Bit to clear

 * @addr: Address to count from

 *

 * This is an atomic fully-ordered operation (implied full memory barrier).

 */

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

{

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

	return arch_test_and_clear_bit(nr, addr);

}



/**

 * test_and_change_bit - Change a bit and return its old value

 * @nr: Bit to change

 * @addr: Address to count from

 *

 * This is an atomic fully-ordered operation (implied full memory barrier).

 */

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

{

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

	return arch_test_and_change_bit(nr, addr);

}



#endif /* _ASM_GENERIC_BITOPS_INSTRUMENTED_NON_ATOMIC_H */