Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 423ac9af authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Linus Torvalds
Browse files

mm/thp: remove pmd_huge_split_prepare() 

Instead of marking the pmd ready for split, invalidate the pmd.  This
should take care of powerpc requirement.  Only side effect is that we
mark the pmd invalid early.  This can result in us blocking access to
the page a bit longer if we race against a thp split.

[kirill.shutemov@linux.intel.com: rebased, dirty THP once]
Link: http://lkml.kernel.org/r/20171213105756.69879-13-kirill.shutemov@linux.intel.com


Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: David Daney <david.daney@cavium.com>
Cc: David Miller <davem@davemloft.net>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Nitin Gupta <nitin.m.gupta@oracle.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a3cf988f

arch/powerpc/include/asm/book3s/64/hash-4k.h

+0 −2
Original line number Diff line number Diff line
@@ -101,8 +101,6 @@ extern pmd_t hash__pmdp_collapse_flush(struct vm_area_struct *vma, 
extern void hash__pgtable_trans_huge_deposit(struct mm_struct *mm, pmd_t *pmdp,

					 pgtable_t pgtable);

extern pgtable_t hash__pgtable_trans_huge_withdraw(struct mm_struct *mm, pmd_t *pmdp);

extern void hash__pmdp_huge_split_prepare(struct vm_area_struct *vma,

				      unsigned long address, pmd_t *pmdp);

extern pmd_t hash__pmdp_huge_get_and_clear(struct mm_struct *mm,

				       unsigned long addr, pmd_t *pmdp);

extern int hash__has_transparent_hugepage(void);

arch/powerpc/include/asm/book3s/64/hash-64k.h

+0 −2
Original line number Diff line number Diff line
@@ -203,8 +203,6 @@ extern pmd_t hash__pmdp_collapse_flush(struct vm_area_struct *vma, 
extern void hash__pgtable_trans_huge_deposit(struct mm_struct *mm, pmd_t *pmdp,

					 pgtable_t pgtable);

extern pgtable_t hash__pgtable_trans_huge_withdraw(struct mm_struct *mm, pmd_t *pmdp);

extern void hash__pmdp_huge_split_prepare(struct vm_area_struct *vma,

				      unsigned long address, pmd_t *pmdp);

extern pmd_t hash__pmdp_huge_get_and_clear(struct mm_struct *mm,

				       unsigned long addr, pmd_t *pmdp);

extern int hash__has_transparent_hugepage(void);

arch/powerpc/include/asm/book3s/64/pgtable.h

+0 −9
Original line number Diff line number Diff line
@@ -1140,15 +1140,6 @@ static inline pgtable_t pgtable_trans_huge_withdraw(struct mm_struct *mm, 
extern pmd_t pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,

			     pmd_t *pmdp);



#define __HAVE_ARCH_PMDP_HUGE_SPLIT_PREPARE

static inline void pmdp_huge_split_prepare(struct vm_area_struct *vma,

					   unsigned long address, pmd_t *pmdp)

{

	if (radix_enabled())

		return radix__pmdp_huge_split_prepare(vma, address, pmdp);

	return hash__pmdp_huge_split_prepare(vma, address, pmdp);

}



#define pmd_move_must_withdraw pmd_move_must_withdraw

struct spinlock;

static inline int pmd_move_must_withdraw(struct spinlock *new_pmd_ptl,

arch/powerpc/include/asm/book3s/64/radix.h

+0 −6
Original line number Diff line number Diff line
@@ -269,12 +269,6 @@ static inline pmd_t radix__pmd_mkhuge(pmd_t pmd) 
		return __pmd(pmd_val(pmd) | _PAGE_PTE | R_PAGE_LARGE);

	return __pmd(pmd_val(pmd) | _PAGE_PTE);

}

static inline void radix__pmdp_huge_split_prepare(struct vm_area_struct *vma,

					    unsigned long address, pmd_t *pmdp)

{

	/* Nothing to do for radix. */

	return;

}



extern unsigned long radix__pmd_hugepage_update(struct mm_struct *mm, unsigned long addr,

					  pmd_t *pmdp, unsigned long clr,

arch/powerpc/mm/pgtable-hash64.c

+0 −22
Original line number Diff line number Diff line
@@ -296,28 +296,6 @@ pgtable_t hash__pgtable_trans_huge_withdraw(struct mm_struct *mm, pmd_t *pmdp) 
	return pgtable;

}



void hash__pmdp_huge_split_prepare(struct vm_area_struct *vma,

			       unsigned long address, pmd_t *pmdp)

{

	VM_BUG_ON(address & ~HPAGE_PMD_MASK);

	VM_BUG_ON(REGION_ID(address) != USER_REGION_ID);

	VM_BUG_ON(pmd_devmap(*pmdp));



	/*

	 * We can't mark the pmd none here, because that will cause a race

	 * against exit_mmap. We need to continue mark pmd TRANS HUGE, while

	 * we spilt, but at the same time we wan't rest of the ppc64 code

	 * not to insert hash pte on this, because we will be modifying

	 * the deposited pgtable in the caller of this function. Hence

	 * clear the _PAGE_USER so that we move the fault handling to

	 * higher level function and that will serialize against ptl.

	 * We need to flush existing hash pte entries here even though,

	 * the translation is still valid, because we will withdraw

	 * pgtable_t after this.

	 */

	pmd_hugepage_update(vma->vm_mm, address, pmdp, 0, _PAGE_PRIVILEGED);

}



/*

 * A linux hugepage PMD was changed and the corresponding hash table entries

 * neesd to be flushed.