selftests/sched_ext: Update scx_bpf_dsq_move_to_local() in kselftests

After commit 860683763ebf ("sched_ext: Add enq_flags to
scx_bpf_dsq_move_to_local()") some of the kselftests are failing to
build:

 exit.bpf.c:44:34: error: too few arguments provided to function-like macro invocation
    44 |         scx_bpf_dsq_move_to_local(DSQ_ID);

Update the kselftests adding the new argument to
scx_bpf_dsq_move_to_local().

Fixes: 860683763ebf ("sched_ext: Add enq_flags to scx_bpf_dsq_move_to_local()")
Signed-off-by: Andrea Righi <arighi@nvidia.com>
Signed-off-by: Tejun Heo <tj@kernel.org>

diff --git a/tools/testing/selftests/sched_ext/dequeue.bpf.c b/tools/testing/selftests/sched_ext/dequeue.bpf.c
index 597b88563d7deaad3733f95a1fcdc46dbb2175a5..624e2ccb06884e86140702740923437dd528d20a 100644 (file)
--- a/tools/testing/selftests/sched_ext/dequeue.bpf.c
+++ b/tools/testing/selftests/sched_ext/dequeue.bpf.c
@@ -342,7 +342,7 @@ void BPF_STRUCT_OPS(dequeue_dispatch, s32 cpu, struct task_struct *prev)
 
                bpf_task_release(p);
        } else {
-               scx_bpf_dsq_move_to_local(SHARED_DSQ);
+               scx_bpf_dsq_move_to_local(SHARED_DSQ, 0);
        }
 }
 

diff --git a/tools/testing/selftests/sched_ext/exit.bpf.c b/tools/testing/selftests/sched_ext/exit.bpf.c
index 4bc36182d3ffc2fb10e4e2c4eb92fccbfd7fec41..2e848820a44bb46bdd514db4c7e48ec9b84cc2ec 100644 (file)
--- a/tools/testing/selftests/sched_ext/exit.bpf.c
+++ b/tools/testing/selftests/sched_ext/exit.bpf.c
@@ -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_dsq_move_to_local(DSQ_ID);
+       scx_bpf_dsq_move_to_local(DSQ_ID, 0);
 }
 
 void BPF_STRUCT_OPS(exit_enable, struct task_struct *p)

diff --git a/tools/testing/selftests/sched_ext/maximal.bpf.c b/tools/testing/selftests/sched_ext/maximal.bpf.c
index 01cf4f3da4e091366eedb3d7d8fb1f658063ce4b..a3aabeb82e6be2d2216d2f733ea0fa7985e630ce 100644 (file)
--- a/tools/testing/selftests/sched_ext/maximal.bpf.c
+++ b/tools/testing/selftests/sched_ext/maximal.bpf.c
@@ -30,7 +30,7 @@ void BPF_STRUCT_OPS(maximal_dequeue, struct task_struct *p, u64 deq_flags)
 
 void BPF_STRUCT_OPS(maximal_dispatch, s32 cpu, struct task_struct *prev)
 {
-       scx_bpf_dsq_move_to_local(DSQ_ID);
+       scx_bpf_dsq_move_to_local(DSQ_ID, 0);
 }
 
 void BPF_STRUCT_OPS(maximal_runnable, struct task_struct *p, u64 enq_flags)

diff --git a/tools/testing/selftests/sched_ext/numa.bpf.c b/tools/testing/selftests/sched_ext/numa.bpf.c
index a79d86ed54a1ba73b60ba8bea46789f4345547b8..78cc49a7f9a676f16d2beebe0cd3fc03a1d09f23 100644 (file)
--- a/tools/testing/selftests/sched_ext/numa.bpf.c
+++ b/tools/testing/selftests/sched_ext/numa.bpf.c
@@ -68,7 +68,7 @@ void BPF_STRUCT_OPS(numa_dispatch, s32 cpu, struct task_struct *prev)
 {
        int node = __COMPAT_scx_bpf_cpu_node(cpu);
 
-       scx_bpf_dsq_move_to_local(node);
+       scx_bpf_dsq_move_to_local(node, 0);
 }
 
 s32 BPF_STRUCT_OPS_SLEEPABLE(numa_init)

diff --git a/tools/testing/selftests/sched_ext/peek_dsq.bpf.c b/tools/testing/selftests/sched_ext/peek_dsq.bpf.c
index 784f2f6c1af9b132f0424df5be355f338f8b4a8b..96e3a336a8a60aa8a82301dc2347a88f46590655 100644 (file)
--- a/tools/testing/selftests/sched_ext/peek_dsq.bpf.c
+++ b/tools/testing/selftests/sched_ext/peek_dsq.bpf.c
@@ -95,7 +95,7 @@ static int scan_dsq_pool(void)
                        record_peek_result(task->pid);
 
                        /* Try to move this task to local */
-                       if (!moved && scx_bpf_dsq_move_to_local(dsq_id) == 0) {
+                       if (!moved && scx_bpf_dsq_move_to_local(dsq_id, 0) == 0) {
                                moved = 1;
                                break;
                        }
@@ -156,19 +156,19 @@ void BPF_STRUCT_OPS(peek_dsq_dispatch, s32 cpu, struct task_struct *prev)
                dsq_peek_result2_pid = peek_result ? peek_result->pid : -1;
 
                /* Now consume the task since we've peeked at it */
-               scx_bpf_dsq_move_to_local(test_dsq_id);
+               scx_bpf_dsq_move_to_local(test_dsq_id, 0);
 
                /* Mark phase 1 as complete */
                phase1_complete = 1;
                bpf_printk("Phase 1 complete, starting phase 2 stress testing");
        } else if (!phase1_complete) {
                /* Still in phase 1, use real DSQ */
-               scx_bpf_dsq_move_to_local(real_dsq_id);
+               scx_bpf_dsq_move_to_local(real_dsq_id, 0);
        } else {
                /* Phase 2: Scan all DSQs in the pool and try to move a task */
                if (!scan_dsq_pool()) {
                        /* No tasks found in DSQ pool, fall back to real DSQ */
-                       scx_bpf_dsq_move_to_local(real_dsq_id);
+                       scx_bpf_dsq_move_to_local(real_dsq_id, 0);
                }
        }
 }

diff --git a/tools/testing/selftests/sched_ext/select_cpu_vtime.bpf.c b/tools/testing/selftests/sched_ext/select_cpu_vtime.bpf.c
index bfcb96cd4954bdd65b3c5f8217eb145aafd9010e..7aa5dc6bfb9366332dacefabda99f585f32f10c6 100644 (file)
--- a/tools/testing/selftests/sched_ext/select_cpu_vtime.bpf.c
+++ b/tools/testing/selftests/sched_ext/select_cpu_vtime.bpf.c
@@ -53,7 +53,7 @@ ddsp:
 
 void BPF_STRUCT_OPS(select_cpu_vtime_dispatch, s32 cpu, struct task_struct *p)
 {
-       if (scx_bpf_dsq_move_to_local(VTIME_DSQ))
+       if (scx_bpf_dsq_move_to_local(VTIME_DSQ, 0))
                consumed = true;
 }