x86/paravirt: Change vcp_is_preempted() arg type to long

Waiman-Long · bonzini · commit 6c62985d576c · 2017-02-21T12:48:06.000+01:00
The cpu argument in the function prototype of vcpu_is_preempted()
is changed from int to long. That makes it easier to provide a better
optimized assembly version of that function.

For Xen, vcpu_is_preempted(long) calls xen_vcpu_stolen(int), the
downcast from long to int is not a problem as vCPU number won't exceed
32 bits.

Signed-off-by: Waiman Long &lt;longman@redhat.com&gt;
Acked-by: Peter Zijlstra (Intel) &lt;peterz@infradead.org&gt;
Signed-off-by: Paolo Bonzini &lt;pbonzini@redhat.com&gt;
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
@@ -673,7 +673,7 @@ static __always_inline void pv_kick(int cpu)
 	PVOP_VCALL1(pv_lock_ops.kick, cpu);
 }
 
-static __always_inline bool pv_vcpu_is_preempted(int cpu)
+static __always_inline bool pv_vcpu_is_preempted(long cpu)
 {
 	return PVOP_CALLEE1(bool, pv_lock_ops.vcpu_is_preempted, cpu);
 }
diff --git a/arch/x86/include/asm/qspinlock.h b/arch/x86/include/asm/qspinlock.h
@@ -34,7 +34,7 @@ static inline void queued_spin_unlock(struct qspinlock *lock)
 }
 
 #define vcpu_is_preempted vcpu_is_preempted
-static inline bool vcpu_is_preempted(int cpu)
+static inline bool vcpu_is_preempted(long cpu)
 {
 	return pv_vcpu_is_preempted(cpu);
 }
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
@@ -589,7 +589,7 @@ static void kvm_wait(u8 *ptr, u8 val)
 	local_irq_restore(flags);
 }
 
-__visible bool __kvm_vcpu_is_preempted(int cpu)
+__visible bool __kvm_vcpu_is_preempted(long cpu)
 {
 	struct kvm_steal_time *src = &per_cpu(steal_time, cpu);
 
diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
@@ -20,7 +20,7 @@ bool pv_is_native_spin_unlock(void)
 		__raw_callee_save___native_queued_spin_unlock;
 }
 
-__visible bool __native_vcpu_is_preempted(int cpu)
+__visible bool __native_vcpu_is_preempted(long cpu)
 {
 	return false;
 }

Original file line number	Diff line number	Diff line change
`@@ -673,7 +673,7 @@ static __always_inline void pv_kick(int cpu)`
`673`	`673`	`PVOP_VCALL1(pv_lock_ops.kick, cpu);`
`674`	`674`	`}`
`675`	`675`
`676`		`-static __always_inline bool pv_vcpu_is_preempted(int cpu)`
	`676`	`+static __always_inline bool pv_vcpu_is_preempted(long cpu)`
`677`	`677`	`{`
`678`	`678`	`return PVOP_CALLEE1(bool, pv_lock_ops.vcpu_is_preempted, cpu);`
`679`	`679`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ static inline void queued_spin_unlock(struct qspinlock *lock)`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`#define vcpu_is_preempted vcpu_is_preempted`
`37`		`-static inline bool vcpu_is_preempted(int cpu)`
	`37`	`+static inline bool vcpu_is_preempted(long cpu)`
`38`	`38`	`{`
`39`	`39`	`return pv_vcpu_is_preempted(cpu);`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -589,7 +589,7 @@ static void kvm_wait(u8 *ptr, u8 val)`
`589`	`589`	`local_irq_restore(flags);`
`590`	`590`	`}`
`591`	`591`
`592`		`-__visible bool __kvm_vcpu_is_preempted(int cpu)`
	`592`	`+__visible bool __kvm_vcpu_is_preempted(long cpu)`
`593`	`593`	`{`
`594`	`594`	`struct kvm_steal_time *src = &per_cpu(steal_time, cpu);`
`595`	`595`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ bool pv_is_native_spin_unlock(void)`
`20`	`20`	`__raw_callee_save___native_queued_spin_unlock;`
`21`	`21`	`}`
`22`	`22`
`23`		`-__visible bool __native_vcpu_is_preempted(int cpu)`
	`23`	`+__visible bool __native_vcpu_is_preempted(long cpu)`
`24`	`24`	`{`
`25`	`25`	`return false;`
`26`	`26`	`}`