Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c62985d authored by Waiman Long's avatar Waiman Long Committed by Paolo Bonzini
Browse files

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



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: default avatarWaiman Long <longman@redhat.com>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 96794e4e

arch/x86/include/asm/paravirt.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

arch/x86/include/asm/qspinlock.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

arch/x86/kernel/kvm.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

arch/x86/kernel/paravirt-spinlocks.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}