sched/fair: Fix insertion in rq->leaf_cfs_rq_list (f6783319) · Commits · 戴 / test

Sargun reported a crash: "I picked up sched/fair: Fix infinite loop in update_blocked_averages() by reverting and put it on top of 4.19.13. In addition to this, I uninlined list_add_leaf_cfs_rq for debugging. This revealed a new bug that we didn't get to because we kept getting crashes from the previous issue. When we are running with cgroups that are rapidly changing, with CFS bandwidth control, and in addition using the cpusets cgroup, we see this crash. Specifically, it seems to occur with cgroups that are throttled and we change the allowed cpuset." The algorithm used to order cfs_rq in rq->leaf_cfs_rq_list assumes that it will walk down to root the 1st time a cfs_rq is used and we will finish to add either a cfs_rq without parent or a cfs_rq with a parent that is already on the list. But this is not always true in presence of throttling. Because a cfs_rq can be throttled even if it has never been used but other CPUs of the cgroup have already used all the bandwdith, we are not sure to go down to the root and add all cfs_rq in the list. Ensure that all cfs_rq will be added in the list even if they are throttled. [ mingo: Fix !CGROUPS build. ] Reported-by:

Sargun Dhillon <sargun@sargun.me> Signed-off-by:

Vincent Guittot <vincent.guittot@linaro.org> Signed-off-by:

Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Mike Galbraith <efault@gmx.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: tj@kernel.org Fixes: ("Fix hierarchical order in rq->leaf_cfs_rq_list") Link: https://lkml.kernel.org/r/1548825767-10799-1-git-send-email-vincent.guittot@linaro.org Signed-off-by:

Ingo Molnar <mingo@kernel.org>

kernel/sched/fair.c

+28 −5

Original line number	Diff line number	Diff line
		@@ -275,13 +275,13 @@ static inline struct cfs_rq group_cfs_rq(struct sched_entity grp)
		return grp->my_q;
		}

		static inline void list_add_leaf_cfs_rq(struct cfs_rq *cfs_rq)
		static inline bool list_add_leaf_cfs_rq(struct cfs_rq *cfs_rq)
		{
		struct rq *rq = rq_of(cfs_rq);
		int cpu = cpu_of(rq);

		if (cfs_rq->on_list)
		return;
		return rq->tmp_alone_branch == &rq->leaf_cfs_rq_list;

		cfs_rq->on_list = 1;

		@@ -310,7 +310,7 @@ static inline void list_add_leaf_cfs_rq(struct cfs_rq *cfs_rq)
		* list.
		*/
		rq->tmp_alone_branch = &rq->leaf_cfs_rq_list;
		return;
		return true;
		}

		if (!cfs_rq->tg->parent) {
		@@ -325,7 +325,7 @@ static inline void list_add_leaf_cfs_rq(struct cfs_rq *cfs_rq)
		* tmp_alone_branch to the beginning of the list.
		*/
		rq->tmp_alone_branch = &rq->leaf_cfs_rq_list;
		return;
		return true;
		}

		/*
		@@ -340,6 +340,7 @@ static inline void list_add_leaf_cfs_rq(struct cfs_rq *cfs_rq)
		* of the branch
		*/
		rq->tmp_alone_branch = &cfs_rq->leaf_cfs_rq_list;
		return false;
		}

		static inline void list_del_leaf_cfs_rq(struct cfs_rq *cfs_rq)
		@@ -435,8 +436,9 @@ static inline struct cfs_rq group_cfs_rq(struct sched_entity grp)
		return NULL;
		}

		static inline void list_add_leaf_cfs_rq(struct cfs_rq *cfs_rq)
		static inline bool list_add_leaf_cfs_rq(struct cfs_rq *cfs_rq)
		{
		return true;
		}

		static inline void list_del_leaf_cfs_rq(struct cfs_rq *cfs_rq)
		@@ -4995,6 +4997,12 @@ static void __maybe_unused unthrottle_offline_cfs_rqs(struct rq *rq)
		}

		#else /* CONFIG_CFS_BANDWIDTH */

		static inline bool cfs_bandwidth_used(void)
		{
		return false;
		}

		static inline u64 cfs_rq_clock_task(struct cfs_rq *cfs_rq)
		{
		return rq_clock_task(rq_of(cfs_rq));
		@@ -5186,6 +5194,21 @@ enqueue_task_fair(struct rq rq, struct task_struct p, int flags)

		}

		if (cfs_bandwidth_used()) {
		/*
		* When bandwidth control is enabled; the cfs_rq_throttled()
		* breaks in the above iteration can result in incomplete
		* leaf list maintenance, resulting in triggering the assertion
		* below.
		*/
		for_each_sched_entity(se) {
		cfs_rq = cfs_rq_of(se);

		if (list_add_leaf_cfs_rq(cfs_rq))
		break;
		}
		}

		assert_list_leaf_cfs_rq(rq);

		hrtick_update(rq);

Admin message