Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b9aacf2 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Greg Kroah-Hartman
Browse files

x86: __always_inline __{rd,wr}msr() 



[ Upstream commit 66a425011c61e71560c234492d204e83cfb73d1d ]

When the compiler choses to not inline the trivial MSR helpers:

  vmlinux.o: warning: objtool: __sev_es_nmi_complete()+0xce: call to __wrmsr.constprop.14() leaves .noinstr.text section

Reported-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
Link: https://lore.kernel.org/r/X/bf3gV+BW7kGEsB@hirez.programming.kicks-ass.net


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 96c5db6c

arch/x86/include/asm/msr.h

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static inline void do_trace_rdpmc(unsigned int msr, u64 val, int failed) {} 
 * think of extending them - you will be slapped with a stinking trout or a frozen

 * shark will reach you, wherever you are! You've been warned.

 */

static inline unsigned long long notrace __rdmsr(unsigned int msr)

static __always_inline unsigned long long __rdmsr(unsigned int msr)

{

	DECLARE_ARGS(val, low, high);
@@ -100,7 +100,7 @@ static inline unsigned long long notrace __rdmsr(unsigned int msr) 
	return EAX_EDX_VAL(val, low, high);

}



static inline void notrace __wrmsr(unsigned int msr, u32 low, u32 high)

static __always_inline void __wrmsr(unsigned int msr, u32 low, u32 high)

{

	asm volatile("1: wrmsr\n"

		     "2:\n"