Commit 18adad1d authored by Connor O'Brien's avatar Connor O'Brien Committed by Peter Zijlstra
Browse files

sched: Consolidate pick_*_task to task_is_pushable helper 



This patch consolidates rt and deadline pick_*_task functions to
a task_is_pushable() helper

This patch was broken out from a larger chain migration
patch originally by Connor O'Brien.

[jstultz: split out from larger chain migration patch,
 renamed helper function]

Signed-off-by: default avatarConnor O'Brien <connoro@google.com>
Signed-off-by: default avatarJohn Stultz <jstultz@google.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarMetin Kaya <metin.kaya@arm.com>
Reviewed-by: default avatarValentin Schneider <vschneid@redhat.com>
Reviewed-by: default avatarChristian Loehle <christian.loehle@arm.com>
Tested-by: default avatarK Prateek Nayak <kprateek.nayak@amd.com>
Tested-by: default avatarMetin Kaya <metin.kaya@arm.com>
Link: https://lore.kernel.org/r/20241009235352.1614323-6-jstultz@google.com
parent 2b05a0b4

kernel/sched/deadline.c

+1 −9
Original line number Diff line number Diff line
@@ -2487,14 +2487,6 @@ static void task_fork_dl(struct task_struct *p) 
/* Only try algorithms three times */

#define DL_MAX_TRIES 3



static int pick_dl_task(struct rq *rq, struct task_struct *p, int cpu)

{

	if (!task_on_cpu(rq, p) &&

	    cpumask_test_cpu(cpu, &p->cpus_mask))

		return 1;

	return 0;

}



/*

 * Return the earliest pushable rq's task, which is suitable to be executed

 * on the CPU, NULL otherwise:
@@ -2513,7 +2505,7 @@ static struct task_struct *pick_earliest_pushable_dl_task(struct rq *rq, int cpu 
	if (next_node) {

		p = __node_2_pdl(next_node);



		if (pick_dl_task(rq, p, cpu))

		if (task_is_pushable(rq, p, cpu))

			return p;



		next_node = rb_next(next_node);

kernel/sched/rt.c

+1 −10
Original line number Diff line number Diff line
@@ -1773,15 +1773,6 @@ static void put_prev_task_rt(struct rq *rq, struct task_struct *p, struct task_s 
/* Only try algorithms three times */

#define RT_MAX_TRIES 3



static int pick_rt_task(struct rq *rq, struct task_struct *p, int cpu)

{

	if (!task_on_cpu(rq, p) &&

	    cpumask_test_cpu(cpu, &p->cpus_mask))

		return 1;



	return 0;

}



/*

 * Return the highest pushable rq's task, which is suitable to be executed

 * on the CPU, NULL otherwise
@@ -1795,7 +1786,7 @@ static struct task_struct *pick_highest_pushable_task(struct rq *rq, int cpu) 
		return NULL;



	plist_for_each_entry(p, head, pushable_tasks) {

		if (pick_rt_task(rq, p, cpu))

		if (task_is_pushable(rq, p, cpu))

			return p;

	}

kernel/sched/sched.h

+10 −0
Original line number Diff line number Diff line
@@ -3799,6 +3799,16 @@ void move_queued_task_locked(struct rq *src_rq, struct rq *dst_rq, struct task_s 
	set_task_cpu(task, dst_rq->cpu);

	activate_task(dst_rq, task, 0);

}



static inline

bool task_is_pushable(struct rq *rq, struct task_struct *p, int cpu)

{

	if (!task_on_cpu(rq, p) &&

	    cpumask_test_cpu(cpu, &p->cpus_mask))

		return true;



	return false;

}

#endif



#ifdef CONFIG_RT_MUTEXES