OrgACRN
/
acrn-kernel
mirror of https://github.com/projectacrn/acrn-kernel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

tools: KVM: selftests: Convert clear/set_bit() to actual atomics 

Convert {clear,set}_bit() to atomics as KVM's ucall implementation relies
on clear_bit() being atomic, they are defined in atomic.h, and the same
helpers in the kernel proper are atomic.

KVM's ucall infrastructure is the only user of clear_bit() in tools/, and
there are no true set_bit() users.  tools/testing/nvdimm/ does make heavy
use of set_bit(), but that code builds into a kernel module of sorts, i.e.
pulls in all of the kernel's header and so is already getting the kernel's
atomic set_bit().

Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-Id: <20221119013450.2643007-10-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Sean Christopherson 2022-11-19 01:34:50 +00:00 committed by Paolo Bonzini
parent 36293352ff
commit bb056c0f08
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/arch/x86/include/asm/atomic.h
View File

@ -76,4 +76,9 @@ static inline int test_and_set_bit(long nr, unsigned long *addr)
GEN_BINARY_RMWcc(LOCK_PREFIX __ASM_SIZE(bts), *addr, "Ir", nr, "%0", "c");
}
static inline int test_and_clear_bit(long nr, unsigned long *addr)
{
GEN_BINARY_RMWcc(LOCK_PREFIX __ASM_SIZE(btc), *addr, "Ir", nr, "%0", "c");
}
#endif /* _TOOLS_LINUX_ASM_X86_ATOMIC_H */

11
tools/include/asm-generic/atomic-gcc.h
View File

@ -81,4 +81,15 @@ static inline int test_and_set_bit(long nr, unsigned long *addr)
return !!(old & mask);
}
static inline int test_and_clear_bit(long nr, unsigned long *addr)
{
unsigned long mask = BIT_MASK(nr);
long old;
addr += BIT_WORD(nr);
old = __sync_fetch_and_and(addr, ~mask);
return !!(old & mask);
}
#endif /* __TOOLS_ASM_GENERIC_ATOMIC_H */

15
tools/include/asm-generic/bitops/atomic.h
View File

@ -5,14 +5,11 @@
#include <asm/types.h>
#include <asm/bitsperlong.h>
static inline void set_bit(unsigned long nr, unsigned long *addr)
{
addr[nr / __BITS_PER_LONG] |= 1UL << (nr % __BITS_PER_LONG);
}
static inline void clear_bit(unsigned long nr, unsigned long *addr)
{
addr[nr / __BITS_PER_LONG] &= ~(1UL << (nr % __BITS_PER_LONG));
}
/*
* Just alias the test versions, all of the compiler built-in atomics "fetch",
* and optimizing compile-time constants on x86 isn't worth the complexity.
*/
#define set_bit test_and_set_bit
#define clear_bit test_and_clear_bit
#endif /* _TOOLS_LINUX_ASM_GENERIC_BITOPS_ATOMIC_H_ */