[RFC PATCH v2 28/34] x86/msr: Rename native_write_msr_safe() to native_wrmsrq_safe()

Xin Li (Intel)
2025-04-22T08:23:50Z

Signed-off-by: Xin Li (Intel) <xin@zytor.com>
---
arch/x86/include/asm/msr.h | 4 ++--
arch/x86/kvm/svm/svm.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h
index 72a1c3301d46..a1c63bed14be 100644
--- a/arch/x86/include/asm/msr.h
+++ b/arch/x86/include/asm/msr.h
@@ -366,7 +366,7 @@ static __always_inline int rdmsrq_safe(u32 msr, u64 *val)
* __native_wrmsrq() -----------------------
* / \ |
* / \ |
- * native_wrmsrq_no_trace() native_write_msr_safe() |
+ * native_wrmsrq_no_trace() native_wrmsrq_safe() |
* / \ |
* / \ |
* native_wrmsr_no_trace() native_wrmsrq() |
@@ -480,7 +480,7 @@ static inline void notrace native_wrmsrq(u32 msr, u64 val)
do_trace_write_msr(msr, val, 0);
}

-static inline int notrace native_write_msr_safe(u32 msr, u64 val)
+static inline int notrace native_wrmsrq_safe(u32 msr, u64 val)
{
int err = __native_wrmsrq(msr, val, EX_TYPE_WRMSR_SAFE) ? -EIO : 0;

diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index 838606f784c9..01dd3cd20730 100644
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -486,7 +486,7 @@ static void svm_init_erratum_383(void)

val |= (1ULL << 47);

- native_write_msr_safe(MSR_AMD64_DC_CFG, val);
+ native_wrmsrq_safe(MSR_AMD64_DC_CFG, val);

erratum_383_found = true;
}
@@ -2159,11 +2159,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);
+ native_wrmsrq_safe(MSR_IA32_MCx_STATUS(i), 0);

if (!native_read_msr_safe(MSR_IA32_MCG_STATUS, &value)) {
value &= ~(1ULL << 2);
- native_write_msr_safe(MSR_IA32_MCG_STATUS, value);
+ native_wrmsrq_safe(MSR_IA32_MCG_STATUS, value);
}

/* Flush tlb to evict multi-match entries */
--
2.49.0