github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-25 15:02:13 +00:00
Code Issues Projects Releases Wiki Activity

hv: add non-lock bitmap operation

Browse Source 
Add __bitmap_set/clear,
__bitmap_test_and_set/clear.

Signed-off-by: Li, Fei1 <fei1.li@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Li, Fei1 2018-05-22 13:51:36 +08:00 committed by lijinxia
parent efb60e2726
commit 34445008c2
2 changed files with 66 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hypervisor/arch/x86/cpu.c
View File

@ -431,7 +431,7 @@ void bsp_boot_init(void)
VMX_MACHINE_T_GUEST_SPEC_CTRL_OFFSET, VMX_MACHINE_T_GUEST_SPEC_CTRL_OFFSET,
"run_context ia32_spec_ctrl offset not match"); "run_context ia32_spec_ctrl offset not match");
bitmap_set(CPU_BOOT_ID, &pcpu_active_bitmap); __bitmap_set(CPU_BOOT_ID, &pcpu_active_bitmap);
/* Get CPU capabilities thru CPUID, including the physical address bit /* Get CPU capabilities thru CPUID, including the physical address bit
* limit which is required for initializing paging. * limit which is required for initializing paging.
@ -533,7 +533,7 @@ void bsp_boot_init(void)
start_cpus(); start_cpus();
/* Trigger event to allow secondary CPUs to continue */ /* Trigger event to allow secondary CPUs to continue */
bitmap_set(0, &pcpu_sync); __bitmap_set(0, &pcpu_sync);
ASSERT(get_cpu_id() == CPU_BOOT_ID, ""); ASSERT(get_cpu_id() == CPU_BOOT_ID, "");
@ -578,7 +578,7 @@ void cpu_secondary_init(void)
(get_cur_lapic_id()), (get_cur_lapic_id()),
CPU_STATE_INITIALIZING); CPU_STATE_INITIALIZING);
bitmap_set(get_cpu_id(), &pcpu_active_bitmap); __bitmap_set(get_cpu_id(), &pcpu_active_bitmap);
/* Switch to run-time stack */ /* Switch to run-time stack */
CPU_SP_WRITE(&get_cpu_var(stack)[STACK_SIZE - 1]); CPU_SP_WRITE(&get_cpu_var(stack)[STACK_SIZE - 1]);
@ -685,7 +685,7 @@ void cpu_dead(uint32_t logical_id)
/* Set state to show CPU is halted */ /* Set state to show CPU is halted */
cpu_set_current_state(logical_id, CPU_STATE_HALTED); cpu_set_current_state(logical_id, CPU_STATE_HALTED);
bitmap_clear(get_cpu_id(), &pcpu_active_bitmap); __bitmap_clear(get_cpu_id(), &pcpu_active_bitmap);
/* Halt the CPU */ /* Halt the CPU */
do { do {

110
hypervisor/include/lib/bits.h
View File

@ -141,68 +141,82 @@ static inline int clz64(unsigned long value)
return (63 - fls64(value)); return (63 - fls64(value));
} }
static inline void /*
bitmap_set(int mask, unsigned long *bits) * (*addr) |= (1UL<<nr);
{ */
/* (*bits) |= (1UL<<mask); */ #define build_bitmap_set(name, lock, nr, addr) \
asm volatile(BUS_LOCK "orq %1,%0" static inline void name(int nr, unsigned long *addr) \
: "+m" (*bits) { \
: "r" (1UL<<mask) asm volatile(lock "orq %1,%0" \
: "cc", "memory"); : "+m" (*addr) \
: "r" (1UL<<nr) \
: "cc", "memory"); \
} }
build_bitmap_set(__bitmap_set, "", nr, addr)
build_bitmap_set(bitmap_set, BUS_LOCK, nr, addr)
static inline void /*
bitmap_clear(int mask, unsigned long *bits) * (*addr) &= ~(1UL<<nr);
{ */
/* (*bits) &= ~(1UL<<mask); */ #define build_bitmap_clear(name, lock, nr, addr) \
asm volatile(BUS_LOCK "andq %1,%0" static inline void name(int nr, unsigned long *addr) \
: "+m" (*bits) { \
: "r" (~(1UL<<mask)) asm volatile(lock "andq %1,%0" \
: "cc", "memory"); : "+m" (*addr) \
: "r" (~(1UL<<nr)) \
: "cc", "memory"); \
} }
build_bitmap_clear(__bitmap_clear, "", nr, addr)
build_bitmap_clear(bitmap_clear, BUS_LOCK, nr, addr)
static inline bool /*
bitmap_test(int mask, unsigned long *bits) * return !!((*addr) & (1UL<<nr));
*/
static inline bool bitmap_test(int nr, unsigned long *addr)
{ {
/*
* return !!((*bits) & (1UL<<mask));
*/
int ret; int ret;
asm volatile("btq %2,%1\n\tsbbl %0, %0" asm volatile("btq %2,%1\n\tsbbl %0, %0"
: "=r" (ret), "=m" (*bits) : "=r" (ret), "=m" (*addr)
: "r" ((long)(mask & 0x3f)) : "r" ((long)(nr & 0x3f))
: "cc", "memory"); : "cc", "memory");
return (!!ret); return (!!ret);
} }
static inline bool /*
bitmap_test_and_set(int mask, unsigned long *bits) * bool ret = (*addr) & (1UL<<nr);
{ * (*addr) |= (1UL<<nr);
int ret; * return ret;
*/
asm volatile(BUS_LOCK "btsq %2,%1\n\tsbbl %0,%0" #define build_bitmap_testandset(name, lock, nr, addr) \
: "=r" (ret), "=m" (*bits) static inline bool name(int nr, unsigned long *addr) \
: "r" ((long)(mask & 0x3f)) { \
: "cc", "memory"); int ret; \
return (!!ret); asm volatile(lock "btsq %2,%1\n\tsbbl %0,%0" \
: "=r" (ret), "=m" (*addr) \
: "r" ((long)(nr & 0x3f)) \
: "cc", "memory"); \
return (!!ret); \
} }
build_bitmap_testandset(__bitmap_test_and_set, "", nr, addr)
build_bitmap_testandset(bitmap_test_and_set, BUS_LOCK, nr, addr)
static inline bool /*
bitmap_test_and_clear(int mask, unsigned long *bits) * bool ret = (*addr) & (1UL<<nr);
{ * (*addr) &= ~(1UL<<nr);
/* * return ret;
* bool ret = (*bits) & (1UL<<mask); */
* (*bits) &= ~(1UL<<mask); #define build_bitmap_testandclear(name, lock, nr, addr) \
* return ret; static inline bool name(int nr, unsigned long *addr) \
*/ { \
int ret; int ret; \
asm volatile(lock "btrq %2,%1\n\tsbbl %0,%0" \
asm volatile(BUS_LOCK "btrq %2,%1\n\tsbbl %0,%0" : "=r" (ret), "=m" (*addr) \
: "=r" (ret), "=m" (*bits) : "r" ((long)(nr & 0x3f)) \
: "r" ((long)(mask & 0x3f)) : "cc", "memory"); \
: "cc", "memory"); return (!!ret); \
return (!!ret);
} }
build_bitmap_testandclear(__bitmap_test_and_clear, "", nr, addr)
build_bitmap_testandclear(bitmap_test_and_clear, BUS_LOCK, nr, addr)
#endif /* BITS_H*/ #endif /* BITS_H*/