From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753303AbcAGR6X (ORCPT ); Thu, 7 Jan 2016 12:58:23 -0500 Received: from outbound-smtp12.blacknight.com ([46.22.139.17]:60549 "EHLO outbound-smtp12.blacknight.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752020AbcAGR5j (ORCPT ); Thu, 7 Jan 2016 12:57:39 -0500 From: Mel Gorman To: Linux-Stable Cc: Srikar Dronamraju , Peter Zijlstra , Ingo Molnar , LKML , Mel Gorman Subject: [PATCH 5/5] sched/numa: Fix task_tick_fair() from disabling numa_balancing Date: Thu, 7 Jan 2016 17:57:36 +0000 Message-Id: <1452189456-8486-6-git-send-email-mgorman@techsingularity.net> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1452189456-8486-1-git-send-email-mgorman@techsingularity.net> References: <1452189456-8486-1-git-send-email-mgorman@techsingularity.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Srikar Dronamraju commit b52da86e0ad58f096710977fcda856fd84da9233 upstream. If static branch 'sched_numa_balancing' is enabled, it should kickstart NUMA balancing through task_tick_numa(). However the following commit: 2a595721a1fa ("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 Signed-off-by: Peter Zijlstra (Intel) Cc: Linus Torvalds Cc: Mel Gorman Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Rik van Riel Cc: Thomas Gleixner 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 Signed-off-by: Mel Gorman --- kernel/sched/fair.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 7975932034f9..98b6eacf09aa 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -7811,7 +7811,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); } -- 2.6.4