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: Tejun Heo <[email protected]>
Reported-by: Ihor Solodrai <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Tejun Heo <[email protected]>

diff --git a/tools/testing/selftests/sched_ext/dsp_local_on.bpf.c b/tools/testing/selftests/sched_ext/dsp_local_on.bpf.c
index 6325bf76f47ee439b062dfcbaae4e72edf0bbfa1..fbda6bf5467128810bf14cf0da6255eb507d8b7d 100644 (file)
--- a/tools/testing/selftests/sched_ext/dsp_local_on.bpf.c
+++ b/tools/testing/selftests/sched_ext/dsp_local_on.bpf.c
@@ -43,7 +43,10 @@ void BPF_STRUCT_OPS(dsp_local_on_dispatch, s32 cpu, struct task_struct *prev)
        if (!p)
                return;
 
-       target = bpf_get_prandom_u32() % nr_cpus;
+       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);

diff --git a/tools/testing/selftests/sched_ext/dsp_local_on.c b/tools/testing/selftests/sched_ext/dsp_local_on.c
index 472851b56854874212d75e634d611427acac8d13..0ff27e57fe4303a78ac2360e313df852bc18c2f3 100644 (file)
--- a/tools/testing/selftests/sched_ext/dsp_local_on.c
+++ b/tools/testing/selftests/sched_ext/dsp_local_on.c
@@ -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,