From: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>
To: Nicholas Piggin <npiggin@gmail.com>, linuxppc-dev@lists.ozlabs.org
Cc: Nicholas Piggin <npiggin@gmail.com>
Subject: Re: [PATCH 2/2] powerpc/64s: __find_linux_pte synchronization vs pmdp_invalidate
Date: Fri, 07 Jun 2019 11:05:56 +0530 [thread overview]
Message-ID: <87wohyez43.fsf@linux.ibm.com> (raw)
In-Reply-To: <20190607035636.5446-2-npiggin@gmail.com>
Nicholas Piggin <npiggin@gmail.com> writes:
> The change to pmdp_invalidate to mark the pmd with _PAGE_INVALID broke
> the synchronisation against lock free lookups, __find_linux_pte's
> pmd_none check no longer returns true for such cases.
>
> Fix this by adding a check for this condition as well.
>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
> Fixes: da7ad366b497 ("powerpc/mm/book3s: Update pmd_present to look at _PAGE_PRESENT bit")
> Cc: Christophe Leroy <christophe.leroy@c-s.fr>
> Suggested-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
> ---
> arch/powerpc/mm/pgtable.c | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/arch/powerpc/mm/pgtable.c b/arch/powerpc/mm/pgtable.c
> index db4a6253df92..533fc6fa6726 100644
> --- a/arch/powerpc/mm/pgtable.c
> +++ b/arch/powerpc/mm/pgtable.c
> @@ -372,13 +372,25 @@ pte_t *__find_linux_pte(pgd_t *pgdir, unsigned long ea,
> pdshift = PMD_SHIFT;
> pmdp = pmd_offset(&pud, ea);
> pmd = READ_ONCE(*pmdp);
> +
> /*
> - * A hugepage collapse is captured by pmd_none, because
> - * it mark the pmd none and do a hpte invalidate.
> + * A hugepage collapse is captured by this condition, see
> + * pmdp_collapse_flush.
> */
> if (pmd_none(pmd))
> return NULL;
>
> +#ifdef CONFIG_PPC_BOOK3S_64
> + /*
> + * A hugepage split is captured by this condition, see
> + * pmdp_invalidate.
> + *
> + * Huge page modification can be caught here too.
> + */
> + if (pmd_is_serializing(pmd))
> + return NULL;
> +#endif
> +
> if (pmd_trans_huge(pmd) || pmd_devmap(pmd)) {
> if (is_thp)
> *is_thp = true;
> --
> 2.20.1
next prev parent reply other threads:[~2019-06-07 5:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-07 3:56 [PATCH 1/2] powerpc/64s: Fix THP PMD collapse serialisation Nicholas Piggin
2019-06-07 3:56 ` [PATCH 2/2] powerpc/64s: __find_linux_pte synchronization vs pmdp_invalidate Nicholas Piggin
2019-06-07 5:35 ` Christophe Leroy
2019-06-07 6:31 ` Nicholas Piggin
2019-06-07 5:35 ` Aneesh Kumar K.V [this message]
2019-06-12 4:59 ` Michael Ellerman
2019-06-07 5:34 ` [PATCH 1/2] powerpc/64s: Fix THP PMD collapse serialisation Christophe Leroy
2019-06-07 6:40 ` Nicholas Piggin
2019-06-07 5:35 ` Aneesh Kumar K.V
2019-06-12 4:59 ` Michael Ellerman
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=87wohyez43.fsf@linux.ibm.com \
--to=aneesh.kumar@linux.ibm.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=npiggin@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).