Commit 9b30400f authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'for-6.15-fixes' into for-6.16 

To receive 428dc9fc ("sched_ext: bpf_iter_scx_dsq_new() should always
initialize iterator") which conflicts with cdf5a6fa ("sched_ext: Move
dsq_hash into scx_sched"). The conflict is a simple context conflict which
can be resolved by taking changes from both changes in the right order.
parents c8fafb34 428dc9fc

kernel/sched/ext.c

+6 −0
Original line number Diff line number Diff line
@@ -6913,6 +6913,12 @@ __bpf_kfunc int bpf_iter_scx_dsq_new(struct bpf_iter_scx_dsq *it, u64 dsq_id, 
	BUILD_BUG_ON(__alignof__(struct bpf_iter_scx_dsq_kern) !=

		     __alignof__(struct bpf_iter_scx_dsq));



	/*

	 * next() and destroy() will be called regardless of the return value.

	 * Always clear $kit->dsq.

	 */

	kit->dsq = NULL;



	sch = rcu_dereference_check(scx_root, rcu_read_lock_bh_held());

	if (!sch)

		return -ENODEV;