|
@@ -5966,10 +5966,12 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
|
|
|
|
|
|
vcpu->mode = IN_GUEST_MODE;
|
|
|
|
|
|
+ srcu_read_unlock(&vcpu->kvm->srcu, vcpu->srcu_idx);
|
|
|
+
|
|
|
/* We should set ->mode before check ->requests,
|
|
|
* see the comment in make_all_cpus_request.
|
|
|
*/
|
|
|
- smp_mb();
|
|
|
+ smp_mb__after_srcu_read_unlock();
|
|
|
|
|
|
local_irq_disable();
|
|
|
|
|
@@ -5979,12 +5981,11 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
|
|
|
smp_wmb();
|
|
|
local_irq_enable();
|
|
|
preempt_enable();
|
|
|
+ vcpu->srcu_idx = srcu_read_lock(&vcpu->kvm->srcu);
|
|
|
r = 1;
|
|
|
goto cancel_injection;
|
|
|
}
|
|
|
|
|
|
- srcu_read_unlock(&vcpu->kvm->srcu, vcpu->srcu_idx);
|
|
|
-
|
|
|
if (req_immediate_exit)
|
|
|
smp_send_reschedule(vcpu->cpu);
|
|
|
|