Commit 010050a8 authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

x86/kvm: Always inline evmcs_write64() 



vmlinux.o: warning: objtool: vmx_update_host_rsp()+0x64: call to evmcs_write64() leaves .noinstr.text section

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20210624095148.126956644@infradead.org
parent aee045ed

arch/x86/kvm/vmx/evmcs.h

+2 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static __always_inline int get_evmcs_offset(unsigned long field, 
	return evmcs_field->offset;

}



static inline void evmcs_write64(unsigned long field, u64 value)

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

{

	u16 clean_field;

	int offset = get_evmcs_offset(field, &clean_field);
@@ -183,7 +183,7 @@ static inline void evmcs_load(u64 phys_addr) 


__init void evmcs_sanitize_exec_ctrls(struct vmcs_config *vmcs_conf);

#else /* !IS_ENABLED(CONFIG_HYPERV) */

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

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; }