Commit 11633f69 authored by Sean Christopherson's avatar Sean Christopherson
Browse files

KVM: VMX: Always inline eVMCS read/write helpers 



Tag all evmcs_{read,write}() helpers __always_inline so that they can be
freely used in noinstr sections, e.g. to get the VM-Exit reason in
vcpu_vmx_enter_exit() (in a future patch).  For consistency and to avoid
more spot fixes in the future, e.g. see commit 010050a8 ("x86/kvm:
Always inline evmcs_write64()"), tag all accessors even though
evmcs_read32() is the only anticipated use case in the near future.  In
practice, non-KASAN builds are all but guaranteed to inline the helpers
anyways.

  vmlinux.o: warning: objtool: vmx_vcpu_enter_exit+0x107: call to evmcs_read32()
                               leaves .noinstr.text section

Reported-by: default avatarkernel test robot <lkp@intel.com>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20221213060912.654668-4-seanjc@google.com


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

arch/x86/kvm/vmx/hyperv.h

+10 −10
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ static __always_inline void evmcs_write64(unsigned long field, u64 value) 
	current_evmcs->hv_clean_fields &= ~clean_field;

}



static inline void evmcs_write32(unsigned long field, u32 value)

static __always_inline void evmcs_write32(unsigned long field, u32 value)

{

	u16 clean_field;

	int offset = get_evmcs_offset(field, &clean_field);
@@ -208,7 +208,7 @@ static inline void evmcs_write32(unsigned long field, u32 value) 
	current_evmcs->hv_clean_fields &= ~clean_field;

}



static inline void evmcs_write16(unsigned long field, u16 value)

static __always_inline void evmcs_write16(unsigned long field, u16 value)

{

	u16 clean_field;

	int offset = get_evmcs_offset(field, &clean_field);
@@ -220,7 +220,7 @@ static inline void evmcs_write16(unsigned long field, u16 value) 
	current_evmcs->hv_clean_fields &= ~clean_field;

}



static inline u64 evmcs_read64(unsigned long field)

static __always_inline u64 evmcs_read64(unsigned long field)

{

	int offset = get_evmcs_offset(field, NULL);
@@ -230,7 +230,7 @@ static inline u64 evmcs_read64(unsigned long field) 
	return *(u64 *)((char *)current_evmcs + offset);

}



static inline u32 evmcs_read32(unsigned long field)

static __always_inline u32 evmcs_read32(unsigned long field)

{

	int offset = get_evmcs_offset(field, NULL);
@@ -240,7 +240,7 @@ static inline u32 evmcs_read32(unsigned long field) 
	return *(u32 *)((char *)current_evmcs + offset);

}



static inline u16 evmcs_read16(unsigned long field)

static __always_inline u16 evmcs_read16(unsigned long field)

{

	int offset = get_evmcs_offset(field, NULL);
@@ -274,11 +274,11 @@ static inline void evmcs_load(u64 phys_addr) 
void evmcs_sanitize_exec_ctrls(struct vmcs_config *vmcs_conf);

#else /* !IS_ENABLED(CONFIG_HYPERV) */

static __always_inline void evmcs_write64(unsigned long field, u64 value) {}

static inline void evmcs_write32(unsigned long field, u32 value) {}

static inline void evmcs_write16(unsigned long field, u16 value) {}

static inline u64 evmcs_read64(unsigned long field) { return 0; }

static inline u32 evmcs_read32(unsigned long field) { return 0; }

static inline u16 evmcs_read16(unsigned long field) { return 0; }

static __always_inline void evmcs_write32(unsigned long field, u32 value) {}

static __always_inline void evmcs_write16(unsigned long field, u16 value) {}

static __always_inline u64 evmcs_read64(unsigned long field) { return 0; }

static __always_inline u32 evmcs_read32(unsigned long field) { return 0; }

static __always_inline u16 evmcs_read16(unsigned long field) { return 0; }

static inline void evmcs_load(u64 phys_addr) {}

static inline void evmcs_touch_msr_bitmap(void) {}

#endif /* IS_ENABLED(CONFIG_HYPERV) */