Commit ce2b93fc authored by Tejun Heo's avatar Tejun Heo
Browse files

sched_ext: Fix dsq_local_on selftest 



The dsp_local_on selftest expects the scheduler to fail by trying to
schedule an e.g. CPU-affine task to the wrong CPU. However, this isn't
guaranteed to happen in the 1 second window that the test is running.
Besides, it's odd to have this particular exception path tested when there
are no other tests that verify that the interface is working at all - e.g.
the test would pass if dsp_local_on interface is completely broken and fails
on any attempt.

Flip the test so that it verifies that the feature works. While at it, fix a
typo in the info message.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Reported-by: default avatarIhor Solodrai <ihor.solodrai@pm.me>
Link: http://lkml.kernel.org/r/Z1n9v7Z6iNJ-wKmq@slm.duckdns.org


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

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

+4 −1
Original line number Diff line number Diff line
@@ -43,7 +43,10 @@ void BPF_STRUCT_OPS(dsp_local_on_dispatch, s32 cpu, struct task_struct *prev) 
	if (!p)

		return;



	if (p->nr_cpus_allowed == nr_cpus)

		target = bpf_get_prandom_u32() % nr_cpus;

	else

		target = scx_bpf_task_cpu(p);



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

	bpf_task_release(p);

tools/testing/selftests/sched_ext/dsp_local_on.c

+3 −2
Original line number Diff line number Diff line
@@ -34,9 +34,10 @@ static enum scx_test_status run(void *ctx) 
	/* Just sleeping is fine, plenty of scheduling events happening */

	sleep(1);



	SCX_EQ(skel->data->uei.kind, EXIT_KIND(SCX_EXIT_ERROR));

	bpf_link__destroy(link);



	SCX_EQ(skel->data->uei.kind, EXIT_KIND(SCX_EXIT_UNREG));



	return SCX_TEST_PASS;

}
@@ -50,7 +51,7 @@ static void cleanup(void *ctx) 
struct scx_test dsp_local_on = {

	.name = "dsp_local_on",

	.description = "Verify we can directly dispatch tasks to a local DSQs "

		       "from osp.dispatch()",

		       "from ops.dispatch()",

	.setup = setup,

	.run = run,

	.cleanup = cleanup,