diff mbox

Trusty SRU: mm/numa: Remove BUG_ON() in __handle_mm_fault()

Message ID 5396FFBA.1040100@canonical.com
State New
Headers show

Commit Message

Tim Gardner June 10, 2014, 12:53 p.m. UTC

Comments

Brad Figg June 10, 2014, 1:11 p.m. UTC | #1 
On 06/10/2014 05:53 AM, Tim Gardner wrote:
> 
> 
>
Tim Gardner June 10, 2014, 1:43 p.m. UTC | #2
diff mbox

Patch

From cee864a005fc2cf1b422d3670720ebe5a193050d Mon Sep 17 00:00:00 2001
From: Rik van Riel <riel@redhat.com>
Date: Tue, 29 Apr 2014 15:36:15 -0400
Subject: [PATCH Trust SRU] mm/numa: Remove BUG_ON() in __handle_mm_fault()

BugLink: http://bugs.launchpad.net/bugs/1323165

Changing PTEs and PMDs to pte_numa & pmd_numa is done with the
mmap_sem held for reading, which means a pmd can be instantiated
and turned into a numa one while __handle_mm_fault() is examining
the value of old_pmd.

If that happens, __handle_mm_fault() should just return and let
the page fault retry, instead of throwing an oops. This is
handled by the test for pmd_trans_huge(*pmd) below.

Signed-off-by: Rik van Riel <riel@redhat.com>
Reviewed-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Reported-by: Sunil Pandey <sunil.k.pandey@intel.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: linux-mm@kvack.org
Cc: lwoodman@redhat.com
Cc: dave.hansen@intel.com
Link: http://lkml.kernel.org/r/20140429153615.2d72098e@annuminas.surriel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
(cherry picked from commit 107437febd495a50e2cd09c81bbaa84d30e57b07)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 mm/memory.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mm/memory.c b/mm/memory.c
index 6894ed8..638a69f 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -3752,9 +3752,6 @@  static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
 		}
 	}
 
-	/* THP should already have been handled */
-	BUG_ON(pmd_numa(*pmd));
-
 	/*
 	 * Use __pte_alloc instead of pte_alloc_map, because we can't
 	 * run pte_offset_map on the pmd, if an huge pmd could
-- 
2.0.0