On Mon, Feb 27, 2017 at 06:55:00PM +0100, Andrew Jones wrote: > Make sure we don't leave vcpu requests we don't intend to > handle later set in the request bitmap. If we don't clear > them, then kvm_request_pending() may return true when we > don't want it to. > > Signed-off-by: Andrew Jones <drjones@xxxxxxxxxx> Acked-by: Christoffer Dall <cdall@xxxxxxxxxx> > --- > arch/arm/kvm/handle_exit.c | 1 + > arch/arm/kvm/psci.c | 1 + > arch/arm64/kvm/handle_exit.c | 1 + > 3 files changed, 3 insertions(+) > > diff --git a/arch/arm/kvm/handle_exit.c b/arch/arm/kvm/handle_exit.c > index 4e40d1955e35..2ec31748fa0b 100644 > --- a/arch/arm/kvm/handle_exit.c > +++ b/arch/arm/kvm/handle_exit.c > @@ -72,6 +72,7 @@ static int kvm_handle_wfx(struct kvm_vcpu *vcpu, struct kvm_run *run) > trace_kvm_wfx(*vcpu_pc(vcpu), false); > vcpu->stat.wfi_exit_stat++; > kvm_vcpu_block(vcpu); > + __kvm_request_clear(KVM_REQ_UNHALT, vcpu); > } > > kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu)); > diff --git a/arch/arm/kvm/psci.c b/arch/arm/kvm/psci.c > index c2b131527a64..fd7e381b13b2 100644 > --- a/arch/arm/kvm/psci.c > +++ b/arch/arm/kvm/psci.c > @@ -57,6 +57,7 @@ static unsigned long kvm_psci_vcpu_suspend(struct kvm_vcpu *vcpu) > * for KVM will preserve the register state. > */ > kvm_vcpu_block(vcpu); > + __kvm_request_clear(KVM_REQ_UNHALT, vcpu); > > return PSCI_RET_SUCCESS; > } > diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c > index 1bfe30dfbfe7..b34971d7c30a 100644 > --- a/arch/arm64/kvm/handle_exit.c > +++ b/arch/arm64/kvm/handle_exit.c > @@ -89,6 +89,7 @@ static int kvm_handle_wfx(struct kvm_vcpu *vcpu, struct kvm_run *run) > trace_kvm_wfx_arm64(*vcpu_pc(vcpu), false); > vcpu->stat.wfi_exit_stat++; > kvm_vcpu_block(vcpu); > + __kvm_request_clear(KVM_REQ_UNHALT, vcpu); > } > > kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu)); > -- > 2.9.3 > _______________________________________________ kvmarm mailing list kvmarm@xxxxxxxxxxxxxxxxxxxxx https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
