Commit 8c4182bd authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: VMX: optimize #PF injection when MAXPHYADDR does not match



Ignore non-present page faults, since those cannot have reserved
bits set.

When running access.flat with "-cpu Haswell,phys-bits=36", the
number of trapped page faults goes down from 8872644 to 3978948.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200710154811.418214-9-mgamal@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 1dbf5d68
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -4355,6 +4355,16 @@ static void init_vmcs(struct vcpu_vmx *vmx)
		vmx->pt_desc.guest.output_mask = 0x7F;
		vmcs_write64(GUEST_IA32_RTIT_CTL, 0);
	}

	/*
	 * If EPT is enabled, #PF is only trapped if MAXPHYADDR is mismatched
	 * between guest and host.  In that case we only care about present
	 * faults.
	 */
	if (enable_ept) {
		vmcs_write32(PAGE_FAULT_ERROR_CODE_MASK, PFERR_PRESENT_MASK);
		vmcs_write32(PAGE_FAULT_ERROR_CODE_MATCH, PFERR_PRESENT_MASK);
	}
}

static void vmx_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)