Revert "KVM: Fix a data race on last_boosted_vcpu in kvm_vcpu_on_spin()"
This reverts commit 1ea1717b12
.
This commit is contained in:
parent
0a13b31c06
commit
f172b138b7
1 changed files with 2 additions and 3 deletions
|
@ -3090,13 +3090,12 @@ void kvm_vcpu_on_spin(struct kvm_vcpu *me, bool yield_to_kernel_mode)
|
||||||
{
|
{
|
||||||
struct kvm *kvm = me->kvm;
|
struct kvm *kvm = me->kvm;
|
||||||
struct kvm_vcpu *vcpu;
|
struct kvm_vcpu *vcpu;
|
||||||
int last_boosted_vcpu;
|
int last_boosted_vcpu = me->kvm->last_boosted_vcpu;
|
||||||
int yielded = 0;
|
int yielded = 0;
|
||||||
int try = 3;
|
int try = 3;
|
||||||
int pass;
|
int pass;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
last_boosted_vcpu = READ_ONCE(kvm->last_boosted_vcpu);
|
|
||||||
kvm_vcpu_set_in_spin_loop(me, true);
|
kvm_vcpu_set_in_spin_loop(me, true);
|
||||||
/*
|
/*
|
||||||
* We boost the priority of a VCPU that is runnable but not
|
* We boost the priority of a VCPU that is runnable but not
|
||||||
|
@ -3127,7 +3126,7 @@ void kvm_vcpu_on_spin(struct kvm_vcpu *me, bool yield_to_kernel_mode)
|
||||||
|
|
||||||
yielded = kvm_vcpu_yield_to(vcpu);
|
yielded = kvm_vcpu_yield_to(vcpu);
|
||||||
if (yielded > 0) {
|
if (yielded > 0) {
|
||||||
WRITE_ONCE(kvm->last_boosted_vcpu, i);
|
kvm->last_boosted_vcpu = i;
|
||||||
break;
|
break;
|
||||||
} else if (yielded < 0) {
|
} else if (yielded < 0) {
|
||||||
try--;
|
try--;
|
||||||
|
|
Loading…
Reference in a new issue