Commit 8069809a authored by Binbin Wu's avatar Binbin Wu Committed by Zhiquan Li
Browse files

KVM: x86: Remove kvm_vcpu_is_illegal_gpa() 

mainline inclusion
from mainline-v6.8-rc1
commit 9c8021d4ae85f1531230fc33653e06e9f1fdb7f1
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I94GWL
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9c8021d4ae85f1531230fc33653e06e9f1fdb7f1



--------------------------------

Remove kvm_vcpu_is_illegal_gpa() and use !kvm_vcpu_is_legal_gpa() instead.
The "illegal" helper actually predates the "legal" helper, the only reason
the "illegal" variant wasn't removed by commit 4bda0e97 ("KVM: x86:
Add a helper to check for a legal GPA") was to avoid code churn.  Now that
CR3 has a dedicated helper, there are fewer callers, and so the code churn
isn't that much of a deterrent.

No functional change intended.

Intel-SIG: commit 9c8021d4ae85 KVM: x86: Remove
kvm_vcpu_is_illegal_gpa()
Backport KVM Linear Address Masking (LAM) support.

Signed-off-by: default avatarBinbin Wu <binbin.wu@linux.intel.com>
Tested-by: default avatarXuelian Guo <xuelian.guo@intel.com>
Link: https://lore.kernel.org/r/20230913124227.12574-8-binbin.wu@linux.intel.com


[sean: provide a bit of history in the changelog]
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
[ Zhiquan Li: amend commit log ]
Signed-off-by: default avatarZhiquan Li <zhiquan1.li@intel.com>
parent ecf78583

arch/x86/kvm/cpuid.h

+0 −5
Original line number Diff line number Diff line
@@ -47,11 +47,6 @@ static inline bool kvm_vcpu_is_legal_gpa(struct kvm_vcpu *vcpu, gpa_t gpa) 
	return !(gpa & vcpu->arch.reserved_gpa_bits);

}



static inline bool kvm_vcpu_is_illegal_gpa(struct kvm_vcpu *vcpu, gpa_t gpa)

{

	return !kvm_vcpu_is_legal_gpa(vcpu, gpa);

}



static inline bool kvm_vcpu_is_legal_aligned_gpa(struct kvm_vcpu *vcpu,

						 gpa_t gpa, gpa_t alignment)

{

arch/x86/kvm/vmx/nested.c

+1 −1
Original line number Diff line number Diff line
@@ -2717,7 +2717,7 @@ static bool nested_vmx_check_eptp(struct kvm_vcpu *vcpu, u64 new_eptp) 
	}



	/* Reserved bits should not be set */

	if (CC(kvm_vcpu_is_illegal_gpa(vcpu, new_eptp) || ((new_eptp >> 7) & 0x1f)))

	if (CC(!kvm_vcpu_is_legal_gpa(vcpu, new_eptp) || ((new_eptp >> 7) & 0x1f)))

		return false;



	/* AD, if set, should be supported */

arch/x86/kvm/vmx/vmx.c

+1 −1
Original line number Diff line number Diff line
@@ -5785,7 +5785,7 @@ static int handle_ept_violation(struct kvm_vcpu *vcpu) 
	 * would also use advanced VM-exit information for EPT violations to

	 * reconstruct the page fault error code.

	 */

	if (unlikely(allow_smaller_maxphyaddr && kvm_vcpu_is_illegal_gpa(vcpu, gpa)))

	if (unlikely(allow_smaller_maxphyaddr && !kvm_vcpu_is_legal_gpa(vcpu, gpa)))

		return kvm_emulate_instruction(vcpu, 0);



	return kvm_mmu_page_fault(vcpu, gpa, error_code, NULL, 0);