Commit ef7009de authored by Ihor Solodrai's avatar Ihor Solodrai Committed by Tejun Heo
Browse files

selftests/sched_ext: fix build after renames in sched_ext API 

The selftests are falining to build on current tip of bpf-next and
sched_ext [1]. This has broken BPF CI [2] after merge from upstream.

Use appropriate function names in the selftests according to the
recent changes in the sched_ext API [3].

[1] https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git/commit/?id=fc39fb56917bb3cb53e99560ca3612a84456ada2
[2] https://github.com/kernel-patches/bpf/actions/runs/11959327258/job/33340923745
[3] https://lore.kernel.org/all/20241109194853.580310-1-tj@kernel.org/



Signed-off-by: default avatarIhor Solodrai <ihor.solodrai@pm.me>
Acked-by: default avatarAndrea Righi <arighi@nvidia.com>
Acked-by: default avatarDavid Vernet <void@manifault.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 793baff3

tools/testing/selftests/sched_ext/ddsp_bogus_dsq_fail.bpf.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ s32 BPF_STRUCT_OPS(ddsp_bogus_dsq_fail_select_cpu, struct task_struct *p, 
		 * If we dispatch to a bogus DSQ that will fall back to the

		 * builtin global DSQ, we fail gracefully.

		 */

		scx_bpf_dispatch_vtime(p, 0xcafef00d, SCX_SLICE_DFL,

		scx_bpf_dsq_insert_vtime(p, 0xcafef00d, SCX_SLICE_DFL,

				       p->scx.dsq_vtime, 0);

		return cpu;

	}

tools/testing/selftests/sched_ext/ddsp_vtimelocal_fail.bpf.c

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ s32 BPF_STRUCT_OPS(ddsp_vtimelocal_fail_select_cpu, struct task_struct *p, 


	if (cpu >= 0) {

		/* Shouldn't be allowed to vtime dispatch to a builtin DSQ. */

		scx_bpf_dispatch_vtime(p, SCX_DSQ_LOCAL, SCX_SLICE_DFL,

		scx_bpf_dsq_insert_vtime(p, SCX_DSQ_LOCAL, SCX_SLICE_DFL,

					 p->scx.dsq_vtime, 0);

		return cpu;

	}

tools/testing/selftests/sched_ext/dsp_local_on.bpf.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ void BPF_STRUCT_OPS(dsp_local_on_dispatch, s32 cpu, struct task_struct *prev) 


	target = bpf_get_prandom_u32() % nr_cpus;



	scx_bpf_dispatch(p, SCX_DSQ_LOCAL_ON | target, SCX_SLICE_DFL, 0);

	scx_bpf_dsq_insert(p, SCX_DSQ_LOCAL_ON | target, SCX_SLICE_DFL, 0);

	bpf_task_release(p);

}

tools/testing/selftests/sched_ext/enq_select_cpu_fails.bpf.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ void BPF_STRUCT_OPS(enq_select_cpu_fails_enqueue, struct task_struct *p, 
	/* Can only call from ops.select_cpu() */

	scx_bpf_select_cpu_dfl(p, 0, 0, &found);



	scx_bpf_dispatch(p, SCX_DSQ_GLOBAL, SCX_SLICE_DFL, enq_flags);

	scx_bpf_dsq_insert(p, SCX_DSQ_GLOBAL, SCX_SLICE_DFL, enq_flags);

}



SEC(".struct_ops.link")

tools/testing/selftests/sched_ext/exit.bpf.c

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ void BPF_STRUCT_OPS(exit_enqueue, struct task_struct *p, u64 enq_flags) 
	if (exit_point == EXIT_ENQUEUE)

		EXIT_CLEANLY();



	scx_bpf_dispatch(p, DSQ_ID, SCX_SLICE_DFL, enq_flags);

	scx_bpf_dsq_insert(p, DSQ_ID, SCX_SLICE_DFL, enq_flags);

}



void BPF_STRUCT_OPS(exit_dispatch, s32 cpu, struct task_struct *p)
@@ -41,7 +41,7 @@ void BPF_STRUCT_OPS(exit_dispatch, s32 cpu, struct task_struct *p) 
	if (exit_point == EXIT_DISPATCH)

		EXIT_CLEANLY();



	scx_bpf_consume(DSQ_ID);

	scx_bpf_dsq_move_to_local(DSQ_ID);

}



void BPF_STRUCT_OPS(exit_enable, struct task_struct *p)