Commit 3204877d authored by Xin Li (Intel)'s avatar Xin Li (Intel) Committed by Ingo Molnar
Browse files

x86/msr: Convert __rdmsr() uses to native_rdmsrq() uses 



__rdmsr() is the lowest level MSR write API, with native_rdmsr()
and native_rdmsrq() serving as higher-level wrappers around it.

  #define native_rdmsr(msr, val1, val2)                   \
  do {                                                    \
          u64 __val = __rdmsr((msr));                     \
          (void)((val1) = (u32)__val);                    \
          (void)((val2) = (u32)(__val >> 32));            \
  } while (0)

  static __always_inline u64 native_rdmsrq(u32 msr)
  {
          return __rdmsr(msr);
  }

However, __rdmsr() continues to be utilized in various locations.

MSR APIs are designed for different scenarios, such as native or
pvops, with or without trace, and safe or non-safe.  Unfortunately,
the current MSR API names do not adequately reflect these factors,
making it challenging to select the most appropriate API for
various situations.

To pave the way for improving MSR API names, convert __rdmsr()
uses to native_rdmsrq() to ensure consistent usage.  Later, these
APIs can be renamed to better reflect their implications, such as
native or pvops, with or without trace, and safe or non-safe.

No functional change intended.

Signed-off-by: default avatarXin Li (Intel) <xin@zytor.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Sean Christopherson <seanjc@google.com>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Uros Bizjak <ubizjak@gmail.com>
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
Link: https://lore.kernel.org/r/20250427092027.1598740-10-xin@zytor.com
parent ed56a309

arch/x86/coco/sev/core.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static noinstr struct ghcb *__sev_get_ghcb(struct ghcb_state *state) 


static inline u64 sev_es_rd_ghcb_msr(void)

{

	return __rdmsr(MSR_AMD64_SEV_ES_GHCB);

	return native_rdmsrq(MSR_AMD64_SEV_ES_GHCB);

}



static __always_inline void sev_es_wr_ghcb_msr(u64 val)

arch/x86/events/amd/brs.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static __always_inline void set_debug_extn_cfg(u64 val) 


static __always_inline u64 get_debug_extn_cfg(void)

{

	return __rdmsr(MSR_AMD_DBG_EXTN_CFG);

	return native_rdmsrq(MSR_AMD_DBG_EXTN_CFG);

}



static bool __init amd_brs_detect(void)

arch/x86/hyperv/hv_vtl.c

+2 −2
Original line number Diff line number Diff line
@@ -150,11 +150,11 @@ static int hv_vtl_bringup_vcpu(u32 target_vp_index, int cpu, u64 eip_ignored) 
	input->vp_context.rip = rip;

	input->vp_context.rsp = rsp;

	input->vp_context.rflags = 0x0000000000000002;

	input->vp_context.efer = __rdmsr(MSR_EFER);

	input->vp_context.efer = native_rdmsrq(MSR_EFER);

	input->vp_context.cr0 = native_read_cr0();

	input->vp_context.cr3 = __native_read_cr3();

	input->vp_context.cr4 = native_read_cr4();

	input->vp_context.msr_cr_pat = __rdmsr(MSR_IA32_CR_PAT);

	input->vp_context.msr_cr_pat = native_rdmsrq(MSR_IA32_CR_PAT);

	input->vp_context.idtr.limit = idt_ptr.size;

	input->vp_context.idtr.base = idt_ptr.address;

	input->vp_context.gdtr.limit = gdt_ptr.size;

arch/x86/hyperv/ivm.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ u64 hv_ghcb_hypercall(u64 control, void *input, void *output, u32 input_size) 


static inline u64 rd_ghcb_msr(void)

{

	return __rdmsr(MSR_AMD64_SEV_ES_GHCB);

	return native_rdmsrq(MSR_AMD64_SEV_ES_GHCB);

}



static inline void wr_ghcb_msr(u64 val)

arch/x86/include/asm/mshyperv.h

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ void hv_set_non_nested_msr(unsigned int reg, u64 value); 


static __always_inline u64 hv_raw_get_msr(unsigned int reg)

{

	return __rdmsr(reg);

	return native_rdmsrq(reg);

}



#else /* CONFIG_HYPERV */