Commit b52da86e authored Oct 02, 2015 by Srikar Dronamraju Committed by Ingo Molnar Oct 06, 2015

sched/numa: Fix task_tick_fair() from disabling numa_balancing



If static branch 'sched_numa_balancing' is enabled, it should kickstart
NUMA balancing through task_tick_numa(). However the following commit:

  2a595721 ("sched/numa: Convert sched_numa_balancing to a static_branch")

erroneously disables this.

Fix this anomaly by enabling task_tick_numa() when the static branch
'sched_numa_balancing' is enabled.

Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Link: http://lkml.kernel.org/r/1443752305-27413-1-git-send-email-srikar@linux.vnet.ibm.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent e2bf1c4b

kernel/sched/fair.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -7881,7 +7881,7 @@ static void task_tick_fair(struct rq rq, struct task_struct curr, int queued)
		entity_tick(cfs_rq, se, queued);
		}

		if (!static_branch_unlikely(&sched_numa_balancing))
		if (static_branch_unlikely(&sched_numa_balancing))
		task_tick_numa(rq, curr);
		}

Admin message