From: "Radim Krčmář" <rkrcmar@redhat.com>
To: Filippo Sironi <sironi@amazon.de>
Cc: sironi@amazon.com, Anthony Liguori <aliguori@amazon.com>,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] x86, kvm: Handle PFNs outside of kernel reach when touching GPTEs
Date: Thu, 6 Apr 2017 16:22:02 +0200 [thread overview]
Message-ID: <20170406142201.GA2817@potion> (raw)
In-Reply-To: <1491397622-16665-1-git-send-email-sironi@amazon.de>
2017-04-05 15:07+0200, Filippo Sironi:
> cmpxchg_gpte() calls get_user_pages_fast() to retrieve the number of
> pages and the respective struct pages for mapping in the kernel virtual
> address space.
> This doesn't work if get_user_pages_fast() is invoked with a userspace
> virtual address that's backed by PFNs outside of kernel reach (e.g.,
> when limiting the kernel memory with mem= in the command line and using
> /dev/mem to map memory).
>
> If get_user_pages_fast() fails, look up the VMA that backs the userspace
> virtual address, compute the PFN and the physical address, and map it in
> the kernel virtual address space with memremap().
What is the reason for a configuration that voluntarily restricts access
to memory that it needs?
> Signed-off-by: Filippo Sironi <sironi@amazon.de>
> Cc: Anthony Liguori <aliguori@amazon.com>
> Cc: kvm@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> ---
> diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
> @@ -147,15 +147,36 @@ static int FNAME(cmpxchg_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,
> struct page *page;
>
> npages = get_user_pages_fast((unsigned long)ptep_user, 1, 1, &page);
> - /* Check if the user is doing something meaningless. */
> - if (unlikely(npages != 1))
> - return -EFAULT;
> -
> - table = kmap_atomic(page);
> - ret = CMPXCHG(&table[index], orig_pte, new_pte);
> - kunmap_atomic(table);
> -
> - kvm_release_page_dirty(page);
> + if (likely(npages == 1)) {
> + table = kmap_atomic(page);
> + ret = CMPXCHG(&table[index], orig_pte, new_pte);
> + kunmap_atomic(table);
> +
> + kvm_release_page_dirty(page);
> + } else {
> + struct vm_area_struct *vma;
> + unsigned long vaddr = (unsigned long)ptep_user & PAGE_MASK;
> + unsigned long pfn;
> + unsigned long paddr;
> +
> + down_read(¤t->mm->mmap_sem);
> + vma = find_vma_intersection(current->mm, vaddr,
> + vaddr + PAGE_SIZE);
Hm, with the argument order like this, we check that
vaddr < vma->vm_end && vaddr + PAGE_SIZE > vma->vm_start
but shouldn't we actually check that the whole page is there, i.e.
vaddr + PAGE_SIZE < vma->vm_end && vaddr > vma->vm_start
?
Thanks.
> + if (!vma || !(vma->vm_flags & VM_PFNMAP)) {
> + up_read(¤t->mm->mmap_sem);
> + return -EFAULT;
> + }
> + pfn = ((vaddr - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
> + paddr = pfn << PAGE_SHIFT;
> + table = memremap(paddr, PAGE_SIZE, MEMREMAP_WB);
(I don't undestand why there isn't a wrapper for this ...
Looks like we're doing something unexpected.)
> + if (!table) {
> + up_read(¤t->mm->mmap_sem);
> + return -EFAULT;
> + }
> + ret = CMPXCHG(&table[index], orig_pte, new_pte);
> + memunmap(table);
> + up_read(¤t->mm->mmap_sem);
> + }
>
> return (ret != orig_pte);
> }
> --
> 2.7.4
>
next prev parent reply other threads:[~2017-04-06 14:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-05 13:07 [PATCH] x86, kvm: Handle PFNs outside of kernel reach when touching GPTEs Filippo Sironi
2017-04-06 14:22 ` Radim Krčmář [this message]
2017-04-12 13:16 ` Sironi, Filippo
2017-04-17 11:26 ` Xiao Guangrong
2017-04-18 8:12 ` Paolo Bonzini
2017-04-13 15:20 ` Filippo Sironi
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=20170406142201.GA2817@potion \
--to=rkrcmar@redhat.com \
--cc=aliguori@amazon.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sironi@amazon.com \
--cc=sironi@amazon.de \
/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).