From: Dave Hansen <[email protected]>
Currently, the paravirt and native code define a common set of MSR functions. But, some of the code is duplicated between the two. For instance, the packing and unpacking of the 64-bit MSR value into two 32-bit values is done in both. Introduce a new abstraction layer: "raw" calls. For now, define and use them only in the native case. This lays the foundation of having the paravirt code also defined "raw" calls. Signed-off-by: Dave Hansen <[email protected]> --- b/arch/x86/include/asm/msr.h | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff -puN arch/x86/include/asm/msr.h~raw_msr_names arch/x86/include/asm/msr.h --- a/arch/x86/include/asm/msr.h~raw_msr_names 2026-03-20 11:24:18.217756517 -0700 +++ b/arch/x86/include/asm/msr.h 2026-03-20 11:24:18.220756650 -0700 @@ -173,6 +173,12 @@ static inline u64 native_read_pmc(int co #include <asm/paravirt.h> #else #include <linux/errno.h> + +#define raw_read_msr native_read_msr +#define raw_read_msr_safe native_read_msr_safe +#define raw_write_msr native_write_msr +#define raw_write_msr_safe native_write_msr_safe + /* * Access to machine-specific registers (available on 586 and better only) * Note: the rd* operations modify the parameters directly (without using @@ -181,35 +187,35 @@ static inline u64 native_read_pmc(int co #define rdmsr(msr, low, high) \ do { \ - u64 __val = native_read_msr((msr)); \ + u64 __val = raw_read_msr((msr)); \ (void)((low) = (u32)__val); \ (void)((high) = (u32)(__val >> 32)); \ } while (0) static inline void wrmsr(u32 msr, u32 low, u32 high) { - native_write_msr(msr, (u64)high << 32 | low); + raw_write_msr(msr, (u64)high << 32 | low); } #define rdmsrq(msr, val) \ - ((val) = native_read_msr((msr))) + ((val) = raw_read_msr((msr))) static inline void wrmsrq(u32 msr, u64 val) { - native_write_msr(msr, val); + raw_write_msr(msr, val); } /* wrmsr with exception handling */ static inline int wrmsrq_safe(u32 msr, u64 val) { - return native_write_msr_safe(msr, val); + return raw_write_msr_safe(msr, val); } /* rdmsr with exception handling */ #define rdmsr_safe(msr, low, high) \ ({ \ u64 __val; \ - int __err = native_read_msr_safe((msr), &__val); \ + int __err = raw_read_msr_safe((msr), &__val); \ (*low) = (u32)__val; \ (*high) = (u32)(__val >> 32); \ __err; \ @@ -217,7 +223,7 @@ static inline int wrmsrq_safe(u32 msr, u static inline int rdmsrq_safe(u32 msr, u64 *p) { - return native_read_msr_safe(msr, p); + return raw_read_msr_safe(msr, p); } static __always_inline u64 rdpmc(int counter) _
