Unverified Commit 9bc8eb61 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4167 sched/fair: Fix qos_timer deadlock when cpuhp offline 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhao Wenhui <zhaowenhui8@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/ZR2YUNHCIJVZ6GZ6OGMB43CNHHCY3VAS/ 
 
https://gitee.com/openeuler/kernel/issues/I8WTPH 
 
Link:https://gitee.com/openeuler/kernel/pulls/4167

 

Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 263f00bd 832b43c5

kernel/sched/fair.c

+2 −1
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ static DEFINE_PER_CPU_SHARED_ALIGNED(struct hrtimer, qos_overload_timer); 
static DEFINE_PER_CPU(int, qos_cpu_overload);

unsigned int sysctl_overload_detect_period = 5000;  /* in ms */

unsigned int sysctl_offline_wait_interval = 100;  /* in ms */

static int __unthrottle_qos_cfs_rqs(int cpu);

static int unthrottle_qos_cfs_rqs(int cpu);

static bool qos_smt_expelled(int this_cpu);

#endif
@@ -5733,7 +5734,7 @@ static void __maybe_unused unthrottle_offline_cfs_rqs(struct rq *rq) 
	lockdep_assert_rq_held(rq);



#ifdef CONFIG_QOS_SCHED

	unthrottle_qos_cfs_rqs(cpu_of(rq));

	__unthrottle_qos_cfs_rqs(cpu_of(rq));

#endif



	rcu_read_lock();