Commit d46cbf22 authored by Sean Christopherson's avatar Sean Christopherson Committed by Yu Zhang
Browse files

KVM: x86: Add a helper to handle legal GPA with an alignment requirement 

mainline inclusion
from mainline-v5.12-rc1
commit da6c6a7c
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I7S3VQ
CVE: NA

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



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

Add a helper to genericize checking for a legal GPA that also must
conform to an arbitrary alignment, and use it in the existing
page_address_valid().  Future patches will replace open coded variants
in VMX and SVM.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20210204000117.3303214-5-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarYu Zhang <yu.c.zhang@linux.intel.com>
parent 0921ddaa

arch/x86/kvm/cpuid.h

+7 −1
Original line number Diff line number Diff line
@@ -86,9 +86,15 @@ 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)

{

	return IS_ALIGNED(gpa, alignment) && kvm_vcpu_is_legal_gpa(vcpu, gpa);

}



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

{

	return PAGE_ALIGNED(gpa) && kvm_vcpu_is_legal_gpa(vcpu, gpa);

	return kvm_vcpu_is_legal_aligned_gpa(vcpu, gpa, PAGE_SIZE);

}



/* Intel-defined sub-features, CPUID level 0x00000007:1 (EDX) */