ARM: KVM: fix fault_ipa computing (cfe3950c) · Commits · 戴 / test

The ARM ARM says that HPFAR reports bits [39:12] of the faulting IPA, and we need to complement it with the bottom 12 bits of the faulting VA. This is always 12 bits, irrespective of the page size. Makes it clearer in the code. Signed-off-by:

Marc Zyngier <marc.zyngier@arm.com>

arch/arm/kvm/mmu.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -606,8 +606,13 @@ int kvm_handle_guest_abort(struct kvm_vcpu vcpu, struct kvm_run run)
		goto out_unlock;
		}

		/* Adjust page offset */
		fault_ipa \|= kvm_vcpu_get_hfar(vcpu) & ~PAGE_MASK;
		/*
		* The IPA is reported as [MAX:12], so we need to
		* complement it with the bottom 12 bits from the
		* faulting VA. This is always 12 bits, irrespective
		* of the page size.
		*/
		fault_ipa \|= kvm_vcpu_get_hfar(vcpu) & ((1 << 12) - 1);
		ret = io_mem_abort(vcpu, run, fault_ipa);
		goto out_unlock;
		}

Admin message