Commit e23edc86 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

sched/fair: Rename check_preempt_curr() to wakeup_preempt() 



The name is a bit opaque - make it clear that this is about wakeup
preemption.

Also rename the ->check_preempt_curr() methods similarly.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
parent 82845683

kernel/sched/core.c

+7 −7
Original line number Diff line number Diff line
@@ -2211,10 +2211,10 @@ static inline void check_class_changed(struct rq *rq, struct task_struct *p, 
		p->sched_class->prio_changed(rq, p, oldprio);

}



void check_preempt_curr(struct rq *rq, struct task_struct *p, int flags)

void wakeup_preempt(struct rq *rq, struct task_struct *p, int flags)

{

	if (p->sched_class == rq->curr->sched_class)

		rq->curr->sched_class->check_preempt_curr(rq, p, flags);

		rq->curr->sched_class->wakeup_preempt(rq, p, flags);

	else if (sched_class_above(p->sched_class, rq->curr->sched_class))

		resched_curr(rq);
@@ -2508,7 +2508,7 @@ static struct rq *move_queued_task(struct rq *rq, struct rq_flags *rf, 
	rq_lock(rq, rf);

	WARN_ON_ONCE(task_cpu(p) != new_cpu);

	activate_task(rq, p, 0);

	check_preempt_curr(rq, p, 0);

	wakeup_preempt(rq, p, 0);



	return rq;

}
@@ -3390,7 +3390,7 @@ static void __migrate_swap_task(struct task_struct *p, int cpu) 
		deactivate_task(src_rq, p, 0);

		set_task_cpu(p, cpu);

		activate_task(dst_rq, p, 0);

		check_preempt_curr(dst_rq, p, 0);

		wakeup_preempt(dst_rq, p, 0);



		rq_unpin_lock(dst_rq, &drf);

		rq_unpin_lock(src_rq, &srf);
@@ -3764,7 +3764,7 @@ ttwu_do_activate(struct rq *rq, struct task_struct *p, int wake_flags, 
	}



	activate_task(rq, p, en_flags);

	check_preempt_curr(rq, p, wake_flags);

	wakeup_preempt(rq, p, wake_flags);



	ttwu_do_wakeup(p);
@@ -3835,7 +3835,7 @@ static int ttwu_runnable(struct task_struct *p, int wake_flags) 
			 * it should preempt the task that is current now.

			 */

			update_rq_clock(rq);

			check_preempt_curr(rq, p, wake_flags);

			wakeup_preempt(rq, p, wake_flags);

		}

		ttwu_do_wakeup(p);

		ret = 1;
@@ -4854,7 +4854,7 @@ void wake_up_new_task(struct task_struct *p) 


	activate_task(rq, p, ENQUEUE_NOCLOCK);

	trace_sched_wakeup_new(p);

	check_preempt_curr(rq, p, WF_FORK);

	wakeup_preempt(rq, p, WF_FORK);

#ifdef CONFIG_SMP

	if (p->sched_class->task_woken) {

		/*

kernel/sched/deadline.c

+5 −5
Original line number Diff line number Diff line
@@ -763,7 +763,7 @@ static inline void deadline_queue_pull_task(struct rq *rq) 


static void enqueue_task_dl(struct rq *rq, struct task_struct *p, int flags);

static void __dequeue_task_dl(struct rq *rq, struct task_struct *p, int flags);

static void check_preempt_curr_dl(struct rq *rq, struct task_struct *p, int flags);

static void wakeup_preempt_dl(struct rq *rq, struct task_struct *p, int flags);



static inline void replenish_dl_new_period(struct sched_dl_entity *dl_se,

					    struct rq *rq)
@@ -1175,7 +1175,7 @@ static enum hrtimer_restart dl_task_timer(struct hrtimer *timer) 


	enqueue_task_dl(rq, p, ENQUEUE_REPLENISH);

	if (dl_task(rq->curr))

		check_preempt_curr_dl(rq, p, 0);

		wakeup_preempt_dl(rq, p, 0);

	else

		resched_curr(rq);
@@ -1939,7 +1939,7 @@ static int balance_dl(struct rq *rq, struct task_struct *p, struct rq_flags *rf) 
 * Only called when both the current and waking task are -deadline

 * tasks.

 */

static void check_preempt_curr_dl(struct rq *rq, struct task_struct *p,

static void wakeup_preempt_dl(struct rq *rq, struct task_struct *p,

				  int flags)

{

	if (dl_entity_preempt(&p->dl, &rq->curr->dl)) {
@@ -2652,7 +2652,7 @@ static void switched_to_dl(struct rq *rq, struct task_struct *p) 
			deadline_queue_push_tasks(rq);

#endif

		if (dl_task(rq->curr))

			check_preempt_curr_dl(rq, p, 0);

			wakeup_preempt_dl(rq, p, 0);

		else

			resched_curr(rq);

	} else {
@@ -2721,7 +2721,7 @@ DEFINE_SCHED_CLASS(dl) = { 
	.dequeue_task		= dequeue_task_dl,

	.yield_task		= yield_task_dl,



	.check_preempt_curr	= check_preempt_curr_dl,

	.wakeup_preempt		= wakeup_preempt_dl,



	.pick_next_task		= pick_next_task_dl,

	.put_prev_task		= put_prev_task_dl,

kernel/sched/fair.c

+5 −5
Original line number Diff line number Diff line
@@ -8007,7 +8007,7 @@ static void check_preempt_wakeup_fair(struct rq *rq, struct task_struct *p, int 


	/*

	 * This is possible from callers such as attach_tasks(), in which we

	 * unconditionally check_preempt_curr() after an enqueue (which may have

	 * unconditionally wakeup_preempt() after an enqueue (which may have

	 * lead to a throttle).  This both saves work and prevents false

	 * next-buddy nomination below.

	 */
@@ -8914,7 +8914,7 @@ static void attach_task(struct rq *rq, struct task_struct *p) 


	WARN_ON_ONCE(task_rq(p) != rq);

	activate_task(rq, p, ENQUEUE_NOCLOCK);

	check_preempt_curr(rq, p, 0);

	wakeup_preempt(rq, p, 0);

}



/*
@@ -12369,7 +12369,7 @@ prio_changed_fair(struct rq *rq, struct task_struct *p, int oldprio) 
		if (p->prio > oldprio)

			resched_curr(rq);

	} else

		check_preempt_curr(rq, p, 0);

		wakeup_preempt(rq, p, 0);

}



#ifdef CONFIG_FAIR_GROUP_SCHED
@@ -12471,7 +12471,7 @@ static void switched_to_fair(struct rq *rq, struct task_struct *p) 
		if (task_current(rq, p))

			resched_curr(rq);

		else

			check_preempt_curr(rq, p, 0);

			wakeup_preempt(rq, p, 0);

	}

}
@@ -12830,7 +12830,7 @@ DEFINE_SCHED_CLASS(fair) = { 
	.yield_task		= yield_task_fair,

	.yield_to_task		= yield_to_task_fair,



	.check_preempt_curr	= check_preempt_wakeup_fair,

	.wakeup_preempt		= check_preempt_wakeup_fair,



	.pick_next_task		= __pick_next_task_fair,

	.put_prev_task		= put_prev_task_fair,

kernel/sched/idle.c

+2 −2
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ balance_idle(struct rq *rq, struct task_struct *prev, struct rq_flags *rf) 
/*

 * Idle tasks are unconditionally rescheduled:

 */

static void check_preempt_curr_idle(struct rq *rq, struct task_struct *p, int flags)

static void wakeup_preempt_idle(struct rq *rq, struct task_struct *p, int flags)

{

	resched_curr(rq);

}
@@ -481,7 +481,7 @@ DEFINE_SCHED_CLASS(idle) = { 
	/* dequeue is not valid, we print a debug message there: */

	.dequeue_task		= dequeue_task_idle,



	.check_preempt_curr	= check_preempt_curr_idle,

	.wakeup_preempt		= wakeup_preempt_idle,



	.pick_next_task		= pick_next_task_idle,

	.put_prev_task		= put_prev_task_idle,

kernel/sched/rt.c

+3 −3
Original line number Diff line number Diff line
@@ -953,7 +953,7 @@ static int do_sched_rt_period_timer(struct rt_bandwidth *rt_b, int overrun) 


				/*

				 * When we're idle and a woken (rt) task is

				 * throttled check_preempt_curr() will set

				 * throttled wakeup_preempt() will set

				 * skip_update and the time between the wakeup

				 * and this unthrottle will get accounted as

				 * 'runtime'.
@@ -1715,7 +1715,7 @@ static int balance_rt(struct rq *rq, struct task_struct *p, struct rq_flags *rf) 
/*

 * Preempt the current task with a newly woken task if needed:

 */

static void check_preempt_curr_rt(struct rq *rq, struct task_struct *p, int flags)

static void wakeup_preempt_rt(struct rq *rq, struct task_struct *p, int flags)

{

	if (p->prio < rq->curr->prio) {

		resched_curr(rq);
@@ -2702,7 +2702,7 @@ DEFINE_SCHED_CLASS(rt) = { 
	.dequeue_task		= dequeue_task_rt,

	.yield_task		= yield_task_rt,



	.check_preempt_curr	= check_preempt_curr_rt,

	.wakeup_preempt		= wakeup_preempt_rt,



	.pick_next_task		= pick_next_task_rt,

	.put_prev_task		= put_prev_task_rt,