5 files changed, 17 insertions, 30 deletions

diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h
index 014eaf27a23..42a527e7049 100644
--- a/arch/powerpc/include/asm/kvm_host.h
+++ b/arch/powerpc/include/asm/kvm_host.h
@@ -464,6 +464,7 @@ struct kvm_vcpu_arch {
         u32 epr;
 #endif
         gpa_t paddr_accessed;
+        gva_t vaddr_accessed;
 
         u8 io_gpr; /* GPR used as IO source/target */
         u8 mmio_is_bigendian;
diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c
index d031ce1d83f..8e6401f2c16 100644
--- a/arch/powerpc/kvm/book3s_64_mmu_hv.c
+++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c
@@ -447,7 +447,7 @@ static int instruction_is_store(unsigned int instr)
 }
 
 static int kvmppc_hv_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu,
-                                  unsigned long gpa, int is_store)
+                                  unsigned long gpa, gva_t ea, int is_store)
 {
         int ret;
         u32 last_inst;
@@ -494,6 +494,7 @@ static int kvmppc_hv_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu,
          */
 
         vcpu->arch.paddr_accessed = gpa;
+        vcpu->arch.vaddr_accessed = ea;
         return kvmppc_emulate_mmio(run, vcpu);
 }
 
@@ -547,7 +548,7 @@ int kvmppc_book3s_hv_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu,
         /* No memslot means it's an emulated MMIO region */
         if (!memslot || (memslot->flags & KVM_MEMSLOT_INVALID)) {
                 unsigned long gpa = (gfn << PAGE_SHIFT) | (ea & (psize - 1));
-                return kvmppc_hv_emulate_mmio(run, vcpu, gpa,
+                return kvmppc_hv_emulate_mmio(run, vcpu, gpa, ea,
                                               dsisr & DSISR_ISSTORE);
         }
 
diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c
index 7759053d391..158047fc951 100644
--- a/arch/powerpc/kvm/book3s_pr.c
+++ b/arch/powerpc/kvm/book3s_pr.c
@@ -351,6 +351,7 @@ int kvmppc_handle_pagefault(struct kvm_run *run, struct kvm_vcpu *vcpu,
                 /* MMIO */
                 vcpu->stat.mmio_exits++;
                 vcpu->arch.paddr_accessed = pte.raddr;
+                vcpu->arch.vaddr_accessed = pte.eaddr;
                 r = kvmppc_emulate_mmio(run, vcpu);
                 if ( r == RESUME_HOST_NV )
                         r = RESUME_HOST;
diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
index 9f27258d803..2675dcb40a7 100644
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -875,6 +875,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
                         /* Guest has mapped and accessed a page which is not
                          * actually RAM. */
                         vcpu->arch.paddr_accessed = gpaddr;
+                        vcpu->arch.vaddr_accessed = eaddr;
                         r = kvmppc_emulate_mmio(run, vcpu);
                         kvmppc_account_exit(vcpu, MMIO_EXITS);
                 }
diff --git a/arch/powerpc/kvm/emulate.c b/arch/powerpc/kvm/emulate.c
index 968f4010188..e79a620608a 100644
--- a/arch/powerpc/kvm/emulate.c
+++ b/arch/powerpc/kvm/emulate.c
@@ -141,7 +141,6 @@ u32 kvmppc_get_dec(struct kvm_vcpu *vcpu, u64 tb)
 int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
 {
         u32 inst = kvmppc_get_last_inst(vcpu);
-        u32 ea;
         int ra;
         int rb;
         int rs;
@@ -185,12 +184,8 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
                         ra = get_ra(inst);
                         rb = get_rb(inst);
 
-                        ea = kvmppc_get_gpr(vcpu, rb);
-                        if (ra)
-                                ea += kvmppc_get_gpr(vcpu, ra);
-
                         emulated = kvmppc_handle_load(run, vcpu, rt, 1, 1);
-                        kvmppc_set_gpr(vcpu, ra, ea);
+                        kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
                         break;
 
                 case OP_31_XOP_STWX:
@@ -212,14 +207,10 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
                         ra = get_ra(inst);
                         rb = get_rb(inst);
 
-                        ea = kvmppc_get_gpr(vcpu, rb);
-                        if (ra)
-                                ea += kvmppc_get_gpr(vcpu, ra);
-
                         emulated = kvmppc_handle_store(run, vcpu,
                                                        kvmppc_get_gpr(vcpu, rs),
                                                        1, 1);
-                        kvmppc_set_gpr(vcpu, rs, ea);
+                        kvmppc_set_gpr(vcpu, rs, vcpu->arch.vaddr_accessed);
                         break;
 
                 case OP_31_XOP_LHAX:
@@ -237,12 +228,8 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
                         ra = get_ra(inst);
                         rb = get_rb(inst);
 
-                        ea = kvmppc_get_gpr(vcpu, rb);
-                        if (ra)
-                                ea += kvmppc_get_gpr(vcpu, ra);
-
                         emulated = kvmppc_handle_load(run, vcpu, rt, 2, 1);
-                        kvmppc_set_gpr(vcpu, ra, ea);
+                        kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
                         break;
 
                 case OP_31_XOP_MFSPR:
@@ -318,14 +305,10 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
                         ra = get_ra(inst);
                         rb = get_rb(inst);
 
-                        ea = kvmppc_get_gpr(vcpu, rb);
-                        if (ra)
-                                ea += kvmppc_get_gpr(vcpu, ra);
-
                         emulated = kvmppc_handle_store(run, vcpu,
                                                        kvmppc_get_gpr(vcpu, rs),
                                                        2, 1);
-                        kvmppc_set_gpr(vcpu, ra, ea);
+                        kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
                         break;
 
                 case OP_31_XOP_MTSPR:
@@ -429,7 +412,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
                 ra = get_ra(inst);
                 rt = get_rt(inst);
                 emulated = kvmppc_handle_load(run, vcpu, rt, 4, 1);
-                kvmppc_set_gpr(vcpu, ra, vcpu->arch.paddr_accessed);
+                kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
                 break;
 
         case OP_LBZ:
@@ -441,7 +424,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
                 ra = get_ra(inst);
                 rt = get_rt(inst);
                 emulated = kvmppc_handle_load(run, vcpu, rt, 1, 1);
-                kvmppc_set_gpr(vcpu, ra, vcpu->arch.paddr_accessed);
+                kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
                 break;
 
         case OP_STW:
@@ -457,7 +440,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
                 emulated = kvmppc_handle_store(run, vcpu,
                                                kvmppc_get_gpr(vcpu, rs),
                                                4, 1);
-                kvmppc_set_gpr(vcpu, ra, vcpu->arch.paddr_accessed);
+                kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
                 break;
 
         case OP_STB:
@@ -473,7 +456,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
                 emulated = kvmppc_handle_store(run, vcpu,
                                                kvmppc_get_gpr(vcpu, rs),
                                                1, 1);
-                kvmppc_set_gpr(vcpu, ra, vcpu->arch.paddr_accessed);
+                kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
                 break;
 
         case OP_LHZ:
@@ -485,7 +468,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
                 ra = get_ra(inst);
                 rt = get_rt(inst);
                 emulated = kvmppc_handle_load(run, vcpu, rt, 2, 1);
-                kvmppc_set_gpr(vcpu, ra, vcpu->arch.paddr_accessed);
+                kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
                 break;
 
         case OP_LHA:
@@ -497,7 +480,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
                 ra = get_ra(inst);
                 rt = get_rt(inst);
                 emulated = kvmppc_handle_loads(run, vcpu, rt, 2, 1);
-                kvmppc_set_gpr(vcpu, ra, vcpu->arch.paddr_accessed);
+                kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
                 break;
 
         case OP_STH:
@@ -513,7 +496,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
                 emulated = kvmppc_handle_store(run, vcpu,
                                                kvmppc_get_gpr(vcpu, rs),
                                                2, 1);
-                kvmppc_set_gpr(vcpu, ra, vcpu->arch.paddr_accessed);
+                kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
                 break;
 
         default: