Commit 5ac99857 authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'tip/sched/core' into for-6.12 



To receive 863ccdbb ("sched: Allow sched_class::dequeue_task() to fail")
which makes sched_class.dequeue_task() return bool instead of void. This
leads to compile breakage and will be fixed by a follow-up patch.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parents 89909296 aef6987d

fs/bcachefs/six.c

+1 −1
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ static inline bool six_owner_running(struct six_lock *lock) 
	 */

	rcu_read_lock();

	struct task_struct *owner = READ_ONCE(lock->owner);

	bool ret = owner ? owner_on_cpu(owner) : !rt_task(current);

	bool ret = owner ? owner_on_cpu(owner) : !rt_or_dl_task(current);

	rcu_read_unlock();



	return ret;

fs/select.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ u64 select_estimate_accuracy(struct timespec64 *tv) 
	 * Realtime tasks get a slack of 0 for obvious reasons.

	 */



	if (rt_task(current))

	if (rt_or_dl_task(current))

		return 0;



	ktime_get_ts64(&now);

include/linux/ioprio.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static inline int task_nice_ioclass(struct task_struct *task) 
{

	if (task->policy == SCHED_IDLE)

		return IOPRIO_CLASS_IDLE;

	else if (task_is_realtime(task))

	else if (rt_or_dl_task_policy(task))

		return IOPRIO_CLASS_RT;

	else

		return IOPRIO_CLASS_BE;

include/linux/sched.h

+9 −3
Original line number Diff line number Diff line
@@ -152,7 +152,8 @@ struct user_event_mm; 
 * the comment with set_special_state().

 */

#define is_special_task_state(state)					\

	((state) & (__TASK_STOPPED | __TASK_TRACED | TASK_PARKED | TASK_DEAD))

	((state) & (__TASK_STOPPED | __TASK_TRACED | TASK_PARKED |	\

		    TASK_DEAD | TASK_FROZEN))



#ifdef CONFIG_DEBUG_ATOMIC_SLEEP

# define debug_normal_state_change(state_value)				\
@@ -543,9 +544,14 @@ struct sched_entity { 
	struct rb_node			run_node;

	u64				deadline;

	u64				min_vruntime;

	u64				min_slice;



	struct list_head		group_node;

	unsigned int			on_rq;

	unsigned char			on_rq;

	unsigned char			sched_delayed;

	unsigned char			rel_deadline;

	unsigned char			custom_slice;

					/* hole */



	u64				exec_start;

	u64				sum_exec_runtime;

include/linux/sched/deadline.h

+7 −7
Original line number Diff line number Diff line
@@ -10,16 +10,16 @@ 


#include <linux/sched.h>



#define MAX_DL_PRIO		0



static inline int dl_prio(int prio)

static inline bool dl_prio(int prio)

{

	if (unlikely(prio < MAX_DL_PRIO))

		return 1;

	return 0;

	return unlikely(prio < MAX_DL_PRIO);

}



static inline int dl_task(struct task_struct *p)

/*

 * Returns true if a task has a priority that belongs to DL class. PI-boosted

 * tasks will return true. Use dl_policy() to ignore PI-boosted tasks.

 */

static inline bool dl_task(struct task_struct *p)

{

	return dl_prio(p->prio);

}