sched/core: Fix unbalance set_rq_online/offline() in sched_cpu_deactivate()

commit fe7a11c78d2a9bdb8b50afc278a31ac177000948 upstream.

If cpuset_cpu_inactive() fails, set_rq_online() need be called to rollback.

Fixes: 120455c514f7 ("sched: Fix hotplug vs CPU bandwidth control")
Cc: stable@kernel.org
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20240703031610.587047-5-yangyingliang@huaweicloud.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 9dee52b4fc7ffd46652d4093f9f2a5c50f227981..3e84a3b7b7bb9bcad355a53ce482f185ec35af66 100644 (file)
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -9781,6 +9781,7 @@ int sched_cpu_deactivate(unsigned int cpu)
        ret = cpuset_cpu_inactive(cpu);
        if (ret) {
                sched_smt_present_inc(cpu);
+               sched_set_rq_online(rq, cpu);
                balance_push_set(cpu, false);
                set_cpu_active(cpu, true);
                sched_update_numa(cpu, true);