From: Nicholas Piggin <npiggin@gmail.com>
To: Christophe Leroy <christophe.leroy@c-s.fr>,
linuxppc-dev@lists.ozlabs.org
Cc: "Aneesh Kumar K . V" <aneesh.kumar@linux.ibm.com>
Subject: Re: [PATCH 2/2] powerpc/64s: __find_linux_pte synchronization vs pmdp_invalidate
Date: Fri, 07 Jun 2019 16:31:46 +1000 [thread overview]
Message-ID: <1559889014.vrn7eh65ke.astroid@bobo.none> (raw)
In-Reply-To: <46295970-4740-5648-efb4-513ab6a5c1c0@c-s.fr>
Christophe Leroy's on June 7, 2019 3:35 pm:
>
>
> Le 07/06/2019 à 05:56, Nicholas Piggin a écrit :
>> 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.
>>
>> 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
>> +
>
> Could get rid of that #ifdef by adding the following in book3s32 and
> nohash pgtable.h:
>
> static inline bool pmd_is_serializing() { return false; }
I don't mind either way. If it's an isolated case like this, sometimes
I'm against polluting the sub arch code with it.
It's up to you I can change that if you prefer.
Thanks,
Nick
next prev parent reply other threads:[~2019-06-07 6:36 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 [this message]
2019-06-07 5:35 ` Aneesh Kumar K.V
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=1559889014.vrn7eh65ke.astroid@bobo.none \
--to=npiggin@gmail.com \
--cc=aneesh.kumar@linux.ibm.com \
--cc=christophe.leroy@c-s.fr \
--cc=linuxppc-dev@lists.ozlabs.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;
as well as URLs for NNTP newsgroup(s).