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

Commit b3dae109 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Thomas Gleixner
Browse files

sched/swait: Rename to exclusive 



Since swait basically implemented exclusive waits only, make sure
the API reflects that.

  $ git grep -l -e "\<swake_up\>"
		-e "\<swait_event[^ (]*"
		-e "\<prepare_to_swait\>" | while read file;
    do
	sed -i -e 's/\<swake_up\>/&_one/g'
	       -e 's/\<swait_event[^ (]*/&_exclusive/g'
	       -e 's/\<prepare_to_swait\>/&_exclusive/g' $file;
    done

With a few manual touch-ups.

Suggested-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Cc: bigeasy@linutronix.de
Cc: oleg@redhat.com
Cc: paulmck@linux.vnet.ibm.com
Cc: pbonzini@redhat.com
Link: https://lkml.kernel.org/r/20180612083909.261946548@infradead.org
parent 0abf17bc

arch/mips/kvm/mips.c

+2 −2
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, 
	dvcpu->arch.wait = 0;



	if (swq_has_sleeper(&dvcpu->wq))

		swake_up(&dvcpu->wq);

		swake_up_one(&dvcpu->wq);



	return 0;

}
@@ -1204,7 +1204,7 @@ static void kvm_mips_comparecount_func(unsigned long data) 


	vcpu->arch.wait = 0;

	if (swq_has_sleeper(&vcpu->wq))

		swake_up(&vcpu->wq);

		swake_up_one(&vcpu->wq);

}



/* low level hrtimer wake routine */

arch/powerpc/kvm/book3s_hv.c

+3 −3
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ static void kvmppc_fast_vcpu_kick_hv(struct kvm_vcpu *vcpu) 


	wqp = kvm_arch_vcpu_wq(vcpu);

	if (swq_has_sleeper(wqp)) {

		swake_up(wqp);

		swake_up_one(wqp);

		++vcpu->stat.halt_wakeup;

	}
@@ -3188,7 +3188,7 @@ static void kvmppc_vcore_blocked(struct kvmppc_vcore *vc) 
		}

	}



	prepare_to_swait(&vc->wq, &wait, TASK_INTERRUPTIBLE);

	prepare_to_swait_exclusive(&vc->wq, &wait, TASK_INTERRUPTIBLE);



	if (kvmppc_vcore_check_block(vc)) {

		finish_swait(&vc->wq, &wait);
@@ -3311,7 +3311,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) 
			kvmppc_start_thread(vcpu, vc);

			trace_kvm_guest_enter(vcpu);

		} else if (vc->vcore_state == VCORE_SLEEPING) {

			swake_up(&vc->wq);

			swake_up_one(&vc->wq);

		}



	}

arch/s390/kvm/interrupt.c

+1 −1
Original line number Diff line number Diff line
@@ -1145,7 +1145,7 @@ void kvm_s390_vcpu_wakeup(struct kvm_vcpu *vcpu) 
		 * yield-candidate.

		 */

		vcpu->preempted = true;

		swake_up(&vcpu->wq);

		swake_up_one(&vcpu->wq);

		vcpu->stat.halt_wakeup++;

	}

	/*

arch/x86/kernel/kvm.c

+2 −2
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ void kvm_async_pf_task_wait(u32 token, int interrupt_kernel) 


	for (;;) {

		if (!n.halted)

			prepare_to_swait(&n.wq, &wait, TASK_UNINTERRUPTIBLE);

			prepare_to_swait_exclusive(&n.wq, &wait, TASK_UNINTERRUPTIBLE);

		if (hlist_unhashed(&n.link))

			break;
@@ -188,7 +188,7 @@ static void apf_task_wake_one(struct kvm_task_sleep_node *n) 
	if (n->halted)

		smp_send_reschedule(n->cpu);

	else if (swq_has_sleeper(&n->wq))

		swake_up(&n->wq);

		swake_up_one(&n->wq);

}



static void apf_task_wake_all(void)

arch/x86/kvm/lapic.c

+1 −1
Original line number Diff line number Diff line
@@ -1379,7 +1379,7 @@ static void apic_timer_expired(struct kvm_lapic *apic) 
	 * using swait_active() is safe.

	 */

	if (swait_active(q))

		swake_up(q);

		swake_up_one(q);



	if (apic_lvtt_tscdeadline(apic))

		ktimer->expired_tscdeadline = ktimer->tscdeadline;