KVM: PPC: BOOK3S: PR: Emulate instruction counter

Writing to IC is not allowed in the privileged mode.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>

5 files changed, 14 insertions, 6 deletions

diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h
index bd3caeaeebe1..f9ae69682ce1 100644
--- a/arch/powerpc/include/asm/kvm_host.h
+++ b/arch/powerpc/include/asm/kvm_host.h
@@ -506,6 +506,7 @@ struct kvm_vcpu_arch {
         /* Time base value when we entered the guest */
         u64 entry_tb;
         u64 entry_vtb;
+        u64 entry_ic;
         u32 tcr;
         ulong tsr; /* we need to perform set/clr_bits() which requires ulong */
         u32 ivor[64];
diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c
index ddce1ea8ac4a..90aa5c750e08 100644
--- a/arch/powerpc/kvm/book3s.c
+++ b/arch/powerpc/kvm/book3s.c
@@ -649,6 +649,9 @@ int kvm_vcpu_ioctl_get_one_reg(struct kvm_vcpu *vcpu, struct kvm_one_reg *reg)
                 case KVM_REG_PPC_VTB:
                         val = get_reg_val(reg->id, vcpu->arch.vtb);
                         break;
+                case KVM_REG_PPC_IC:
+                        val = get_reg_val(reg->id, vcpu->arch.ic);
+                        break;
                 default:
                         r = -EINVAL;
                         break;
@@ -756,6 +759,9 @@ int kvm_vcpu_ioctl_set_one_reg(struct kvm_vcpu *vcpu, struct kvm_one_reg *reg)
                 case KVM_REG_PPC_VTB:
                         vcpu->arch.vtb = set_reg_val(reg->id, val);
                         break;
+                case KVM_REG_PPC_IC:
+                        vcpu->arch.ic = set_reg_val(reg->id, val);
+                        break;
                 default:
                         r = -EINVAL;
                         break;
diff --git a/arch/powerpc/kvm/book3s_emulate.c b/arch/powerpc/kvm/book3s_emulate.c
index 1bb16a59dcbc..84fddcd6c1f8 100644
--- a/arch/powerpc/kvm/book3s_emulate.c
+++ b/arch/powerpc/kvm/book3s_emulate.c
@@ -580,6 +580,9 @@ int kvmppc_core_emulate_mfspr_pr(struct kvm_vcpu *vcpu, int sprn, ulong *spr_val
         case SPRN_VTB:
                 *spr_val = vcpu->arch.vtb;
                 break;
+        case SPRN_IC:
+                *spr_val = vcpu->arch.ic;
+                break;
         case SPRN_GQR0:
         case SPRN_GQR1:
         case SPRN_GQR2:
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index 315e8849ecf3..1562acfa05bf 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -894,9 +894,6 @@ static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,
         case KVM_REG_PPC_CIABR:
                 *val = get_reg_val(id, vcpu->arch.ciabr);
                 break;
-        case KVM_REG_PPC_IC:
-                *val = get_reg_val(id, vcpu->arch.ic);
-                break;
         case KVM_REG_PPC_CSIGR:
                 *val = get_reg_val(id, vcpu->arch.csigr);
                 break;
@@ -1091,9 +1088,6 @@ static int kvmppc_set_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,
                 if ((vcpu->arch.ciabr & CIABR_PRIV) == CIABR_PRIV_HYPER)
                         vcpu->arch.ciabr &= ~CIABR_PRIV;        /* disable */
                 break;
-        case KVM_REG_PPC_IC:
-                vcpu->arch.ic = set_reg_val(id, *val);
-                break;
         case KVM_REG_PPC_CSIGR:
                 vcpu->arch.csigr = set_reg_val(id, *val);
                 break;
diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c
index d2deb9e45095..3da412e16b3a 100644
--- a/arch/powerpc/kvm/book3s_pr.c
+++ b/arch/powerpc/kvm/book3s_pr.c
@@ -126,6 +126,8 @@ void kvmppc_copy_to_svcpu(struct kvmppc_book3s_shadow_vcpu *svcpu,
          */
         vcpu->arch.entry_tb = get_tb();
         vcpu->arch.entry_vtb = get_vtb();
+        if (cpu_has_feature(CPU_FTR_ARCH_207S))
+                vcpu->arch.entry_ic = mfspr(SPRN_IC);
         svcpu->in_use = true;
 }
 
@@ -178,6 +180,8 @@ void kvmppc_copy_from_svcpu(struct kvm_vcpu *vcpu,
         vcpu->arch.purr += get_tb() - vcpu->arch.entry_tb;
         vcpu->arch.spurr += get_tb() - vcpu->arch.entry_tb;
         vcpu->arch.vtb += get_vtb() - vcpu->arch.entry_vtb;
+        if (cpu_has_feature(CPU_FTR_ARCH_207S))
+                vcpu->arch.ic += mfspr(SPRN_IC) - vcpu->arch.entry_ic;
         svcpu->in_use = false;
 
 out: