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

!4166 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/6DO7KBHPJP6SX5AT25IFVU4OSYNGVJW6/ 
 
https://gitee.com/openeuler/kernel/issues/I8YHBT 
 
Link:https://gitee.com/openeuler/kernel/pulls/4166

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 0ff07578 8e17c72c

kernel/sched/fair.c

+2 −2
Original line number Diff line number Diff line
@@ -116,7 +116,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);

#endif



#ifdef CONFIG_CFS_BANDWIDTH
@@ -5218,7 +5218,7 @@ static void __maybe_unused unthrottle_offline_cfs_rqs(struct rq *rq) 
	lockdep_assert_held(&rq->lock);



#ifdef CONFIG_QOS_SCHED

	unthrottle_qos_cfs_rqs(cpu_of(rq));

	__unthrottle_qos_cfs_rqs(cpu_of(rq));

#endif



	rcu_read_lock();