From: Juergen Gross <[email protected]> Sent: Monday, November 16, 2026 10:39 AM > > In order to prepare for some MSR access function reorg work, switch > most users of native_{read|write}_msr[_safe]() to the more generic > rdmsr*()/wrmsr*() variants. > > For now this will have some intermediate performance impact with > paravirtualization configured when running on bare metal, but this > is a prereq change for the planned direct inlining of the rdmsr/wrmsr > instructions with this configuration. > > The main reason for this switch is the planned move of the MSR trace > function invocation from the native_*() functions to the generic > rdmsr*()/wrmsr*() variants. Without this switch the users of the > native_*() functions would lose the related tracing entries. > > Note that the Xen related MSR access functions will not be switched, > as these will be handled after the move of the trace hooks. > > Signed-off-by: Juergen Gross <[email protected]> > Acked-by: Sean Christopherson <[email protected]> > Acked-by: Wei Liu <[email protected]> > Reviewed-by: H. Peter Anvin (Intel) <[email protected]> > --- > arch/x86/hyperv/ivm.c | 2 +- > arch/x86/kernel/cpu/mshyperv.c | 4 ++--
For these two Hyper-V related files, Reviewed-by: Michael Kelley <[email protected]> > arch/x86/kernel/kvmclock.c | 2 +- > arch/x86/kvm/svm/svm.c | 16 ++++++++-------- > arch/x86/xen/pmu.c | 4 ++-- > 5 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/arch/x86/hyperv/ivm.c b/arch/x86/hyperv/ivm.c > index 2ce4dfe53472..a74f121f2a02 100644 > --- a/arch/x86/hyperv/ivm.c > +++ b/arch/x86/hyperv/ivm.c > @@ -328,7 +328,7 @@ int hv_snp_boot_ap(u32 apic_id, unsigned long start_ip, > unsigned int cpu) > savesegment(ds, vmsa->ds.selector); > hv_populate_vmcb_seg(vmsa->ds, vmsa->gdtr.base); > > - vmsa->efer = native_read_msr(MSR_EFER); > + vmsa->efer = rdmsrq(MSR_EFER); > > vmsa->cr4 = native_read_cr4(); > vmsa->cr3 = __native_read_cr3(); > diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c > index 91bbffbf5412..eab5516bc243 100644 > --- a/arch/x86/kernel/cpu/mshyperv.c > +++ b/arch/x86/kernel/cpu/mshyperv.c > @@ -114,7 +114,7 @@ u64 hv_para_get_synic_register(unsigned int reg) > { > if (WARN_ON(!ms_hyperv.paravisor_present || !hv_is_synic_msr(reg))) > return ~0ULL; > - return native_read_msr(reg); > + return rdmsrq(reg); > } > > /* > @@ -124,7 +124,7 @@ void hv_para_set_synic_register(unsigned int reg, u64 val) > { > if (WARN_ON(!ms_hyperv.paravisor_present || !hv_is_synic_msr(reg))) > return; > - native_write_msr(reg, val); > + wrmsrq(reg, val); > } > > u64 hv_get_msr(unsigned int reg) > diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c > index cb3d0ca1fa22..6ddef8b5426a 100644 > --- a/arch/x86/kernel/kvmclock.c > +++ b/arch/x86/kernel/kvmclock.c > @@ -219,7 +219,7 @@ static void kvm_setup_secondary_clock(void) > void kvmclock_disable(void) > { > if (msr_kvm_system_time) > - native_write_msr(msr_kvm_system_time, 0); > + wrmsrq(msr_kvm_system_time, 0); > } > > static void __init kvmclock_init_mem(void) > diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c > index a432b878c683..64f609d1ee59 100644 > --- a/arch/x86/kvm/svm/svm.c > +++ b/arch/x86/kvm/svm/svm.c > @@ -415,12 +415,12 @@ static void svm_init_erratum_383(void) > return; > > /* Use _safe variants to not break nested virtualization */ > - if (native_read_msr_safe(MSR_AMD64_DC_CFG, &val)) > + if (rdmsrq_safe(MSR_AMD64_DC_CFG, &val)) > return; > > val |= (1ULL << 47); > > - native_write_msr_safe(MSR_AMD64_DC_CFG, val); > + wrmsrq_safe(MSR_AMD64_DC_CFG, val); > > erratum_383_found = true; > } > @@ -473,8 +473,8 @@ static void svm_init_os_visible_workarounds(void) > return; > > if (!this_cpu_has(X86_FEATURE_OSVW) || > - native_read_msr_safe(MSR_AMD64_OSVW_ID_LENGTH, &len) || > - native_read_msr_safe(MSR_AMD64_OSVW_STATUS, &status)) > + rdmsrq_safe(MSR_AMD64_OSVW_ID_LENGTH, &len) || > + rdmsrq_safe(MSR_AMD64_OSVW_STATUS, &status)) > len = status = 0; > > if (status == READ_ONCE(osvw_status) && len >= READ_ONCE(osvw_len)) > @@ -2156,7 +2156,7 @@ static bool is_erratum_383(void) > if (!erratum_383_found) > return false; > > - if (native_read_msr_safe(MSR_IA32_MC0_STATUS, &value)) > + if (rdmsrq_safe(MSR_IA32_MC0_STATUS, &value)) > return false; > > /* Bit 62 may or may not be set for this mce */ > @@ -2167,11 +2167,11 @@ static bool is_erratum_383(void) > > /* Clear MCi_STATUS registers */ > for (i = 0; i < 6; ++i) > - native_write_msr_safe(MSR_IA32_MCx_STATUS(i), 0); > + wrmsrq_safe(MSR_IA32_MCx_STATUS(i), 0); > > - if (!native_read_msr_safe(MSR_IA32_MCG_STATUS, &value)) { > + if (!rdmsrq_safe(MSR_IA32_MCG_STATUS, &value)) { > value &= ~(1ULL << 2); > - native_write_msr_safe(MSR_IA32_MCG_STATUS, value); > + wrmsrq_safe(MSR_IA32_MCG_STATUS, value); > } > > /* Flush tlb to evict multi-match entries */ > diff --git a/arch/x86/xen/pmu.c b/arch/x86/xen/pmu.c > index 3f4dd3f50f56..25f434b6b903 100644 > --- a/arch/x86/xen/pmu.c > +++ b/arch/x86/xen/pmu.c > @@ -324,7 +324,7 @@ static u64 xen_amd_read_pmc(int counter) > u64 val; > > msr = amd_counters_base + (counter * amd_msr_step); > - native_read_msr_safe(msr, &val); > + rdmsrq_safe(msr, &val); > return val; > } > > @@ -350,7 +350,7 @@ static u64 xen_intel_read_pmc(int counter) > else > msr = MSR_IA32_PERFCTR0 + counter; > > - native_read_msr_safe(msr, &val); > + rdmsrq_safe(msr, &val); > return val; > } > > -- > 2.56.0 >
