[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-1dd49bfa3465756b3ce72214b58a33e4afb67aa3@git.kernel.org>
Date: Tue, 29 Oct 2013 03:42:23 -0700
From: tip-bot for Mel Gorman <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
peterz@...radead.org, hannes@...xchg.org, riel@...hat.com,
stable@...nel.org, aarcange@...hat.com, srikar@...ux.vnet.ibm.com,
mgorman@...e.de, tglx@...utronix.de
Subject: [tip:core/urgent] mm: numa:
Do not account for a hinting fault if we raced
Commit-ID: 1dd49bfa3465756b3ce72214b58a33e4afb67aa3
Gitweb: http://git.kernel.org/tip/1dd49bfa3465756b3ce72214b58a33e4afb67aa3
Author: Mel Gorman <mgorman@...e.de>
AuthorDate: Mon, 7 Oct 2013 11:28:42 +0100
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Tue, 29 Oct 2013 11:37:05 +0100
mm: numa: Do not account for a hinting fault if we raced
If another task handled a hinting fault in parallel then do not double
account for it.
Signed-off-by: Mel Gorman <mgorman@...e.de>
Reviewed-by: Rik van Riel <riel@...hat.com>
Cc: Andrea Arcangeli <aarcange@...hat.com>
Cc: Johannes Weiner <hannes@...xchg.org>
Cc: Srikar Dronamraju <srikar@...ux.vnet.ibm.com>
Cc: <stable@...nel.org>
Signed-off-by: Peter Zijlstra <peterz@...radead.org>
Link: http://lkml.kernel.org/r/1381141781-10992-5-git-send-email-mgorman@suse.de
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
mm/huge_memory.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 610e3df..33ee637 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1325,8 +1325,11 @@ int do_huge_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
check_same:
spin_lock(&mm->page_table_lock);
- if (unlikely(!pmd_same(pmd, *pmdp)))
+ if (unlikely(!pmd_same(pmd, *pmdp))) {
+ /* Someone else took our fault */
+ current_nid = -1;
goto out_unlock;
+ }
clear_pmdnuma:
pmd = pmd_mknonnuma(pmd);
set_pmd_at(mm, haddr, pmdp, pmd);
--
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