github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-20 12:42:54 +00:00
Code Issues Projects Releases Wiki Activity

hv: Serialize WBINVD using wbinvd_lock

Browse Source 
As mentioned in previous patch, wbinvd utilizes the vcpu_make_request
and signal_event call pair to stall other vcpus. Due to the fact that
these two calls are not thread-safe, we need to avoid concurrent call to
this API pair.

This patch adds wbinvd lock to serialize wbinvd emulation.

Tracked-On: #7887
Signed-off-by: Yifan Liu <yifan1.liu@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Yifan Liu 2022-04-21 07:07:57 +00:00 committed by acrnsi-robot
parent 745e70fb06
commit 05460f151a
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hypervisor/arch/x86/guest/vmexit.c
View File

@ -438,6 +438,7 @@ static int32_t wbinvd_vmexit_handler(struct acrn_vcpu *vcpu)
if (is_rt_vm(vcpu->vm)) { if (is_rt_vm(vcpu->vm)) {
walk_ept_table(vcpu->vm, ept_flush_leaf_page); walk_ept_table(vcpu->vm, ept_flush_leaf_page);
} else { } else {
spinlock_obtain(&vcpu->vm->wbinvd_lock);
/* Pause other vcpus and let them wait for the wbinvd completion */ /* Pause other vcpus and let them wait for the wbinvd completion */
foreach_vcpu(i, vcpu->vm, other) { foreach_vcpu(i, vcpu->vm, other) {
if (other != vcpu) { if (other != vcpu) {
@ -452,6 +453,7 @@ static int32_t wbinvd_vmexit_handler(struct acrn_vcpu *vcpu)
signal_event(&other->events[VCPU_EVENT_SYNC_WBINVD]); signal_event(&other->events[VCPU_EVENT_SYNC_WBINVD]);
} }
} }
spinlock_release(&vcpu->vm->wbinvd_lock);
} }
} }

1
hypervisor/include/arch/x86/asm/guest/vm.h
View File

@ -149,6 +149,7 @@ struct acrn_vm {
* the initialization depends on the clear BSS section * the initialization depends on the clear BSS section
*/ */
spinlock_t vm_state_lock; spinlock_t vm_state_lock;
spinlock_t wbinvd_lock; /* Spin-lock used to serialize wbinvd emulation */
spinlock_t vlapic_mode_lock; /* Spin-lock used to protect vlapic_mode modifications for a VM */ spinlock_t vlapic_mode_lock; /* Spin-lock used to protect vlapic_mode modifications for a VM */
spinlock_t ept_lock; /* Spin-lock used to protect ept add/modify/remove for a VM */ spinlock_t ept_lock; /* Spin-lock used to protect ept add/modify/remove for a VM */
spinlock_t emul_mmio_lock; /* Used to protect emulation mmio_node concurrent access for a VM */ spinlock_t emul_mmio_lock; /* Used to protect emulation mmio_node concurrent access for a VM */