3.15-stable review patch. If anyone has any objections, please let me know.
------------------ From: Rik van Riel <r...@redhat.com> commit 107437febd495a50e2cd09c81bbaa84d30e57b07 upstream. 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 <r...@redhat.com> Reviewed-by: Naoya Horiguchi <n-horigu...@ah.jp.nec.com> Reported-by: Sunil Pandey <sunil.k.pan...@intel.com> Signed-off-by: Peter Zijlstra <pet...@infradead.org> Cc: Andrew Morton <a...@linux-foundation.org> Cc: Johannes Weiner <han...@cmpxchg.org> Cc: Kirill A. Shutemov <kirill.shute...@linux.intel.com> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Mel Gorman <mgor...@suse.de> Cc: linux...@kvack.org Cc: lwood...@redhat.com Cc: dave.han...@intel.com Link: http://lkml.kernel.org/r/20140429153615.2d720...@annuminas.surriel.com Signed-off-by: Ingo Molnar <mi...@kernel.org> Patrick McLean <chutz...@gentoo.org> Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> --- mm/memory.c | 3 --- 1 file changed, 3 deletions(-) --- a/mm/memory.c +++ b/mm/memory.c @@ -3920,9 +3920,6 @@ static int __handle_mm_fault(struct mm_s } } - /* 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
