Commit 15759cb0 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Michael Ellerman

powerpc/perf/callchain: Use __get_user_pages_fast in read_user_stack_slow

read_user_stack_slow is called with interrupts soft disabled and it copies contents
from the page which we find mapped to a specific address. To convert
userspace address to pfn, the kernel now uses lockless page table walk.

The kernel needs to make sure the pfn value read remains stable and is not released
and reused for another process while the contents are read from the page. This
can only be achieved by holding a page reference.

One of the first approaches I tried was to check the pte value after the kernel
copies the contents from the page. But as shown below we can still get it wrong

CPU0                           CPU1
pte = READ_ONCE(*ptep);
                               pte_clear(pte);
                               put_page(page);
                               page = alloc_page();
                               memcpy(page_address(page), "secret password", nr);
memcpy(buf, kaddr + offset, nb);
                               put_page(page);
                               handle_mm_fault()
                               page = alloc_page();
                               set_pte(pte, page);
if (pte_val(pte) != pte_val(*ptep))

Hence switch to __get_user_pages_fast.
Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200505071729.54912-8-aneesh.kumar@linux.ibm.com
parent 0da81b65
...@@ -26,43 +26,25 @@ ...@@ -26,43 +26,25 @@
*/ */
int read_user_stack_slow(void __user *ptr, void *buf, int nb) int read_user_stack_slow(void __user *ptr, void *buf, int nb)
{ {
int ret = -EFAULT;
pgd_t *pgdir;
pte_t *ptep, pte;
unsigned int shift;
unsigned long addr = (unsigned long) ptr; unsigned long addr = (unsigned long) ptr;
unsigned long offset; unsigned long offset;
unsigned long pfn, flags; struct page *page;
int nrpages;
void *kaddr; void *kaddr;
pgdir = current->mm->pgd; nrpages = __get_user_pages_fast(addr, 1, 1, &page);
if (!pgdir) if (nrpages == 1) {
return -EFAULT; kaddr = page_address(page);
/* align address to page boundary */
offset = addr & ~PAGE_MASK;
local_irq_save(flags); memcpy(buf, kaddr + offset, nb);
ptep = find_current_mm_pte(pgdir, addr, NULL, &shift); put_page(page);
if (!ptep) return 0;
goto err_out; }
if (!shift) return -EFAULT;
shift = PAGE_SHIFT;
/* align address to page boundary */
offset = addr & ((1UL << shift) - 1);
pte = READ_ONCE(*ptep);
if (!pte_present(pte) || !pte_user(pte))
goto err_out;
pfn = pte_pfn(pte);
if (!page_is_ram(pfn))
goto err_out;
/* no highmem to worry about here */
kaddr = pfn_to_kaddr(pfn);
memcpy(buf, kaddr + offset, nb);
ret = 0;
err_out:
local_irq_restore(flags);
return ret;
} }
static int read_user_stack_64(unsigned long __user *ptr, unsigned long *ret) static int read_user_stack_64(unsigned long __user *ptr, unsigned long *ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment