Commit c68a2aab authored by Matthew Wilcox's avatar Matthew Wilcox
Browse files

radix tree test suite: Remove duplicate bitops code 



By adding __set_bit and __clear_bit to the tools include directory, we
can share the bitops code.  This reveals an include loop between kernel.h,
log2.h, bitmap.h and bitops.h.  Break it the same way as the kernel does;
by moving the kernel.h include from bitops.h to bitmap.h.

Signed-off-by: default avatarMatthew Wilcox <mawilcox@microsoft.com>
parent 35534c86

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

+3 −0
Original line number Diff line number Diff line
@@ -20,4 +20,7 @@ static __always_inline int test_bit(unsigned int nr, const unsigned long *addr) 
		(((unsigned long *)addr)[nr / __BITS_PER_LONG])) != 0;

}



#define __set_bit(nr, addr)	set_bit(nr, addr)

#define __clear_bit(nr, addr)	clear_bit(nr, addr)



#endif /* _TOOLS_LINUX_ASM_GENERIC_BITOPS_ATOMIC_H_ */

tools/include/linux/bitmap.h

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <string.h>

#include <linux/bitops.h>

#include <stdlib.h>

#include <linux/kernel.h>



#define DECLARE_BITMAP(name,bits) \

	unsigned long name[BITS_TO_LONGS(bits)]

tools/include/linux/bitops.h

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#define _TOOLS_LINUX_BITOPS_H_



#include <asm/types.h>

#include <linux/kernel.h>

#include <linux/compiler.h>



#ifndef __WORDSIZE

tools/testing/radix-tree/linux/bitops.h

deleted100644 → 0
+0 −160
Original line number Diff line number Diff line 
#ifndef _ASM_GENERIC_BITOPS_NON_ATOMIC_H_

#define _ASM_GENERIC_BITOPS_NON_ATOMIC_H_



#include <linux/types.h>

#include <linux/bitops/find.h>

#include <linux/bitops/hweight.h>

#include <linux/kernel.h>



#define BIT_MASK(nr)		(1UL << ((nr) % BITS_PER_LONG))

#define BIT_WORD(nr)		((nr) / BITS_PER_LONG)

#define BITS_PER_BYTE		8

#define BITS_TO_LONGS(nr)	DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long))



/**

 * __set_bit - Set a bit in memory

 * @nr: the bit to set

 * @addr: the address to start counting from

 *

 * Unlike set_bit(), this function is non-atomic and may be reordered.

 * If it's called on the same region of memory simultaneously, the effect

 * may be that only one operation succeeds.

 */

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

{

	unsigned long mask = BIT_MASK(nr);

	unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr);



	*p  |= mask;

}



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

{

	unsigned long mask = BIT_MASK(nr);

	unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr);



	*p &= ~mask;

}



/**

 * __change_bit - Toggle a bit in memory

 * @nr: the bit to change

 * @addr: the address to start counting from

 *

 * Unlike change_bit(), this function is non-atomic and may be reordered.

 * If it's called on the same region of memory simultaneously, the effect

 * may be that only one operation succeeds.

 */

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

{

	unsigned long mask = BIT_MASK(nr);

	unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr);



	*p ^= mask;

}



/**

 * __test_and_set_bit - Set a bit and return its old value

 * @nr: Bit to set

 * @addr: Address to count from

 *

 * This operation is non-atomic and can be reordered.

 * If two examples of this operation race, one can appear to succeed

 * but actually fail.  You must protect multiple accesses with a lock.

 */

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

{

	unsigned long mask = BIT_MASK(nr);

	unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr);

	unsigned long old = *p;



	*p = old | mask;

	return (old & mask) != 0;

}



/**

 * __test_and_clear_bit - Clear a bit and return its old value

 * @nr: Bit to clear

 * @addr: Address to count from

 *

 * This operation is non-atomic and can be reordered.

 * If two examples of this operation race, one can appear to succeed

 * but actually fail.  You must protect multiple accesses with a lock.

 */

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

{

	unsigned long mask = BIT_MASK(nr);

	unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr);

	unsigned long old = *p;



	*p = old & ~mask;

	return (old & mask) != 0;

}



/* WARNING: non atomic and it can be reordered! */

static inline int __test_and_change_bit(int nr,

					    volatile unsigned long *addr)

{

	unsigned long mask = BIT_MASK(nr);

	unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr);

	unsigned long old = *p;



	*p = old ^ mask;

	return (old & mask) != 0;

}



/**

 * test_bit - Determine whether a bit is set

 * @nr: bit number to test

 * @addr: Address to start counting from

 */

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

{

	return 1UL & (addr[BIT_WORD(nr)] >> (nr & (BITS_PER_LONG-1)));

}



/**

 * __ffs - find first bit in word.

 * @word: The word to search

 *

 * Undefined if no bit exists, so code should check against 0 first.

 */

static inline unsigned long __ffs(unsigned long word)

{

	int num = 0;



	if ((word & 0xffffffff) == 0) {

		num += 32;

		word >>= 32;

	}

	if ((word & 0xffff) == 0) {

		num += 16;

		word >>= 16;

	}

	if ((word & 0xff) == 0) {

		num += 8;

		word >>= 8;

	}

	if ((word & 0xf) == 0) {

		num += 4;

		word >>= 4;

	}

	if ((word & 0x3) == 0) {

		num += 2;

		word >>= 2;

	}

	if ((word & 0x1) == 0)

		num += 1;

	return num;

}



unsigned long find_next_bit(const unsigned long *addr,

			    unsigned long size,

			    unsigned long offset);



static inline unsigned long hweight_long(unsigned long w)

{

	return sizeof(w) == 4 ? hweight32(w) : hweight64(w);

}



#endif /* _ASM_GENERIC_BITOPS_NON_ATOMIC_H_ */

tools/testing/radix-tree/linux/bitops/__ffs.h

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
#ifndef _ASM_GENERIC_BITOPS___FFS_H_

#define _ASM_GENERIC_BITOPS___FFS_H_



#include <asm/types.h>



/**

 * __ffs - find first bit in word.

 * @word: The word to search

 *

 * Undefined if no bit exists, so code should check against 0 first.

 */

static inline unsigned long __ffs(unsigned long word)

{

	int num = 0;



#if BITS_PER_LONG == 64

	if ((word & 0xffffffff) == 0) {

		num += 32;

		word >>= 32;

	}

#endif

	if ((word & 0xffff) == 0) {

		num += 16;

		word >>= 16;

	}

	if ((word & 0xff) == 0) {

		num += 8;

		word >>= 8;

	}

	if ((word & 0xf) == 0) {

		num += 4;

		word >>= 4;

	}

	if ((word & 0x3) == 0) {

		num += 2;

		word >>= 2;

	}

	if ((word & 0x1) == 0)

		num += 1;

	return num;

}



#endif /* _ASM_GENERIC_BITOPS___FFS_H_ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE