KVM: x86: Use this_cpu_ptr() in kvm_user_return_msr_cpu_online

Commit Message

Li Chen Aug. 19, 2024, 5:59 a.m. UTC

From: Li Chen <[e-mail]>

Use this_cpu_ptr() instead of open coding the equivalent in
kvm_user_return_msr_cpu_online.

Signed-off-by: Li Chen <[e-mail]>
---
 arch/x86/kvm/x86.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Sean Christopherson Aug. 23, 2024, 11:47 p.m. UTC | #1

On Mon, 19 Aug 2024 13:59:27 +0800, Li Chen wrote:
> Use this_cpu_ptr() instead of open coding the equivalent in
> kvm_user_return_msr_cpu_online.
> 
> 

Applied to kvm-x86 misc, thanks!  I'm quite annoyed with myself that I missed
that one when sending the patch for commit 15e1c3d65975 ("KVM: x86: Use
this_cpu_ptr() instead of per_cpu_ptr(smp_processor_id())").

[1/1] KVM: x86: Use this_cpu_ptr() in kvm_user_return_msr_cpu_online
      https://github.com/kvm-x86/linux/commit/e0183a42e3bc

--
https://github.com/kvm-x86/linux/tree/next

Patch

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 70219e4069874..ffdf251bfef5b 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -413,8 +413,7 @@  EXPORT_SYMBOL_GPL(kvm_find_user_return_msr);
 
 static void kvm_user_return_msr_cpu_online(void)
 {
-	unsigned int cpu = smp_processor_id();
-	struct kvm_user_return_msrs *msrs = per_cpu_ptr(user_return_msrs, cpu);
+	struct kvm_user_return_msrs *msrs = this_cpu_ptr(user_return_msrs);
 	u64 value;
 	int i;