From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934812AbbGHNVv (ORCPT ); Wed, 8 Jul 2015 09:21:51 -0400 Received: from e23smtp03.au.ibm.com ([202.81.31.145]:56588 "EHLO e23smtp03.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934777AbbGHNVo (ORCPT ); Wed, 8 Jul 2015 09:21:44 -0400 X-Helo: d23dlp02.au.ibm.com X-MailFrom: srikar@linux.vnet.ibm.com X-RcptTo: linux-kernel@vger.kernel.org From: Srikar Dronamraju To: Ingo Molnar , Peter Zijlstra Cc: linux-kernel@vger.kernel.org, srikar@linux.vnet.ibm.com, Rik van Riel , Mel Gorman Subject: [PATCH] sched/numa: Restore sched feature NUMA to its earlier avatar. Date: Wed, 8 Jul 2015 18:50:33 +0530 Message-Id: <1436361633-4970-1-git-send-email-srikar@linux.vnet.ibm.com> X-Mailer: git-send-email 2.1.4 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15070813-0009-0000-0000-000001A789B5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In commit:8a9e62a "sched/numa: Prefer NUMA hotness over cache hotness" sched feature NUMA was always set to true. However this sched feature was suppose to be enabled on NUMA boxes only thro set_numabalancing_state(). To get back to the above behaviour, bring back NUMA_FAVOUR_HIGHER feature. Signed-off-by: Srikar Dronamraju diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 587a2f6..aea72d5 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -5676,10 +5676,10 @@ static int migrate_degrades_locality(struct task_struct *p, struct lb_env *env) unsigned long src_faults, dst_faults; int src_nid, dst_nid; - if (!p->numa_faults || !(env->sd->flags & SD_NUMA)) + if (!sched_feat(NUMA) || !sched_feat(NUMA_FAVOUR_HIGHER)) return -1; - if (!sched_feat(NUMA)) + if (!p->numa_faults || !(env->sd->flags & SD_NUMA)) return -1; src_nid = cpu_to_node(env->src_cpu); diff --git a/kernel/sched/features.h b/kernel/sched/features.h index 83a50e7..d4d4726 100644 --- a/kernel/sched/features.h +++ b/kernel/sched/features.h @@ -79,12 +79,13 @@ SCHED_FEAT(LB_MIN, false) * numa_balancing= */ #ifdef CONFIG_NUMA_BALANCING +SCHED_FEAT(NUMA, false) /* - * NUMA will favor moving tasks towards nodes where a higher number of - * hinting faults are recorded during active load balancing. It will - * resist moving tasks towards nodes where a lower number of hinting - * faults have been recorded. + * NUMA_FAVOUR_HIGHER will favor moving tasks towards nodes where a + * higher number of hinting faults are recorded during active load + * balancing. It will resist moving tasks towards nodes where a lower + * number of hinting faults have been recorded. */ -SCHED_FEAT(NUMA, true) +SCHED_FEAT(NUMA_FAVOUR_HIGHER, true) #endif