Commit a6bf2bb0 authored Jun 05, 2013 by Aneesh Kumar K.V Committed by Benjamin Herrenschmidt Jun 20, 2013

mm/THP: withdraw the pgtable after pmdp related operations

For architectures like ppc64 we look at deposited pgtable when calling
pmdp_get_and_clear.  So do the pgtable_trans_huge_withdraw after finishing
pmdp related operations.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Reviewed-by: Andrea Arcangeli <aarcange@redhat.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

parent 6b0b50b0

mm/huge_memory.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -1360,9 +1360,15 @@ int zap_huge_pmd(struct mmu_gather tlb, struct vm_area_struct vma,
		struct page *page;
		pgtable_t pgtable;
		pmd_t orig_pmd;
		pgtable = pgtable_trans_huge_withdraw(tlb->mm, pmd);
		/*
		* For architectures like ppc64 we look at deposited pgtable
		* when calling pmdp_get_and_clear. So do the
		* pgtable_trans_huge_withdraw after finishing pmdp related
		* operations.
		*/
		orig_pmd = pmdp_get_and_clear(tlb->mm, addr, pmd);
		tlb_remove_pmd_tlb_entry(tlb, pmd, addr);
		pgtable = pgtable_trans_huge_withdraw(tlb->mm, pmd);
		if (is_huge_zero_pmd(orig_pmd)) {
		tlb->mm->nr_ptes--;
		spin_unlock(&tlb->mm->page_table_lock);

Admin message