浏览代码

KVM: PPC: Mask ea's high 32-bits in 32/64 instr emulation

Mask high 32 bits of effective address in emulation layer for guests running
in 32-bit mode.

Signed-off-by: Mihai Caraman <mihai.caraman@freescale.com>
[agraf: fix indent]
Signed-off-by: Alexander Graf <agraf@suse.de>
Mihai Caraman 13 年之前
父节点
当前提交
8823a8fd0d
共有 1 个文件被更改,包括 10 次插入0 次删除
  1. 10 0
      arch/powerpc/include/asm/kvm_ppc.h

+ 10 - 0
arch/powerpc/include/asm/kvm_ppc.h

@@ -298,11 +298,21 @@ static inline void kvmppc_lazy_ee_enable(void)
 static inline ulong kvmppc_get_ea_indexed(struct kvm_vcpu *vcpu, int ra, int rb)
 static inline ulong kvmppc_get_ea_indexed(struct kvm_vcpu *vcpu, int ra, int rb)
 {
 {
 	ulong ea;
 	ulong ea;
+	ulong msr_64bit = 0;
 
 
 	ea = kvmppc_get_gpr(vcpu, rb);
 	ea = kvmppc_get_gpr(vcpu, rb);
 	if (ra)
 	if (ra)
 		ea += kvmppc_get_gpr(vcpu, ra);
 		ea += kvmppc_get_gpr(vcpu, ra);
 
 
+#if defined(CONFIG_PPC_BOOK3E_64)
+	msr_64bit = MSR_CM;
+#elif defined(CONFIG_PPC_BOOK3S_64)
+	msr_64bit = MSR_SF;
+#endif
+
+	if (!(vcpu->arch.shared->msr & msr_64bit))
+		ea = (uint32_t)ea;
+
 	return ea;
 	return ea;
 }
 }