From: Michael Ellerman <mpe@ellerman.id.au>
To: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>,
npiggin@gmail.com, benh@kernel.crashing.org, paulus@samba.org,
akpm@linux-foundation.org, x86@kernel.org
Cc: linuxppc-dev@lists.ozlabs.org, linux-mm@kvack.org,
"Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>
Subject: Re: [PATCH V5 1/5] mm: Update ptep_modify_prot_start/commit to take vm_area_struct as arg
Date: Wed, 30 Jan 2019 21:33:57 +1100 [thread overview]
Message-ID: <87lg32qvsa.fsf@concordia.ellerman.id.au> (raw)
In-Reply-To: <20190116085035.29729-2-aneesh.kumar@linux.ibm.com>
"Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com> writes:
> Some architecture may want to call flush_tlb_range from these helpers.
That's what we want to do, but wouldn't a better description be that
some architectures may need access to the vma for some reason, one of
which might be flushing the TLB.
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
> ---
> arch/s390/include/asm/pgtable.h | 4 ++--
> arch/s390/mm/pgtable.c | 6 ++++--
> arch/x86/include/asm/paravirt.h | 11 ++++++-----
> arch/x86/include/asm/paravirt_types.h | 5 +++--
> arch/x86/xen/mmu.h | 4 ++--
> arch/x86/xen/mmu_pv.c | 8 ++++----
> fs/proc/task_mmu.c | 4 ++--
> include/asm-generic/pgtable.h | 16 ++++++++--------
> mm/memory.c | 4 ++--
> mm/mprotect.c | 4 ++--
> 10 files changed, 35 insertions(+), 31 deletions(-)
>
> diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h
> index 063732414dfb..5d730199e37b 100644
> --- a/arch/s390/include/asm/pgtable.h
> +++ b/arch/s390/include/asm/pgtable.h
> @@ -1069,8 +1069,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 mm_struct *, unsigned long, pte_t *);
> -void ptep_modify_prot_commit(struct mm_struct *, unsigned long, pte_t *, pte_t);
> +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);
>
> #define __HAVE_ARCH_PTEP_CLEAR_FLUSH
> static inline pte_t ptep_clear_flush(struct vm_area_struct *vma,
> diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
> index f2cc7da473e4..29c0a21cd34a 100644
> --- a/arch/s390/mm/pgtable.c
> +++ b/arch/s390/mm/pgtable.c
> @@ -301,12 +301,13 @@ pte_t ptep_xchg_lazy(struct mm_struct *mm, unsigned long addr,
> }
> EXPORT_SYMBOL(ptep_xchg_lazy);
>
> -pte_t ptep_modify_prot_start(struct mm_struct *mm, unsigned long addr,
> +pte_t ptep_modify_prot_start(struct vm_area_struct *vma, unsigned long addr,
> pte_t *ptep)
> {
> pgste_t pgste;
> pte_t old;
> int nodat;
> + struct mm_struct *mm = vma->vm_mm;
If this was my code I'd want the mm as the first variable, to preserve
the Reverse Christmas tree format.
> preempt_disable();
> pgste = ptep_xchg_start(mm, addr, ptep);
> @@ -320,10 +321,11 @@ pte_t ptep_modify_prot_start(struct mm_struct *mm, unsigned long addr,
> }
> EXPORT_SYMBOL(ptep_modify_prot_start);
>
> -void ptep_modify_prot_commit(struct mm_struct *mm, unsigned long addr,
> +void ptep_modify_prot_commit(struct vm_area_struct *vma, unsigned long addr,
> pte_t *ptep, pte_t pte)
> {
> pgste_t pgste;
> + struct mm_struct *mm = vma->vm_mm;
Ditto.
> if (!MACHINE_HAS_NX)
> pte_val(pte) &= ~_PAGE_NOEXEC;
> diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
> index a97f28d914d5..c5a7f18cce7e 100644
> --- a/arch/x86/include/asm/paravirt.h
> +++ b/arch/x86/include/asm/paravirt.h
> @@ -422,25 +422,26 @@ static inline pgdval_t pgd_val(pgd_t pgd)
> }
>
> #define __HAVE_ARCH_PTEP_MODIFY_PROT_TRANSACTION
> -static inline pte_t ptep_modify_prot_start(struct mm_struct *mm, unsigned long addr,
> +static inline pte_t ptep_modify_prot_start(struct vm_area_struct *vma, unsigned long addr,
> pte_t *ptep)
> {
> pteval_t ret;
>
> - ret = PVOP_CALL3(pteval_t, mmu.ptep_modify_prot_start, mm, addr, ptep);
> + ret = PVOP_CALL3(pteval_t, mmu.ptep_modify_prot_start, vma, addr, ptep);
>
> return (pte_t) { .pte = ret };
> }
>
> -static inline void ptep_modify_prot_commit(struct mm_struct *mm, unsigned long addr,
> +static inline void ptep_modify_prot_commit(struct vm_area_struct *vma, unsigned long addr,
> pte_t *ptep, pte_t pte)
> {
> +
Unnecessary blank line here.
> if (sizeof(pteval_t) > sizeof(long))
> /* 5 arg words */
> - pv_ops.mmu.ptep_modify_prot_commit(mm, addr, ptep, pte);
> + pv_ops.mmu.ptep_modify_prot_commit(vma, addr, ptep, pte);
> else
> PVOP_VCALL4(mmu.ptep_modify_prot_commit,
> - mm, addr, ptep, pte.pte);
> + vma, addr, ptep, pte.pte);
> }
>
> static inline void set_pte(pte_t *ptep, pte_t pte)
The rest looks good.
cheers
next prev parent reply other threads:[~2019-01-30 10:34 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-16 8:50 [PATCH V5 0/5] NestMMU pte upgrade workaround for mprotect Aneesh Kumar K.V
2019-01-16 8:50 ` [PATCH V5 1/5] mm: Update ptep_modify_prot_start/commit to take vm_area_struct as arg Aneesh Kumar K.V
2019-01-30 10:33 ` Michael Ellerman [this message]
2019-01-16 8:50 ` [PATCH V5 2/5] mm: update ptep_modify_prot_commit to take old pte value " Aneesh Kumar K.V
2019-01-30 10:46 ` Michael Ellerman
2019-01-31 5:03 ` Aneesh Kumar K.V
2019-01-16 8:50 ` [PATCH V5 3/5] arch/powerpc/mm: Nest MMU workaround for mprotect RW upgrade Aneesh Kumar K.V
2019-01-30 10:52 ` Michael Ellerman
2019-01-31 5:07 ` Aneesh Kumar K.V
2019-01-16 8:50 ` [PATCH V5 4/5] mm/hugetlb: Add prot_modify_start/commit sequence for hugetlb update Aneesh Kumar K.V
2019-01-30 10:54 ` Michael Ellerman
2019-01-16 8:50 ` [PATCH V5 5/5] arch/powerpc/mm/hugetlb: NestMMU workaround for hugetlb mprotect RW upgrade Aneesh Kumar K.V
2019-01-30 11:01 ` Michael Ellerman
2019-01-29 10:43 ` [PATCH V5 0/5] NestMMU pte upgrade workaround for mprotect Aneesh Kumar K.V
2019-01-29 18:29 ` Andrew Morton
2019-02-26 23:37 ` Andrew Morton
2019-02-27 8:58 ` Aneesh Kumar K.V
2019-02-28 19:39 ` Andrew Morton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87lg32qvsa.fsf@concordia.ellerman.id.au \
--to=mpe@ellerman.id.au \
--cc=akpm@linux-foundation.org \
--cc=aneesh.kumar@linux.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=linux-mm@kvack.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=npiggin@gmail.com \
--cc=paulus@samba.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox