Commit ce565f83 authored by Tejun Heo's avatar Tejun Heo
Browse files

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

To receive e38be1c7 ("sched_ext: Fix rq lock state in hotplug ops") to
avoid conflicts with scx_sched related patches pending for for-6.16.
parents 069ac9e1 e38be1c7

kernel/sched/ext.c

+2 −8
Original line number Diff line number Diff line
@@ -3491,9 +3491,9 @@ static void handle_hotplug(struct rq *rq, bool online) 
		scx_idle_update_selcpu_topology(&scx_ops);



	if (online && SCX_HAS_OP(cpu_online))

		SCX_CALL_OP(SCX_KF_UNLOCKED, cpu_online, rq, cpu);

		SCX_CALL_OP(SCX_KF_UNLOCKED, cpu_online, NULL, cpu);

	else if (!online && SCX_HAS_OP(cpu_offline))

		SCX_CALL_OP(SCX_KF_UNLOCKED, cpu_offline, rq, cpu);

		SCX_CALL_OP(SCX_KF_UNLOCKED, cpu_offline, NULL, cpu);

	else

		scx_exit(SCX_ECODE_ACT_RESTART | SCX_ECODE_RSN_HOTPLUG,

			 "cpu %d going %s, exiting scheduler", cpu,
@@ -7362,12 +7362,6 @@ BTF_ID_FLAGS(func, scx_bpf_nr_cpu_ids) 
BTF_ID_FLAGS(func, scx_bpf_get_possible_cpumask, KF_ACQUIRE)

BTF_ID_FLAGS(func, scx_bpf_get_online_cpumask, KF_ACQUIRE)

BTF_ID_FLAGS(func, scx_bpf_put_cpumask, KF_RELEASE)

BTF_ID_FLAGS(func, scx_bpf_get_idle_cpumask, KF_ACQUIRE)

BTF_ID_FLAGS(func, scx_bpf_get_idle_smtmask, KF_ACQUIRE)

BTF_ID_FLAGS(func, scx_bpf_put_idle_cpumask, KF_RELEASE)

BTF_ID_FLAGS(func, scx_bpf_test_and_clear_cpu_idle)

BTF_ID_FLAGS(func, scx_bpf_pick_idle_cpu, KF_RCU)

BTF_ID_FLAGS(func, scx_bpf_pick_any_cpu, KF_RCU)

BTF_ID_FLAGS(func, scx_bpf_task_running, KF_RCU)

BTF_ID_FLAGS(func, scx_bpf_task_cpu, KF_RCU)

BTF_ID_FLAGS(func, scx_bpf_cpu_rq)