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

Commit a8e654f0 authored by Nitin Gupta's avatar Nitin Gupta Committed by Linus Torvalds
Browse files

sparc64: update pmdp_invalidate() to return old pmd value 

It's required to avoid losing dirty and accessed bits.

[akpm@linux-foundation.org: add a `do' to the do-while loop]
Link: http://lkml.kernel.org/r/20171213105756.69879-9-kirill.shutemov@linux.intel.com


Signed-off-by: default avatarNitin Gupta <nitin.m.gupta@oracle.com>
Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: David Miller <davem@davemloft.net>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Michal Hocko <mhocko@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9c4563f1

arch/sparc/include/asm/pgtable_64.h

+1 −1
Original line number Diff line number Diff line
@@ -1010,7 +1010,7 @@ void update_mmu_cache_pmd(struct vm_area_struct *vma, unsigned long addr, 
			  pmd_t *pmd);



#define __HAVE_ARCH_PMDP_INVALIDATE

extern void pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,

extern pmd_t pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,

			    pmd_t *pmdp);



#define __HAVE_ARCH_PGTABLE_DEPOSIT

arch/sparc/mm/tlb.c

+18 −5
Original line number Diff line number Diff line
@@ -219,17 +219,28 @@ void set_pmd_at(struct mm_struct *mm, unsigned long addr, 
	}

}



static inline pmd_t pmdp_establish(struct vm_area_struct *vma,

		unsigned long address, pmd_t *pmdp, pmd_t pmd)

{

	pmd_t old;



	do {

		old = *pmdp;

	} while (cmpxchg64(&pmdp->pmd, old.pmd, pmd.pmd) != old.pmd);



	return old;

}



/*

 * This routine is only called when splitting a THP

 */

void pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,

pmd_t pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,

		     pmd_t *pmdp)

{

	pmd_t entry = *pmdp;



	pmd_val(entry) &= ~_PAGE_VALID;

	pmd_t old, entry;



	set_pmd_at(vma->vm_mm, address, pmdp, entry);

	entry = __pmd(pmd_val(*pmdp) & ~_PAGE_VALID);

	old = pmdp_establish(vma, address, pmdp, entry);

	flush_tlb_range(vma, address, address + HPAGE_PMD_SIZE);



	/*
@@ -240,6 +251,8 @@ void pmdp_invalidate(struct vm_area_struct *vma, unsigned long address, 
	if ((pmd_val(entry) & _PAGE_PMD_HUGE) &&

	    !is_huge_zero_page(pmd_page(entry)))

		(vma->vm_mm)->context.thp_pte_count--;



	return old;

}



void pgtable_trans_huge_deposit(struct mm_struct *mm, pmd_t *pmdp,