Commit 0454a604 authored by Tejun Heo's avatar Tejun Heo
Browse files

sched_ext: Update p->scx.disallow warning in scx_init_task() 



- Always trigger the warning if p->scx.disallow is set for fork inits. There
  is no reason to set it during forks.

- Flip the positions of if/else arms to ease adding error conditions.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Reviewed-by: default avatarAndrea Righi <arighi@nvidia.com>
parent 19d0e98c

kernel/sched/ext.c

+4 −4
Original line number Diff line number Diff line
@@ -3032,7 +3032,10 @@ static int scx_init_task(struct task_struct *p, struct task_group *tg, bool fork 
	scx_set_task_state(p, SCX_TASK_INIT);



	if (p->scx.disallow) {

		if (!fork) {

		if (unlikely(fork)) {

			scx_error(sch, "ops.init_task() set task->scx.disallow for %s[%d] during fork",

				  p->comm, p->pid);

		} else {

			struct rq *rq;

			struct rq_flags rf;
@@ -3051,9 +3054,6 @@ static int scx_init_task(struct task_struct *p, struct task_group *tg, bool fork 
			}



			task_rq_unlock(rq, p, &rf);

		} else if (p->policy == SCHED_EXT) {

			scx_error(sch, "ops.init_task() set task->scx.disallow for %s[%d] during fork",

				  p->comm, p->pid);

		}

	}