From: Janosch Frank <frankja@linux.ibm.com>
To: Mike Kravetz <mike.kravetz@oracle.com>, aarcange@redhat.com
Cc: linux-kernel@vger.kernel.org, viro@zeniv.linux.org.uk,
"linux-mm@kvack.org" <linux-mm@kvack.org>,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: [PATCH] userfaultfd: hugetlbfs: Fix userfaultfd_huge_must_wait pte access
Date: Wed, 27 Jun 2018 10:47:44 +0200 [thread overview]
Message-ID: <961dc253-b071-8a72-c046-c23cae377e2c@linux.ibm.com> (raw)
In-Reply-To: <c9c5c76c-23e5-671f-1fdc-8326e42917b9@oracle.com>
[-- Attachment #1.1: Type: text/plain, Size: 2124 bytes --]
On 26.06.2018 19:00, Mike Kravetz wrote:
> On 06/26/2018 06:24 AM, Janosch Frank wrote:
>> Use huge_ptep_get to translate huge ptes to normal ptes so we can
>> check them with the huge_pte_* functions. Otherwise some architectures
>> will check the wrong values and will not wait for userspace to bring
>> in the memory.
>>
>> Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
>> Fixes: 369cd2121be4 ("userfaultfd: hugetlbfs: userfaultfd_huge_must_wait for hugepmd ranges")
> Adding linux-mm and Andrew on Cc:
>
> Thanks for catching and fixing this.
Sure
I'd be happy if we get less of these problems with time, this one was
rather painful to debug. :)
> I think this needs to be fixed in stable as well. Correct? Assuming
> userfaultfd is/can be enabled for impacted architectures.
Correct, it seems I forgot the CC stable...
>
> Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
Thanks
> -- Mike Kravetz
>> ---
>> fs/userfaultfd.c | 12 +++++++-----
>> 1 file changed, 7 insertions(+), 5 deletions(-)
>>
>> diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c
>> index 123bf7d516fc..594d192b2331 100644
>> --- a/fs/userfaultfd.c
>> +++ b/fs/userfaultfd.c
>> @@ -222,24 +222,26 @@ static inline bool userfaultfd_huge_must_wait(struct userfaultfd_ctx *ctx,
>> unsigned long reason)
>> {
>> struct mm_struct *mm = ctx->mm;
>> - pte_t *pte;
>> + pte_t *ptep, pte;
>> bool ret = true;
>>
>> VM_BUG_ON(!rwsem_is_locked(&mm->mmap_sem));
>>
>> - pte = huge_pte_offset(mm, address, vma_mmu_pagesize(vma));
>> - if (!pte)
>> + ptep = huge_pte_offset(mm, address, vma_mmu_pagesize(vma));
>> +
>> + if (!ptep)
>> goto out;
>>
>> ret = false;
>> + pte = huge_ptep_get(ptep);
>>
>> /*
>> * Lockless access: we're in a wait_event so it's ok if it
>> * changes under us.
>> */
>> - if (huge_pte_none(*pte))
>> + if (huge_pte_none(pte))
>> ret = true;
>> - if (!huge_pte_write(*pte) && (reason & VM_UFFD_WP))
>> + if (!huge_pte_write(pte) && (reason & VM_UFFD_WP))
>> ret = true;
>> out:
>> return ret;
>>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2018-06-27 8:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20180626132421.78084-1-frankja@linux.ibm.com>
2018-06-26 17:00 ` [PATCH] userfaultfd: hugetlbfs: Fix userfaultfd_huge_must_wait pte access Mike Kravetz
2018-06-27 8:47 ` Janosch Frank [this message]
2018-07-04 3:58 ` Andrea Arcangeli
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=961dc253-b071-8a72-c046-c23cae377e2c@linux.ibm.com \
--to=frankja@linux.ibm.com \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mike.kravetz@oracle.com \
--cc=viro@zeniv.linux.org.uk \
/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).