+1 -1

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

reviewed

··· 20 20 * If we dispatch to a bogus DSQ that will fall back to the 21 21 * builtin global DSQ, we fail gracefully. 22 22 */ 23 23 - scx_bpf_dispatch_vtime(p, 0xcafef00d, SCX_SLICE_DFL, 23 23 + scx_bpf_dsq_insert_vtime(p, 0xcafef00d, SCX_SLICE_DFL, 24 24 p->scx.dsq_vtime, 0); 25 25 return cpu; 26 26 }

+2 -2

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

reviewed

··· 17 17 18 18 if (cpu >= 0) { 19 19 /* Shouldn't be allowed to vtime dispatch to a builtin DSQ. */ 20 20 - scx_bpf_dispatch_vtime(p, SCX_DSQ_LOCAL, SCX_SLICE_DFL, 21 21 - p->scx.dsq_vtime, 0); 20 20 + scx_bpf_dsq_insert_vtime(p, SCX_DSQ_LOCAL, SCX_SLICE_DFL, 21 21 + p->scx.dsq_vtime, 0); 22 22 return cpu; 23 23 } 24 24

+1 -1

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

reviewed

··· 45 45 46 46 target = bpf_get_prandom_u32() % nr_cpus; 47 47 48 48 - scx_bpf_dispatch(p, SCX_DSQ_LOCAL_ON | target, SCX_SLICE_DFL, 0); 48 48 + scx_bpf_dsq_insert(p, SCX_DSQ_LOCAL_ON | target, SCX_SLICE_DFL, 0); 49 49 bpf_task_release(p); 50 50 } 51 51

+1 -1

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

reviewed

··· 31 31 /* Can only call from ops.select_cpu() */ 32 32 scx_bpf_select_cpu_dfl(p, 0, 0, &found); 33 33 34 34 - scx_bpf_dispatch(p, SCX_DSQ_GLOBAL, SCX_SLICE_DFL, enq_flags); 34 34 + scx_bpf_dsq_insert(p, SCX_DSQ_GLOBAL, SCX_SLICE_DFL, enq_flags); 35 35 } 36 36 37 37 SEC(".struct_ops.link")

+2 -2

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

reviewed

··· 33 33 if (exit_point == EXIT_ENQUEUE) 34 34 EXIT_CLEANLY(); 35 35 36 36 - scx_bpf_dispatch(p, DSQ_ID, SCX_SLICE_DFL, enq_flags); 36 36 + scx_bpf_dsq_insert(p, DSQ_ID, SCX_SLICE_DFL, enq_flags); 37 37 } 38 38 39 39 void BPF_STRUCT_OPS(exit_dispatch, s32 cpu, struct task_struct *p) ··· 41 41 if (exit_point == EXIT_DISPATCH) 42 42 EXIT_CLEANLY(); 43 43 44 44 - scx_bpf_consume(DSQ_ID); 44 44 + scx_bpf_dsq_move_to_local(DSQ_ID); 45 45 } 46 46 47 47 void BPF_STRUCT_OPS(exit_enable, struct task_struct *p)

+2 -2

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

reviewed

··· 20 20 21 21 void BPF_STRUCT_OPS(maximal_enqueue, struct task_struct *p, u64 enq_flags) 22 22 { 23 23 - scx_bpf_dispatch(p, SCX_DSQ_GLOBAL, SCX_SLICE_DFL, enq_flags); 23 23 + scx_bpf_dsq_insert(p, SCX_DSQ_GLOBAL, SCX_SLICE_DFL, enq_flags); 24 24 } 25 25 26 26 void BPF_STRUCT_OPS(maximal_dequeue, struct task_struct *p, u64 deq_flags) ··· 28 28 29 29 void BPF_STRUCT_OPS(maximal_dispatch, s32 cpu, struct task_struct *prev) 30 30 { 31 31 - scx_bpf_consume(SCX_DSQ_GLOBAL); 31 31 + scx_bpf_dsq_move_to_local(SCX_DSQ_GLOBAL); 32 32 } 33 33 34 34 void BPF_STRUCT_OPS(maximal_runnable, struct task_struct *p, u64 enq_flags)

+1 -1

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

reviewed

··· 30 30 } 31 31 scx_bpf_put_idle_cpumask(idle_mask); 32 32 33 33 - scx_bpf_dispatch(p, SCX_DSQ_GLOBAL, SCX_SLICE_DFL, enq_flags); 33 33 + scx_bpf_dsq_insert(p, SCX_DSQ_GLOBAL, SCX_SLICE_DFL, enq_flags); 34 34 } 35 35 36 36 SEC(".struct_ops.link")

+1 -1

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

reviewed

··· 67 67 saw_local = true; 68 68 } 69 69 70 70 - scx_bpf_dispatch(p, dsq_id, SCX_SLICE_DFL, enq_flags); 70 70 + scx_bpf_dsq_insert(p, dsq_id, SCX_SLICE_DFL, enq_flags); 71 71 } 72 72 73 73 s32 BPF_STRUCT_OPS(select_cpu_dfl_nodispatch_init_task,

+1 -1

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

reviewed

··· 29 29 cpu = prev_cpu; 30 30 31 31 dispatch: 32 32 - scx_bpf_dispatch(p, dsq_id, SCX_SLICE_DFL, 0); 32 32 + scx_bpf_dsq_insert(p, dsq_id, SCX_SLICE_DFL, 0); 33 33 return cpu; 34 34 } 35 35

+1 -1

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

reviewed

··· 18 18 s32 prev_cpu, u64 wake_flags) 19 19 { 20 20 /* Dispatching to a random DSQ should fail. */ 21 21 - scx_bpf_dispatch(p, 0xcafef00d, SCX_SLICE_DFL, 0); 21 21 + scx_bpf_dsq_insert(p, 0xcafef00d, SCX_SLICE_DFL, 0); 22 22 23 23 return prev_cpu; 24 24 }

+2 -2

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

reviewed

··· 18 18 s32 prev_cpu, u64 wake_flags) 19 19 { 20 20 /* Dispatching twice in a row is disallowed. */ 21 21 - scx_bpf_dispatch(p, SCX_DSQ_GLOBAL, SCX_SLICE_DFL, 0); 22 22 - scx_bpf_dispatch(p, SCX_DSQ_GLOBAL, SCX_SLICE_DFL, 0); 21 21 + scx_bpf_dsq_insert(p, SCX_DSQ_GLOBAL, SCX_SLICE_DFL, 0); 22 22 + scx_bpf_dsq_insert(p, SCX_DSQ_GLOBAL, SCX_SLICE_DFL, 0); 23 23 24 24 return prev_cpu; 25 25 }

+4 -4

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

reviewed

··· 2 2 /* 3 3 * A scheduler that validates that enqueue flags are properly stored and 4 4 * applied at dispatch time when a task is directly dispatched from 5 5 - * ops.select_cpu(). We validate this by using scx_bpf_dispatch_vtime(), and 6 6 - * making the test a very basic vtime scheduler. 5 5 + * ops.select_cpu(). We validate this by using scx_bpf_dsq_insert_vtime(), 6 6 + * and making the test a very basic vtime scheduler. 7 7 * 8 8 * Copyright (c) 2024 Meta Platforms, Inc. and affiliates. 9 9 * Copyright (c) 2024 David Vernet <dvernet@meta.com> ··· 47 47 cpu = prev_cpu; 48 48 scx_bpf_test_and_clear_cpu_idle(cpu); 49 49 ddsp: 50 50 - scx_bpf_dispatch_vtime(p, VTIME_DSQ, SCX_SLICE_DFL, task_vtime(p), 0); 50 50 + scx_bpf_dsq_insert_vtime(p, VTIME_DSQ, SCX_SLICE_DFL, task_vtime(p), 0); 51 51 return cpu; 52 52 } 53 53 54 54 void BPF_STRUCT_OPS(select_cpu_vtime_dispatch, s32 cpu, struct task_struct *p) 55 55 { 56 56 - if (scx_bpf_consume(VTIME_DSQ)) 56 56 + if (scx_bpf_dsq_move_to_local(VTIME_DSQ)) 57 57 consumed = true; 58 58 } 59 59