Skip to contentSkip to conversation

KVM: x86: Use this_cpu_ptr() instead of per_cpu_ptr(smp_processor_id())

PATCH Applied Sean Christopherson 3 participants 3 messages Aug 2, 2024 – Aug 13, 2024

Subsystems (3)
lore
Share & tools
lore

Sean Christopherson

author maintainer
#0 lore raw

PATCH 1/1 KVM: x86: Use this_cpu_ptr() instead of per_cpu_ptr(smp_processor_id())

From: Isaku Yamahata <[email protected]>

Use this_cpu_ptr() instead of open coding the equivalent in various user return MSR helpers.

---

Not entirely sure where this came from, found it in one of my myriad branches while doing "spring" cleaning.

 arch/x86/kvm/x86.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
arch/x86/kvm/x86.c +2 -4
index af6c8cf6a37a..518baf47ef1c 100644
@@ -427,8 +427,7 @@ static void kvm_user_return_msr_cpu_online(void)
 
 int kvm_set_user_return_msr(unsigned slot, u64 value, u64 mask)
 {
-	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);
 	int err;
 
 	value = (value & mask) | (msrs->values[slot].host & ~mask);
@@ -450,8 +449,7 @@ EXPORT_SYMBOL_GPL(kvm_set_user_return_msr);
 
 static void drop_user_return_notifiers(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);
 
 	if (msrs->registered)
 		kvm_on_user_return(&msrs->urn);

base-commit: 332d2c1d713e232e163386c35a3ba0c1b90df83f

Signature · 1 line
2.46.0.rc2.264.g509ed76dc8-goog
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Sean Christopherson

From: Isaku Yamahata <[email protected]>

Use this_cpu_ptr() instead of open coding the equivalent in various user return MSR helpers.

Quoted 34 lines

---

Not entirely sure where this came from, found it in one of my myriad branches while doing "spring" cleaning.

  arch/x86/kvm/x86.c | 6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
arch/x86/kvm/x86.c +2 -4
index af6c8cf6a37a..518baf47ef1c 100644
@@ -427,8 +427,7 @@ static void kvm_user_return_msr_cpu_online(void)
 
  int kvm_set_user_return_msr(unsigned slot, u64 value, u64 mask)
  {
-	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);
  	int err;
 
  	value = (value & mask) | (msrs->values[slot].host & ~mask);
@@ -450,8 +449,7 @@ EXPORT_SYMBOL_GPL(kvm_set_user_return_msr);
 
  static void drop_user_return_notifiers(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);
 
  	if (msrs->registered)
  		kvm_on_user_return(&msrs->urn);

base-commit: 332d2c1d713e232e163386c35a3ba0c1b90df83f