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

!7951 sched/rt: Fix rt_runtime leaks with cpu hotplug and RT_RUNTIME_SHARE 

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

 

Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 3864a7cb 5cb5bd37

kernel/sched/rt.c

+9 −6
Original line number Diff line number Diff line
@@ -664,7 +664,8 @@ static void do_balance_runtime(struct rt_rq *rt_rq) 
		 * or __disable_runtime() below sets a specific rq to inf to

		 * indicate its been disabled and disalow stealing.

		 */

		if (iter->rt_runtime == RUNTIME_INF)

		if (iter->rt_runtime == RUNTIME_INF ||

				iter->rt_runtime == RUNTIME_DISABLED)

			goto next;



		/*
@@ -735,7 +736,9 @@ static void __disable_runtime(struct rq *rq) 
			/*

			 * Can't reclaim from ourselves or disabled runqueues.

			 */

			if (iter == rt_rq || iter->rt_runtime == RUNTIME_INF)

			if (iter == rt_rq ||

					iter->rt_runtime == RUNTIME_INF ||

					iter->rt_runtime == RUNTIME_DISABLED)

				continue;



			raw_spin_lock(&iter->rt_runtime_lock);
@@ -761,10 +764,9 @@ static void __disable_runtime(struct rq *rq) 
		WARN_ON_ONCE(want);

balanced:

		/*

		 * Disable all the borrow logic by pretending we have inf

		 * runtime - in which case borrowing doesn't make sense.

		 * Disable all the borrow logic by marking runtime disabled.

		 */

		rt_rq->rt_runtime = RUNTIME_INF;

		rt_rq->rt_runtime = RUNTIME_DISABLED;

		rt_rq->rt_throttled = 0;

		raw_spin_unlock(&rt_rq->rt_runtime_lock);

		raw_spin_unlock(&rt_b->rt_runtime_lock);
@@ -2555,6 +2557,7 @@ static int tg_set_rt_bandwidth(struct task_group *tg, 
		struct rt_rq *rt_rq = tg->rt_rq[i];



		raw_spin_lock(&rt_rq->rt_runtime_lock);

		if (rt_rq->rt_runtime != RUNTIME_DISABLED)

			rt_rq->rt_runtime = rt_runtime;

		raw_spin_unlock(&rt_rq->rt_runtime_lock);

	}

kernel/sched/sched.h

+5 −0
Original line number Diff line number Diff line
@@ -163,6 +163,11 @@ static inline void cpu_load_update_active(struct rq *this_rq) { } 
 */

#define RUNTIME_INF		((u64)~0ULL)



/*

 * Single value that denotes runtime is disabled, and it should not be used.

 */

#define RUNTIME_DISABLED	(-2ULL)



static inline int idle_policy(int policy)

{

	return policy == SCHED_IDLE;