This is a note to let you know that I've just added the patch titled mm: clear pmd_numa before invalidating to the 3.12-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: mm-clear-pmd_numa-before-invalidating.patch and it can be found in the queue-3.12 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From mgorman@xxxxxxx Tue Jan 7 09:46:03 2014 From: Mel Gorman <mgorman@xxxxxxx> Date: Tue, 7 Jan 2014 14:00:38 +0000 Subject: mm: clear pmd_numa before invalidating To: gregkh@xxxxxxxxxxxxxxxxxxx Cc: athorlton@xxxxxxx, riel@xxxxxxxxxx, chegu_vinod@xxxxxx, Mel Gorman <mgorman@xxxxxxx>, stable@xxxxxxxxxxxxxxx Message-ID: <1389103248-17617-4-git-send-email-mgorman@xxxxxxx> From: Mel Gorman <mgorman@xxxxxxx> commit 67f87463d3a3362424efcbe8b40e4772fd34fc61 upstream. On x86, PMD entries are similar to _PAGE_PROTNONE protection and are handled as NUMA hinting faults. The following two page table protection bits are what defines them _PAGE_NUMA:set _PAGE_PRESENT:clear A PMD is considered present if any of the _PAGE_PRESENT, _PAGE_PROTNONE, _PAGE_PSE or _PAGE_NUMA bits are set. If pmdp_invalidate encounters a pmd_numa, it clears the present bit leaving _PAGE_NUMA which will be considered not present by the CPU but present by pmd_present. The existing caller of pmdp_invalidate should handle it but it's an inconsistent state for a PMD. This patch keeps the state consistent when calling pmdp_invalidate. Signed-off-by: Mel Gorman <mgorman@xxxxxxx> Reviewed-by: Rik van Riel <riel@xxxxxxxxxx> Cc: Alex Thorlton <athorlton@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- mm/pgtable-generic.c | 3 +++ 1 file changed, 3 insertions(+) --- a/mm/pgtable-generic.c +++ b/mm/pgtable-generic.c @@ -191,6 +191,9 @@ pgtable_t pgtable_trans_huge_withdraw(st void pmdp_invalidate(struct vm_area_struct *vma, unsigned long address, pmd_t *pmdp) { + pmd_t entry = *pmdp; + if (pmd_numa(entry)) + entry = pmd_mknonnuma(entry); set_pmd_at(vma->vm_mm, address, pmdp, pmd_mknotpresent(*pmdp)); flush_tlb_range(vma, address, address + HPAGE_PMD_SIZE); } Patches currently in stable-queue which might be from mgorman@xxxxxxx are queue-3.12/sched-numa-skip-inaccessible-vmas.patch queue-3.12/mm-compaction-respect-ignore_skip_hint-in-update_pageblock_skip.patch queue-3.12/mm-clear-pmd_numa-before-invalidating.patch queue-3.12/mm-fix-tlb-flush-race-between-migration-and-change_protection_range.patch queue-3.12/mm-numa-ensure-anon_vma-is-locked-to-prevent-parallel-thp-splits.patch queue-3.12/mm-hugetlb-check-for-pte-null-pointer-in-__page_check_address.patch queue-3.12/mm-numa-serialise-parallel-get_user_page-against-thp-migration.patch queue-3.12/mm-munlock-fix-deadlock-in-__munlock_pagevec.patch queue-3.12/mm-numa-guarantee-that-tlb_flush_pending-updates-are-visible-before-page-table-updates.patch queue-3.12/mm-numa-avoid-unnecessary-work-on-the-failure-path.patch queue-3.12/mm-page_alloc-revert-numa-aspect-of-fair-allocation-policy.patch queue-3.12/mm-mempolicy-correct-putback-method-for-isolate-pages-if-failed.patch queue-3.12/mm-numa-call-mmu-notifiers-on-thp-migration.patch queue-3.12/mm-munlock-fix-a-bug-where-thp-tail-page-is-encountered.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html