Commit 63676eef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sched_ext-for-6.13-rc5-fixes' of... 

Merge tag 'sched_ext-for-6.13-rc5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext

Pull sched_ext fixes from Tejun Heo:

 - Fix a bug where bpf_iter_scx_dsq_new() was not initializing the
   iterator's flags and could inadvertently enable e.g. reverse
   iteration

 - Fix a bug where scx_ops_bypass() could call irq_restore twice

 - Add Andrea and Changwoo as maintainers for better review coverage

 - selftests and tools/sched_ext build and other fixes

* tag 'sched_ext-for-6.13-rc5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext:
  sched_ext: Fix dsq_local_on selftest
  sched_ext: initialize kit->cursor.flags
  sched_ext: Fix invalid irq restore in scx_ops_bypass()
  MAINTAINERS: add me as reviewer for sched_ext
  MAINTAINERS: add self as reviewer for sched_ext
  scx: Fix maximal BPF selftest prog
  sched_ext: fix application of sizeof to pointer
  selftests/sched_ext: fix build after renames in sched_ext API
  sched_ext: Add __weak to fix the build errors
parents f9aa1fb9 ce2b93fc

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -20907,6 +20907,8 @@ F: kernel/sched/ 
SCHEDULER - SCHED_EXT

R:	Tejun Heo <tj@kernel.org>

R:	David Vernet <void@manifault.com>

R:	Andrea Righi <arighi@nvidia.com>

R:	Changwoo Min <changwoo@igalia.com>

L:	linux-kernel@vger.kernel.org

S:	Maintained

W:	https://github.com/sched-ext/scx

kernel/sched/ext.c

+2 −2
Original line number Diff line number Diff line
@@ -4763,7 +4763,7 @@ static void scx_ops_bypass(bool bypass) 
		 * sees scx_rq_bypassing() before moving tasks to SCX.

		 */

		if (!scx_enabled()) {

			rq_unlock_irqrestore(rq, &rf);

			rq_unlock(rq, &rf);

			continue;

		}
@@ -7013,7 +7013,7 @@ __bpf_kfunc int bpf_iter_scx_dsq_new(struct bpf_iter_scx_dsq *it, u64 dsq_id, 
		return -ENOENT;



	INIT_LIST_HEAD(&kit->cursor.node);

	kit->cursor.flags |= SCX_DSQ_LNODE_ITER_CURSOR | flags;

	kit->cursor.flags = SCX_DSQ_LNODE_ITER_CURSOR | flags;

	kit->cursor.priv = READ_ONCE(kit->dsq->seq);



	return 0;

tools/sched_ext/include/scx/common.bpf.h

+3 −3
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ void scx_bpf_dsq_insert(struct task_struct *p, u64 dsq_id, u64 slice, u64 enq_fl 
void scx_bpf_dsq_insert_vtime(struct task_struct *p, u64 dsq_id, u64 slice, u64 vtime, u64 enq_flags) __ksym __weak;

u32 scx_bpf_dispatch_nr_slots(void) __ksym;

void scx_bpf_dispatch_cancel(void) __ksym;

bool scx_bpf_dsq_move_to_local(u64 dsq_id) __ksym;

void scx_bpf_dsq_move_set_slice(struct bpf_iter_scx_dsq *it__iter, u64 slice) __ksym;

void scx_bpf_dsq_move_set_vtime(struct bpf_iter_scx_dsq *it__iter, u64 vtime) __ksym;

bool scx_bpf_dsq_move_to_local(u64 dsq_id) __ksym __weak;

void scx_bpf_dsq_move_set_slice(struct bpf_iter_scx_dsq *it__iter, u64 slice) __ksym __weak;

void scx_bpf_dsq_move_set_vtime(struct bpf_iter_scx_dsq *it__iter, u64 vtime) __ksym __weak;

bool scx_bpf_dsq_move(struct bpf_iter_scx_dsq *it__iter, struct task_struct *p, u64 dsq_id, u64 enq_flags) __ksym __weak;

bool scx_bpf_dsq_move_vtime(struct bpf_iter_scx_dsq *it__iter, struct task_struct *p, u64 dsq_id, u64 enq_flags) __ksym __weak;

u32 scx_bpf_reenqueue_local(void) __ksym;

tools/sched_ext/scx_central.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ int main(int argc, char **argv) 
	SCX_BUG_ON(!cpuset, "Failed to allocate cpuset");

	CPU_ZERO(cpuset);

	CPU_SET(skel->rodata->central_cpu, cpuset);

	SCX_BUG_ON(sched_setaffinity(0, sizeof(cpuset), cpuset),

	SCX_BUG_ON(sched_setaffinity(0, sizeof(*cpuset), cpuset),

		   "Failed to affinitize to central CPU %d (max %d)",

		   skel->rodata->central_cpu, skel->rodata->nr_cpu_ids - 1);

	CPU_FREE(cpuset);

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;

	}