Commit b0c3d687 authored by Sean Christopherson's avatar Sean Christopherson
Browse files

KVM: x86: Move __kvm_is_valid_cr4() definition to x86.h 



Let vendor code inline __kvm_is_valid_cr4() now x86.c's cr4_reserved_bits
no longer exists, as keeping cr4_reserved_bits local to x86.c was the only
reason for "hiding" the definition of __kvm_is_valid_cr4().

No functional change intended.

Reviewed-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Link: https://lore.kernel.org/r/20241128013424.4096668-11-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 01bcd829

arch/x86/kvm/x86.c

+0 −9
Original line number Diff line number Diff line
@@ -1281,15 +1281,6 @@ int kvm_emulate_xsetbv(struct kvm_vcpu *vcpu) 
}

EXPORT_SYMBOL_GPL(kvm_emulate_xsetbv);



bool __kvm_is_valid_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)

{

	if (cr4 & vcpu->arch.cr4_guest_rsvd_bits)

		return false;



	return true;

}

EXPORT_SYMBOL_GPL(__kvm_is_valid_cr4);



static bool kvm_is_valid_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)

{

	return __kvm_is_valid_cr4(vcpu, cr4) &&

arch/x86/kvm/x86.h

+5 −1
Original line number Diff line number Diff line
@@ -550,7 +550,6 @@ static inline void kvm_machine_check(void) 
void kvm_load_guest_xsave_state(struct kvm_vcpu *vcpu);

void kvm_load_host_xsave_state(struct kvm_vcpu *vcpu);

int kvm_spec_ctrl_test_value(u64 value);

bool __kvm_is_valid_cr4(struct kvm_vcpu *vcpu, unsigned long cr4);

int kvm_handle_memory_failure(struct kvm_vcpu *vcpu, int r,

			      struct x86_exception *e);

int kvm_handle_invpcid(struct kvm_vcpu *vcpu, unsigned long type, gva_t gva);
@@ -577,6 +576,11 @@ enum kvm_msr_access { 
#define  KVM_MSR_RET_UNSUPPORTED	2

#define  KVM_MSR_RET_FILTERED		3



static inline bool __kvm_is_valid_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)

{

	return !(cr4 & vcpu->arch.cr4_guest_rsvd_bits);

}



#define __cr4_reserved_bits(__cpu_has, __c)             \

({                                                      \

	u64 __reserved_bits = CR4_RESERVED_BITS;        \