KVM: PPC: fix exit accounting for SPRs, tlbwe, tlbsx
Subsystems (2)
PATCH 1/2 KVM: PPC: fix exit accounting for SPRs, tlbwe, tlbsx
The exit type setting for mfspr/mtspr is moved from 44x to toplevel SPR emulation. This enables it on e500, and makes sure that all SPRs are covered.
Exit accounting for tlbwe and tlbsx is added to e500.
Signed-off-by Stuart Yoder <[email protected]>
Signed-off-by Scott Wood <[email protected]>
--- arch/powerpc/kvm/44x_emulate.c | 2 -- arch/powerpc/kvm/e500_tlb.c | 5 ++++- arch/powerpc/kvm/emulate.c | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-)
arch/powerpc/kvm/44x_emulate.c +0 -2
@@ -158,7 +158,6 @@ int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs) emulated =kvmppc_booke_emulate_mtspr (vcpu, sprn, rs); } -kvmppc_set_exit_type (vcpu,EMULATED_MTSPR_EXITS );return emulated; }
@@ -179,7 +178,6 @@ int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt) emulated =kvmppc_booke_emulate_mfspr (vcpu, sprn, rt); } -kvmppc_set_exit_type (vcpu,EMULATED_MFSPR_EXITS );return emulated; }
arch/powerpc/kvm/e500_tlb.c +4 -1
@@ -1,5 +1,5 @@/* -* Copyright (C) 2008 Freescale Semiconductor, Inc. All rights reserved. +* Copyright (C) 2008-2011 Freescale Semiconductor, Inc. All rights reserved. * * Author: Yu Liu, [email protected] *
@@ -24,6 +24,7 @@#include "../mm/mmu_decl.h" #include "e500_tlb.h" #include "trace.h" +#include "timing.h" #define to_htlb1_esel (esel) (tlb1_entry_num - (esel) - 1)
@@ -506,6 +507,7 @@ int kvmppc_e500_emul_tlbsx(struct kvm_vcpu *vcpu, int rb) vcpu_e500->mas7 =0 ; } +kvmppc_set_exit_type (vcpu,EMULATED_TLBSX_EXITS );return EMULATE_DONE ; }
@@ -571,6 +573,7 @@ int kvmppc_e500_emul_tlbwe(struct kvm_vcpu *vcpu)write_host_tlbe (vcpu_e500, stlbsel, sesel); } +kvmppc_set_exit_type (vcpu,EMULATED_TLBWE_EXITS );return EMULATE_DONE ; }
arch/powerpc/kvm/emulate.c +2 -0
@@ -296,6 +296,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu) }break ; } +kvmppc_set_exit_type (vcpu,EMULATED_MFSPR_EXITS );break ;case OP_31_XOP_STHX :
@@ -365,6 +366,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)printk ("mtspr: unknown spr %x\n" , sprn);break ; } +kvmppc_set_exit_type (vcpu,EMULATED_MTSPR_EXITS );break ;case OP_31_XOP_DCBI :
Signature · 1 line
1.7.1
Quoted 8 lines · Scott Wood
The exit type setting for mfspr/mtspr is moved from 44x to toplevel SPR emulation. This enables it on e500, and makes sure that all SPRs are covered.
Exit accounting for tlbwe and tlbsx is added to e500.
Signed-off-by Stuart Yoder <[email protected]>Signed-off-by Scott Wood <[email protected]>
Both patches look fine to me. Avi, please ack.
Alex