[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1354839566-15697-6-git-send-email-mingo@kernel.org>
Date: Fri, 7 Dec 2012 01:19:22 +0100
From: Ingo Molnar <mingo@...nel.org>
To: linux-kernel@...r.kernel.org, linux-mm@...ck.org
Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl>,
Paul Turner <pjt@...gle.com>,
Lee Schermerhorn <Lee.Schermerhorn@...com>,
Christoph Lameter <cl@...ux.com>,
Rik van Riel <riel@...hat.com>, Mel Gorman <mgorman@...e.de>,
Andrew Morton <akpm@...ux-foundation.org>,
Andrea Arcangeli <aarcange@...hat.com>,
Linus Torvalds <torvalds@...ux-foundation.org>,
Thomas Gleixner <tglx@...utronix.de>,
Johannes Weiner <hannes@...xchg.org>,
Hugh Dickins <hughd@...gle.com>
Subject: [PATCH 5/9] numa, mm, sched: Fix NUMA affinity tracking logic
Support for the p->numa_policy affinity tracking by the scheduler
went missing during the mm/ unification: revive and integrate it
properly.
( This in particular fixes NUMA_POLICY_MANYBUDDIES, which
bug caused a few regressions in various workloads such as
numa01 and regressed !THP workloads in particular. )
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Andrew Morton <akpm@...ux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Cc: Andrea Arcangeli <aarcange@...hat.com>
Cc: Rik van Riel <riel@...hat.com>
Cc: Mel Gorman <mgorman@...e.de>
Cc: Hugh Dickins <hughd@...gle.com>
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
mm/mempolicy.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 2f2095c..6bb9fd0 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -121,8 +121,10 @@ static struct mempolicy default_policy_local = {
static struct mempolicy *default_policy(void)
{
#ifdef CONFIG_NUMA_BALANCING
- if (task_numa_shared(current) == 1)
- return ¤t->numa_policy;
+ struct mempolicy *pol = ¤t->numa_policy;
+
+ if (task_numa_shared(current) == 1 && nodes_weight(pol->v.nodes) >= 2)
+ return pol;
#endif
return &default_policy_local;
}
@@ -135,6 +137,11 @@ static struct mempolicy *get_task_policy(struct task_struct *p)
int node;
if (!pol) {
+#ifdef CONFIG_NUMA_BALANCING
+ pol = default_policy();
+ if (pol != &default_policy_local)
+ return pol;
+#endif
node = numa_node_id();
if (node != -1)
pol = &preferred_node_policy[node];
@@ -2367,7 +2374,8 @@ int mpol_misplaced(struct page *page, struct vm_area_struct *vma, unsigned long
shift = PAGE_SHIFT;
target_node = interleave_nid(pol, vma, addr, shift);
- break;
+
+ goto out_keep_page;
}
case MPOL_PREFERRED:
--
1.7.11.7
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists