x86: __always_inline __{rd,wr}msr()
A message that is not in the archive (sent off-list or not yet received): [email protected]
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 66a425011c61e71560c234492d204e83cfb73d1d Gitweb: https://git.kernel.org/tip/66a425011c61e71560c234492d204e83cfb73d1d Author: Peter Zijlstra <[email protected]> AuthorDate: Thu, 07 Jan 2021 11:14:25 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 12 Jan 2021 21:10:59 +01:00
x86: __always_inline __{rd,wr}msr()
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 Randy Dunlap <[email protected]>
Signed-off-by Peter Zijlstra (Intel) <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>
--- arch/x86/include/asm/msr.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/msr.h +2 -2
@@ -86,7 +86,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);
@@ -98,7 +98,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) { asmvolatile ("1: wrmsr\n" "2:\n"