Re: [PATCH V3] powerpc/mm: Fix Multi hit ERAT cause by recent THP update

[Balbir Singh]

On Tue, 2016-02-09 at 06:50 +0530, Aneesh Kumar K.V wrote:
>Â
> Also make sure we wait for irq disable section in other cpus to finish
> before flipping a huge pte entry with a regular pmd entry. Code paths
> like find_linux_pte_or_hugepte depend on irq disable to get
> a stable pte_t pointer. A parallel thp split need to make sure we
> don't convert a pmd pte to a regular pmd entry without waiting for the
> irq disable section to finish.
> 
> Acked-by: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx>
> ---
> Âarch/powerpc/include/asm/book3s/64/pgtable.h |ÂÂ4 ++++
> Âarch/powerpc/mm/pgtable_64.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ| 35
> +++++++++++++++++++++++++++-
> Âinclude/asm-generic/pgtable.hÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ|ÂÂ8 +++++++
> Âmm/huge_memory.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ|ÂÂ1 +
> Â4 files changed, 47 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h
> b/arch/powerpc/include/asm/book3s/64/pgtable.h
> index 8d1c41d28318..ac07a30a7934 100644
> --- a/arch/powerpc/include/asm/book3s/64/pgtable.h
> +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h
> @@ -281,6 +281,10 @@ extern pgtable_t pgtable_trans_huge_withdraw(struct
> mm_struct *mm, pmd_t *pmdp);
> Âextern void pmdp_invalidate(struct vm_area_struct *vma, unsigned long
> address,
> Â			ÂÂÂÂpmd_t *pmdp);
> Â
> +#define __HAVE_ARCH_PMDP_HUGE_SPLIT_PREPARE
> +extern void pmdp_huge_split_prepare(struct vm_area_struct *vma,
> +				ÂÂÂÂunsigned long address, pmd_t *pmdp);
> +
> Â#define pmd_move_must_withdraw pmd_move_must_withdraw
> Âstruct spinlock;
> Âstatic inline int pmd_move_must_withdraw(struct spinlock *new_pmd_ptl,
> diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c
> index 3124a20d0fab..c8a00da39969 100644
> --- a/arch/powerpc/mm/pgtable_64.c
> +++ b/arch/powerpc/mm/pgtable_64.c
> @@ -646,6 +646,30 @@ pgtable_t pgtable_trans_huge_withdraw(struct mm_struct
> *mm, pmd_t *pmdp)
> Â	return pgtable;
> Â}
> Â
> +void pmdp_huge_split_prepare(struct vm_area_struct *vma,
> +			ÂÂÂÂÂunsigned long address, pmd_t *pmdp)
> +{
> +	VM_BUG_ON(address & ~HPAGE_PMD_MASK);
> +
> +#ifdef CONFIG_DEBUG_VM
> +	BUG_ON(REGION_ID(address) != USER_REGION_ID);
> +#endif
> +	/*
> +	Â* 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, _PAGE_USER, 0);

Can this break any checks for _PAGE_USER? From other paths?

> +}
> +
> +
> Â/*
> Â * set a new huge pmd. We should not be called for updating
> Â * an existing pmd entry. That should go via pmd_hugepage_update.
> @@ -663,10 +687,19 @@ void set_pmd_at(struct mm_struct *mm, unsigned long
> addr,
> Â	return set_pte_at(mm, addr, pmdp_ptep(pmdp), pmd_pte(pmd));
> Â}
> Â
> +/*
> + * We use this to invalidate a pmdp entry before switching from a
> + * hugepte to regular pmd entry.
> + */
> Âvoid pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,
> Â		ÂÂÂÂÂpmd_t *pmdp)
> Â{
> -	pmd_hugepage_update(vma->vm_mm, address, pmdp, _PAGE_PRESENT, 0);
> +	pmd_hugepage_update(vma->vm_mm, address, pmdp, ~0UL, 0);
> +	/*
> +	Â* This ensures that generic code that rely on IRQ disabling
> +	Â* to prevent a parallel THP split work as expected.
> +	Â*/
> +	kick_all_cpus_sync();

Seems expensive, anyway I think the right should do something like or a wrapper
for it

on_each_cpu_mask(mm_cpumask(vma->vm_mm), do_nothing, NULL, 1);

do_nothing is not exported, but that can be fixed :)

Balbir Singh