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

mm: update ptep_modify_prot_commit to take old pte value as arg 

Architectures like ppc64 require to do a conditional tlb flush based on
the old and new value of pte.  Enable that by passing old pte value as
the arg.

Link: http://lkml.kernel.org/r/20190116085035.29729-3-aneesh.kumar@linux.ibm.com


Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0cbe3e26

arch/s390/include/asm/pgtable.h

+2 −1
Original line number Diff line number Diff line
@@ -1070,7 +1070,8 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, 


#define __HAVE_ARCH_PTEP_MODIFY_PROT_TRANSACTION

pte_t ptep_modify_prot_start(struct vm_area_struct *, unsigned long, pte_t *);

void ptep_modify_prot_commit(struct vm_area_struct *, unsigned long, pte_t *, pte_t);

void ptep_modify_prot_commit(struct vm_area_struct *, unsigned long,

			     pte_t *, pte_t, pte_t);



#define __HAVE_ARCH_PTEP_CLEAR_FLUSH

static inline pte_t ptep_clear_flush(struct vm_area_struct *vma,

arch/s390/mm/pgtable.c

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ pte_t ptep_modify_prot_start(struct vm_area_struct *vma, unsigned long addr, 
}



void ptep_modify_prot_commit(struct vm_area_struct *vma, unsigned long addr,

			     pte_t *ptep, pte_t pte)

			     pte_t *ptep, pte_t old_pte, pte_t pte)

{

	pgste_t pgste;

	struct mm_struct *mm = vma->vm_mm;

arch/x86/include/asm/paravirt.h

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ static inline pte_t ptep_modify_prot_start(struct vm_area_struct *vma, unsigned 
}



static inline void ptep_modify_prot_commit(struct vm_area_struct *vma, unsigned long addr,

					   pte_t *ptep, pte_t pte)

					   pte_t *ptep, pte_t old_pte, pte_t pte)

{



	if (sizeof(pteval_t) > sizeof(long))

fs/proc/task_mmu.c

+5 −3
Original line number Diff line number Diff line
@@ -948,10 +948,12 @@ static inline void clear_soft_dirty(struct vm_area_struct *vma, 
	pte_t ptent = *pte;



	if (pte_present(ptent)) {

		ptent = ptep_modify_prot_start(vma, addr, pte);

		ptent = pte_wrprotect(ptent);

		pte_t old_pte;



		old_pte = ptep_modify_prot_start(vma, addr, pte);

		ptent = pte_wrprotect(old_pte);

		ptent = pte_clear_soft_dirty(ptent);

		ptep_modify_prot_commit(vma, addr, pte, ptent);

		ptep_modify_prot_commit(vma, addr, pte, old_pte, ptent);

	} else if (is_swap_pte(ptent)) {

		ptent = pte_swp_clear_soft_dirty(ptent);

		set_pte_at(vma->vm_mm, addr, pte, ptent);

include/asm-generic/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -657,7 +657,7 @@ static inline pte_t ptep_modify_prot_start(struct vm_area_struct *vma, 
 */

static inline void ptep_modify_prot_commit(struct vm_area_struct *vma,

					   unsigned long addr,

					   pte_t *ptep, pte_t pte)

					   pte_t *ptep, pte_t old_pte, pte_t pte)

{

	__ptep_modify_prot_commit(vma, addr, ptep, pte);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE