KVM: PPC: Add return value to core_check_requests
Subsystems (2)
PATCH 31/56 KVM: PPC: Add return value to core_check_requests
Requests may want to tell us that we need to go back into host state, so add a return value for the checks.
Signed-off-by Alexander Graf <[email protected]>
--- arch/powerpc/include/asm/kvm_ppc.h | 2 +- arch/powerpc/kvm/book3s_pr.c | 6 +++++- arch/powerpc/kvm/booke.c | 6 +++++- arch/powerpc/kvm/powerpc.c | 6 ++++-- 4 files changed, 15 insertions(+), 5 deletions(-)
arch/powerpc/include/asm/kvm_ppc.h +1 -1
@@ -112,7 +112,7 @@ extern int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, ulong val);extern int kvmppc_core_emulate_mfspr (struct kvm_vcpu *vcpu,int sprn,ulong *val); -extern void kvmppc_core_check_requests (struct kvm_vcpu *vcpu); +extern int kvmppc_core_check_requests (struct kvm_vcpu *vcpu);extern int kvmppc_booke_init (void );extern void kvmppc_booke_exit (void );
arch/powerpc/kvm/book3s_pr.c +5 -1
@@ -86,12 +86,16 @@ void kvmppc_core_vcpu_put(struct kvm_vcpu *vcpu)kvmppc_giveup_ext (vcpu,MSR_VSX ); } -void kvmppc_core_check_requests (struct kvm_vcpu *vcpu) +int kvmppc_core_check_requests (struct kvm_vcpu *vcpu) { +int r =1 ;/* Indicate we want to get back into the guest */ +/* We misuse TLB_FLUSH to indicate that we want to clear all shadow cache entries */ if (kvm_check_request (KVM_REQ_TLB_FLUSH , vcpu))kvmppc_mmu_pte_flush (vcpu,0 ,0 ); + +return r; }/************* MMU Notifiers *************/
arch/powerpc/kvm/booke.c +5 -1
@@ -455,14 +455,18 @@ int kvmppc_core_prepare_to_enter(struct kvm_vcpu *vcpu)return r; } -void kvmppc_core_check_requests (struct kvm_vcpu *vcpu) +int kvmppc_core_check_requests (struct kvm_vcpu *vcpu) { +int r =1 ;/* Indicate we want to get back into the guest */ +if (kvm_check_request (KVM_REQ_PENDING_TIMER , vcpu))update_timer_ints (vcpu);#if defined(CONFIG_KVM_E500V2 ) || defined(CONFIG_KVM_E500MC )if (kvm_check_request (KVM_REQ_TLB_FLUSH , vcpu))kvmppc_core_flush_tlb (vcpu);#endif + +return r; }int kvmppc_vcpu_run (struct kvm_run *kvm_run,struct kvm_vcpu *vcpu)
arch/powerpc/kvm/powerpc.c +4 -2
@@ -83,9 +83,11 @@ int kvmppc_prepare_to_enter(struct kvm_vcpu *vcpu)/* Make sure we process requests preemptable */ local_irq_enable ();trace_kvm_check_requests (vcpu); -kvmppc_core_check_requests (vcpu); + r =kvmppc_core_check_requests (vcpu);local_irq_disable (); -continue ; +if (r >0 ) +continue ; +break ; }if (kvmppc_core_prepare_to_enter (vcpu)) {
Signature · 1 line
1.6.0.2