Commit e8af9e9f authored Jul 10, 2020 by Paolo Bonzini

KVM: nSVM: remove nonsensical EXITINFO1 adjustment on nested NPF

The "if" that drops the present bit from the page structure fauls makes no sense.
It was added by yours truly in order to be bug-compatible with pre-existing code
and in order to make the tests pass; however, the tests are wrong. The behavior
after this patch matches bare metal.

Reported-by: Nadav Amit <namit@vmware.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 3edd6839

arch/x86/kvm/svm/nested.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -48,13 +48,6 @@ static void nested_svm_inject_npf_exit(struct kvm_vcpu *vcpu,
		svm->vmcb->control.exit_info_1 &= ~0xffffffffULL;
		svm->vmcb->control.exit_info_1 \|= fault->error_code;

		/*
		* The present bit is always zero for page structure faults on real
		* hardware.
		*/
		if (svm->vmcb->control.exit_info_1 & (2ULL << 32))
		svm->vmcb->control.exit_info_1 &= ~1;

		nested_svm_vmexit(svm);
		}

Admin message