From: Juergen Gross <jgross@suse.com>
To: linux-kernel@vger.kernel.org, x86@kernel.org
Cc: Juergen Gross <jgross@suse.com>,
Thomas Gleixner <tglx@kernel.org>, Ingo Molnar <mingo@redhat.com>,
Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
"H. Peter Anvin" <hpa@zytor.com>
Subject: [PATCH v6 17/17] x86/msr: Make all MSR access functions __always_inline
Date: Mon, 16 Nov 2026 19:39:05 +0100 [thread overview]
Message-ID: <20261116183905.1591611-18-jgross@suse.com> (raw)
In-Reply-To: <20261116183905.1591611-1-jgross@suse.com>
There are a few MSR access functions left which are not yet marked as
__always_inline. Do the conversion.
Remove a leftover comment no longer being true related to this.
Signed-off-by: Juergen Gross <jgross@suse.com>
---
V4:
- new patch
---
arch/x86/include/asm/msr.h | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h
index 9cd0ff3315de..8c0f5595970b 100644
--- a/arch/x86/include/asm/msr.h
+++ b/arch/x86/include/asm/msr.h
@@ -269,13 +269,12 @@ static __always_inline void native_wrmsrq(u32 msr, u64 val)
__wrmsrq(msr, val);
}
-static inline int native_read_msr_safe(u32 msr, u64 *val)
+static __always_inline int native_read_msr_safe(u32 msr, u64 *val)
{
return __rdmsr(msr, val, EX_TYPE_RDMSR_SAFE) ? -EIO : 0;
}
-/* Can be uninlined because referenced by paravirt */
-static inline int notrace native_write_msr_safe(u32 msr, u64 val)
+static __always_inline int notrace native_write_msr_safe(u32 msr, u64 val)
{
int err;
@@ -301,7 +300,7 @@ static __always_inline int native_wrmsrns_safe(u32 msr, u64 val)
extern int rdmsr_safe_regs(u32 regs[8]);
extern int wrmsr_safe_regs(u32 regs[8]);
-static inline u64 native_read_pmc(int counter)
+static __always_inline u64 native_read_pmc(int counter)
{
EAX_EDX_DECLARE_ARGS(val, low, high);
@@ -362,7 +361,7 @@ static __always_inline u64 rdmsrq(u32 msr)
}
/* rdmsr with exception handling */
-static inline int rdmsrq_safe(u32 msr, u64 *p)
+static __always_inline int rdmsrq_safe(u32 msr, u64 *p)
{
int err;
@@ -374,7 +373,7 @@ static inline int rdmsrq_safe(u32 msr, u64 *p)
return err;
}
-static inline void wrmsrq(u32 msr, u64 val)
+static __always_inline void wrmsrq(u32 msr, u64 val)
{
write_msr(msr, val);
@@ -383,7 +382,7 @@ static inline void wrmsrq(u32 msr, u64 val)
}
/* wrmsr with exception handling */
-static inline int wrmsrq_safe(u32 msr, u64 val)
+static __always_inline int wrmsrq_safe(u32 msr, u64 val)
{
int err;
--
2.56.0
prev parent reply other threads:[~2026-11-16 18:40 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 18:38 [PATCH v6 00/17] x86/msr: Inline rdmsr/wrmsr instructions Juergen Gross
2026-11-16 18:38 ` [PATCH v6 01/17] x86/alternative: Support alt_replace_call() with instructions after call Juergen Gross
2026-11-16 18:38 ` [PATCH v6 02/17] coco/tdx: Rename MSR access helpers Juergen Gross
2026-11-16 18:38 ` [PATCH v6 03/17] x86/msr: Minimize usage of native_*() msr access functions Juergen Gross
2026-11-16 18:38 ` [PATCH v6 04/17] x86/msr: Move MSR trace calls one function level up Juergen Gross
2026-11-16 18:38 ` [PATCH v6 05/17] x86/hyperv: Switch from __rdmsr() to native_rdmsrq() Juergen Gross
2026-11-16 18:38 ` [PATCH v6 06/17] x86/opcode: Add immediate form MSR instructions Juergen Gross
2026-11-16 18:38 ` [PATCH v6 07/17] x86/extable: Add support for " Juergen Gross
2026-11-16 18:38 ` [PATCH v6 08/17] x86/msr: Make wrmsrns() a first class citizen Juergen Gross
2026-11-16 18:38 ` [PATCH v6 09/17] x86/msr: Introduce sync_cpu_after_wrmsrns() Juergen Gross
2026-11-16 18:38 ` [PATCH v6 10/17] x86/msr: Use the alternatives mechanism for RDMSR Juergen Gross
2026-11-16 18:38 ` [PATCH v6 11/17] x86/alternatives: Add ALTERNATIVE_4() Juergen Gross
2026-11-16 18:39 ` [PATCH v6 12/17] x86/paravirt: Split off MSR related hooks into new header Juergen Gross
2026-11-16 18:39 ` [PATCH v6 13/17] x86/paravirt: Prepare support of MSR instruction interfaces Juergen Gross
2026-11-16 18:39 ` [PATCH v6 14/17] x86/paravirt: Switch MSR access pv_ops functions to " Juergen Gross
2026-11-16 18:39 ` [PATCH v6 15/17] x86/msr: Reduce number of low level MSR access helpers Juergen Gross
2026-11-16 18:39 ` [PATCH v6 16/17] x86/paravirt: Use alternatives for MSR access with paravirt Juergen Gross
2026-11-16 18:39 ` Juergen Gross [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261116183905.1591611-18-jgross@suse.com \
--to=jgross@suse.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®