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

!13950 Fix SCHED_WARN_ON(cfs_rq->throttled_clock) in throttle_cfs_rq 

Merge Pull Request from: @ci-robot 
 
PR sync from: liukai <liukai284@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/V2BO4WKN72N4CYQNMDIGN6ZUMGBHKB6V/ 
 
https://gitee.com/openeuler/kernel/issues/IB7FU1 
 
Link:https://gitee.com/openeuler/kernel/pulls/13950

 

Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents b044b94d 17edb7ed

kernel/sched/fair.c

+11 −5
Original line number Diff line number Diff line
@@ -5467,6 +5467,9 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags) 
		if (!throttled_hierarchy(cfs_rq)) {

			list_add_leaf_cfs_rq(cfs_rq);

		} else {

#ifdef CONFIG_QOS_SCHED

			if (cfs_rq->throttled != QOS_THROTTLED) {

#endif

#ifdef CONFIG_CFS_BANDWIDTH

				struct rq *rq = rq_of(cfs_rq);
@@ -5474,6 +5477,9 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags) 
					cfs_rq->throttled_clock = rq_clock(rq);

				if (!cfs_rq->throttled_clock_self)

					cfs_rq->throttled_clock_self = rq_clock(rq);

#endif

#ifdef CONFIG_QOS_SCHED

			}

#endif

		}

	}