Commit 023af03c authored by Tejun Heo's avatar Tejun Heo
Browse files

sched_ext: Move __SCX_DSQ_ITER_ALL_FLAGS BUILD_BUG_ON to the right place 



The BUILD_BUG_ON() which checks that __SCX_DSQ_ITER_ALL_FLAGS doesn't
overlap with the private lnode bits was in scx_task_iter_start() which has
nothing to do with DSQ iteration. Move it to bpf_iter_scx_dsq_new() where it
belongs.

No functional changes.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 7900aa69

kernel/sched/ext.c

+2 −3
Original line number Diff line number Diff line
@@ -474,9 +474,6 @@ struct scx_task_iter { 
 */

static void scx_task_iter_start(struct scx_task_iter *iter)

{

	BUILD_BUG_ON(__SCX_DSQ_ITER_ALL_FLAGS &

		     ((1U << __SCX_DSQ_LNODE_PRIV_SHIFT) - 1));



	spin_lock_irq(&scx_tasks_lock);



	iter->cursor = (struct sched_ext_entity){ .flags = SCX_TASK_CURSOR };
@@ -6218,6 +6215,8 @@ __bpf_kfunc int bpf_iter_scx_dsq_new(struct bpf_iter_scx_dsq *it, u64 dsq_id, 
		     sizeof(struct bpf_iter_scx_dsq));

	BUILD_BUG_ON(__alignof__(struct bpf_iter_scx_dsq_kern) !=

		     __alignof__(struct bpf_iter_scx_dsq));

	BUILD_BUG_ON(__SCX_DSQ_ITER_ALL_FLAGS &

		     ((1U << __SCX_DSQ_LNODE_PRIV_SHIFT) - 1));



	/*

	 * next() and destroy() will be called regardless of the return value.