2009-03-09 18:30:09 +00:00
|
|
|
/*
|
|
|
|
* linux/arch/arm/lib/uaccess_with_memcpy.c
|
|
|
|
*
|
|
|
|
* Written by: Lennert Buytenhek and Nicolas Pitre
|
|
|
|
* Copyright (C) 2009 Marvell Semiconductor
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
|
|
* published by the Free Software Foundation.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/ctype.h>
|
|
|
|
#include <linux/uaccess.h>
|
|
|
|
#include <linux/rwsem.h>
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/sched.h>
|
|
|
|
#include <linux/hardirq.h> /* for in_atomic() */
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 08:04:11 +00:00
|
|
|
#include <linux/gfp.h>
|
2011-06-06 16:56:21 +00:00
|
|
|
#include <linux/highmem.h>
|
ARM: 7858/1: mm: make UACCESS_WITH_MEMCPY huge page aware
The memory pinning code in uaccess_with_memcpy.c does not check
for HugeTLB or THP pmds, and will enter an infinite loop should
a __copy_to_user or __clear_user occur against a huge page.
This patch adds detection code for huge pages to pin_page_for_write.
As this code can be executed in a fast path it refers to the actual
pmds rather than the vma. If a HugeTLB or THP is found (they have
the same pmd representation on ARM), the page table spinlock is
taken to prevent modification whilst the page is pinned.
On ARM, huge pages are only represented as pmds, thus no huge pud
checks are performed. (For huge puds one would lock the page table
in a similar manner as in the pmd case).
Two helper functions are introduced; pmd_thp_or_huge will check
whether or not a page is huge or transparent huge (which have the
same pmd layout on ARM), and pmd_hugewillfault will detect whether
or not a page fault will occur on write to the page.
Running the following test (with the chunking from read_zero
removed):
$ dd if=/dev/zero of=/dev/null bs=10M count=1024
Gave: 2.3 GB/s backed by normal pages,
2.9 GB/s backed by huge pages,
5.1 GB/s backed by huge pages, with page mask=HPAGE_MASK.
After some discussion, it was decided not to adopt the HPAGE_MASK,
as this would have a significant detrimental effect on the overall
system latency due to page_table_lock being held for too long.
This could be revisited if split huge page locks are adopted.
Signed-off-by: Steve Capper <steve.capper@linaro.org>
Reviewed-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2013-10-14 08:49:10 +00:00
|
|
|
#include <linux/hugetlb.h>
|
2009-03-09 18:30:09 +00:00
|
|
|
#include <asm/current.h>
|
|
|
|
#include <asm/page.h>
|
|
|
|
|
|
|
|
static int
|
|
|
|
pin_page_for_write(const void __user *_addr, pte_t **ptep, spinlock_t **ptlp)
|
|
|
|
{
|
|
|
|
unsigned long addr = (unsigned long)_addr;
|
|
|
|
pgd_t *pgd;
|
|
|
|
pmd_t *pmd;
|
|
|
|
pte_t *pte;
|
2010-11-21 16:27:49 +00:00
|
|
|
pud_t *pud;
|
2009-03-09 18:30:09 +00:00
|
|
|
spinlock_t *ptl;
|
|
|
|
|
|
|
|
pgd = pgd_offset(current->mm, addr);
|
|
|
|
if (unlikely(pgd_none(*pgd) || pgd_bad(*pgd)))
|
|
|
|
return 0;
|
|
|
|
|
2010-11-21 16:27:49 +00:00
|
|
|
pud = pud_offset(pgd, addr);
|
|
|
|
if (unlikely(pud_none(*pud) || pud_bad(*pud)))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
pmd = pmd_offset(pud, addr);
|
ARM: 7858/1: mm: make UACCESS_WITH_MEMCPY huge page aware
The memory pinning code in uaccess_with_memcpy.c does not check
for HugeTLB or THP pmds, and will enter an infinite loop should
a __copy_to_user or __clear_user occur against a huge page.
This patch adds detection code for huge pages to pin_page_for_write.
As this code can be executed in a fast path it refers to the actual
pmds rather than the vma. If a HugeTLB or THP is found (they have
the same pmd representation on ARM), the page table spinlock is
taken to prevent modification whilst the page is pinned.
On ARM, huge pages are only represented as pmds, thus no huge pud
checks are performed. (For huge puds one would lock the page table
in a similar manner as in the pmd case).
Two helper functions are introduced; pmd_thp_or_huge will check
whether or not a page is huge or transparent huge (which have the
same pmd layout on ARM), and pmd_hugewillfault will detect whether
or not a page fault will occur on write to the page.
Running the following test (with the chunking from read_zero
removed):
$ dd if=/dev/zero of=/dev/null bs=10M count=1024
Gave: 2.3 GB/s backed by normal pages,
2.9 GB/s backed by huge pages,
5.1 GB/s backed by huge pages, with page mask=HPAGE_MASK.
After some discussion, it was decided not to adopt the HPAGE_MASK,
as this would have a significant detrimental effect on the overall
system latency due to page_table_lock being held for too long.
This could be revisited if split huge page locks are adopted.
Signed-off-by: Steve Capper <steve.capper@linaro.org>
Reviewed-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2013-10-14 08:49:10 +00:00
|
|
|
if (unlikely(pmd_none(*pmd)))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* A pmd can be bad if it refers to a HugeTLB or THP page.
|
|
|
|
*
|
|
|
|
* Both THP and HugeTLB pages have the same pmd layout
|
|
|
|
* and should not be manipulated by the pte functions.
|
|
|
|
*
|
|
|
|
* Lock the page table for the destination and check
|
|
|
|
* to see that it's still huge and whether or not we will
|
|
|
|
* need to fault on write, or if we have a splitting THP.
|
|
|
|
*/
|
|
|
|
if (unlikely(pmd_thp_or_huge(*pmd))) {
|
|
|
|
ptl = ¤t->mm->page_table_lock;
|
|
|
|
spin_lock(ptl);
|
|
|
|
if (unlikely(!pmd_thp_or_huge(*pmd)
|
|
|
|
|| pmd_hugewillfault(*pmd)
|
|
|
|
|| pmd_trans_splitting(*pmd))) {
|
|
|
|
spin_unlock(ptl);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
*ptep = NULL;
|
|
|
|
*ptlp = ptl;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (unlikely(pmd_bad(*pmd)))
|
2009-03-09 18:30:09 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
pte = pte_offset_map_lock(current->mm, pmd, addr, &ptl);
|
|
|
|
if (unlikely(!pte_present(*pte) || !pte_young(*pte) ||
|
|
|
|
!pte_write(*pte) || !pte_dirty(*pte))) {
|
|
|
|
pte_unmap_unlock(pte, ptl);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
*ptep = pte;
|
|
|
|
*ptlp = ptl;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2009-05-22 02:17:17 +00:00
|
|
|
static unsigned long noinline
|
|
|
|
__copy_to_user_memcpy(void __user *to, const void *from, unsigned long n)
|
2009-03-09 18:30:09 +00:00
|
|
|
{
|
|
|
|
int atomic;
|
|
|
|
|
|
|
|
if (unlikely(segment_eq(get_fs(), KERNEL_DS))) {
|
|
|
|
memcpy((void *)to, from, n);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* the mmap semaphore is taken only if not in an atomic context */
|
|
|
|
atomic = in_atomic();
|
|
|
|
|
|
|
|
if (!atomic)
|
|
|
|
down_read(¤t->mm->mmap_sem);
|
|
|
|
while (n) {
|
|
|
|
pte_t *pte;
|
|
|
|
spinlock_t *ptl;
|
|
|
|
int tocopy;
|
|
|
|
|
|
|
|
while (!pin_page_for_write(to, &pte, &ptl)) {
|
|
|
|
if (!atomic)
|
|
|
|
up_read(¤t->mm->mmap_sem);
|
|
|
|
if (__put_user(0, (char __user *)to))
|
|
|
|
goto out;
|
|
|
|
if (!atomic)
|
|
|
|
down_read(¤t->mm->mmap_sem);
|
|
|
|
}
|
|
|
|
|
|
|
|
tocopy = (~(unsigned long)to & ~PAGE_MASK) + 1;
|
|
|
|
if (tocopy > n)
|
|
|
|
tocopy = n;
|
|
|
|
|
|
|
|
memcpy((void *)to, from, tocopy);
|
|
|
|
to += tocopy;
|
|
|
|
from += tocopy;
|
|
|
|
n -= tocopy;
|
|
|
|
|
ARM: 7858/1: mm: make UACCESS_WITH_MEMCPY huge page aware
The memory pinning code in uaccess_with_memcpy.c does not check
for HugeTLB or THP pmds, and will enter an infinite loop should
a __copy_to_user or __clear_user occur against a huge page.
This patch adds detection code for huge pages to pin_page_for_write.
As this code can be executed in a fast path it refers to the actual
pmds rather than the vma. If a HugeTLB or THP is found (they have
the same pmd representation on ARM), the page table spinlock is
taken to prevent modification whilst the page is pinned.
On ARM, huge pages are only represented as pmds, thus no huge pud
checks are performed. (For huge puds one would lock the page table
in a similar manner as in the pmd case).
Two helper functions are introduced; pmd_thp_or_huge will check
whether or not a page is huge or transparent huge (which have the
same pmd layout on ARM), and pmd_hugewillfault will detect whether
or not a page fault will occur on write to the page.
Running the following test (with the chunking from read_zero
removed):
$ dd if=/dev/zero of=/dev/null bs=10M count=1024
Gave: 2.3 GB/s backed by normal pages,
2.9 GB/s backed by huge pages,
5.1 GB/s backed by huge pages, with page mask=HPAGE_MASK.
After some discussion, it was decided not to adopt the HPAGE_MASK,
as this would have a significant detrimental effect on the overall
system latency due to page_table_lock being held for too long.
This could be revisited if split huge page locks are adopted.
Signed-off-by: Steve Capper <steve.capper@linaro.org>
Reviewed-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2013-10-14 08:49:10 +00:00
|
|
|
if (pte)
|
|
|
|
pte_unmap_unlock(pte, ptl);
|
|
|
|
else
|
|
|
|
spin_unlock(ptl);
|
2009-03-09 18:30:09 +00:00
|
|
|
}
|
|
|
|
if (!atomic)
|
|
|
|
up_read(¤t->mm->mmap_sem);
|
|
|
|
|
|
|
|
out:
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
2009-05-22 02:17:17 +00:00
|
|
|
unsigned long
|
|
|
|
__copy_to_user(void __user *to, const void *from, unsigned long n)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* This test is stubbed out of the main function above to keep
|
|
|
|
* the overhead for small copies low by avoiding a large
|
|
|
|
* register dump on the stack just to reload them right away.
|
|
|
|
* With frame pointer disabled, tail call optimization kicks in
|
|
|
|
* as well making this test almost invisible.
|
|
|
|
*/
|
2009-05-30 01:55:50 +00:00
|
|
|
if (n < 64)
|
2009-05-22 02:17:17 +00:00
|
|
|
return __copy_to_user_std(to, from, n);
|
|
|
|
return __copy_to_user_memcpy(to, from, n);
|
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned long noinline
|
|
|
|
__clear_user_memset(void __user *addr, unsigned long n)
|
2009-03-09 18:30:09 +00:00
|
|
|
{
|
|
|
|
if (unlikely(segment_eq(get_fs(), KERNEL_DS))) {
|
|
|
|
memset((void *)addr, 0, n);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
down_read(¤t->mm->mmap_sem);
|
|
|
|
while (n) {
|
|
|
|
pte_t *pte;
|
|
|
|
spinlock_t *ptl;
|
|
|
|
int tocopy;
|
|
|
|
|
|
|
|
while (!pin_page_for_write(addr, &pte, &ptl)) {
|
|
|
|
up_read(¤t->mm->mmap_sem);
|
|
|
|
if (__put_user(0, (char __user *)addr))
|
|
|
|
goto out;
|
|
|
|
down_read(¤t->mm->mmap_sem);
|
|
|
|
}
|
|
|
|
|
|
|
|
tocopy = (~(unsigned long)addr & ~PAGE_MASK) + 1;
|
|
|
|
if (tocopy > n)
|
|
|
|
tocopy = n;
|
|
|
|
|
|
|
|
memset((void *)addr, 0, tocopy);
|
|
|
|
addr += tocopy;
|
|
|
|
n -= tocopy;
|
|
|
|
|
ARM: 7858/1: mm: make UACCESS_WITH_MEMCPY huge page aware
The memory pinning code in uaccess_with_memcpy.c does not check
for HugeTLB or THP pmds, and will enter an infinite loop should
a __copy_to_user or __clear_user occur against a huge page.
This patch adds detection code for huge pages to pin_page_for_write.
As this code can be executed in a fast path it refers to the actual
pmds rather than the vma. If a HugeTLB or THP is found (they have
the same pmd representation on ARM), the page table spinlock is
taken to prevent modification whilst the page is pinned.
On ARM, huge pages are only represented as pmds, thus no huge pud
checks are performed. (For huge puds one would lock the page table
in a similar manner as in the pmd case).
Two helper functions are introduced; pmd_thp_or_huge will check
whether or not a page is huge or transparent huge (which have the
same pmd layout on ARM), and pmd_hugewillfault will detect whether
or not a page fault will occur on write to the page.
Running the following test (with the chunking from read_zero
removed):
$ dd if=/dev/zero of=/dev/null bs=10M count=1024
Gave: 2.3 GB/s backed by normal pages,
2.9 GB/s backed by huge pages,
5.1 GB/s backed by huge pages, with page mask=HPAGE_MASK.
After some discussion, it was decided not to adopt the HPAGE_MASK,
as this would have a significant detrimental effect on the overall
system latency due to page_table_lock being held for too long.
This could be revisited if split huge page locks are adopted.
Signed-off-by: Steve Capper <steve.capper@linaro.org>
Reviewed-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2013-10-14 08:49:10 +00:00
|
|
|
if (pte)
|
|
|
|
pte_unmap_unlock(pte, ptl);
|
|
|
|
else
|
|
|
|
spin_unlock(ptl);
|
2009-03-09 18:30:09 +00:00
|
|
|
}
|
|
|
|
up_read(¤t->mm->mmap_sem);
|
|
|
|
|
|
|
|
out:
|
|
|
|
return n;
|
|
|
|
}
|
2009-05-22 02:17:17 +00:00
|
|
|
|
|
|
|
unsigned long __clear_user(void __user *addr, unsigned long n)
|
|
|
|
{
|
|
|
|
/* See rational for this in __copy_to_user() above. */
|
2009-05-30 01:55:50 +00:00
|
|
|
if (n < 64)
|
2009-05-22 02:17:17 +00:00
|
|
|
return __clear_user_std(addr, n);
|
|
|
|
return __clear_user_memset(addr, n);
|
|
|
|
}
|
2009-05-30 01:55:50 +00:00
|
|
|
|
|
|
|
#if 0
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This code is disabled by default, but kept around in case the chosen
|
|
|
|
* thresholds need to be revalidated. Some overhead (small but still)
|
|
|
|
* would be implied by a runtime determined variable threshold, and
|
|
|
|
* so far the measurement on concerned targets didn't show a worthwhile
|
|
|
|
* variation.
|
|
|
|
*
|
|
|
|
* Note that a fairly precise sched_clock() implementation is needed
|
|
|
|
* for results to make some sense.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/vmalloc.h>
|
|
|
|
|
|
|
|
static int __init test_size_treshold(void)
|
|
|
|
{
|
|
|
|
struct page *src_page, *dst_page;
|
|
|
|
void *user_ptr, *kernel_ptr;
|
|
|
|
unsigned long long t0, t1, t2;
|
|
|
|
int size, ret;
|
|
|
|
|
|
|
|
ret = -ENOMEM;
|
|
|
|
src_page = alloc_page(GFP_KERNEL);
|
|
|
|
if (!src_page)
|
|
|
|
goto no_src;
|
|
|
|
dst_page = alloc_page(GFP_KERNEL);
|
|
|
|
if (!dst_page)
|
|
|
|
goto no_dst;
|
|
|
|
kernel_ptr = page_address(src_page);
|
|
|
|
user_ptr = vmap(&dst_page, 1, VM_IOREMAP, __pgprot(__P010));
|
|
|
|
if (!user_ptr)
|
|
|
|
goto no_vmap;
|
|
|
|
|
|
|
|
/* warm up the src page dcache */
|
|
|
|
ret = __copy_to_user_memcpy(user_ptr, kernel_ptr, PAGE_SIZE);
|
|
|
|
|
|
|
|
for (size = PAGE_SIZE; size >= 4; size /= 2) {
|
|
|
|
t0 = sched_clock();
|
|
|
|
ret |= __copy_to_user_memcpy(user_ptr, kernel_ptr, size);
|
|
|
|
t1 = sched_clock();
|
|
|
|
ret |= __copy_to_user_std(user_ptr, kernel_ptr, size);
|
|
|
|
t2 = sched_clock();
|
|
|
|
printk("copy_to_user: %d %llu %llu\n", size, t1 - t0, t2 - t1);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (size = PAGE_SIZE; size >= 4; size /= 2) {
|
|
|
|
t0 = sched_clock();
|
|
|
|
ret |= __clear_user_memset(user_ptr, size);
|
|
|
|
t1 = sched_clock();
|
|
|
|
ret |= __clear_user_std(user_ptr, size);
|
|
|
|
t2 = sched_clock();
|
|
|
|
printk("clear_user: %d %llu %llu\n", size, t1 - t0, t2 - t1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ret)
|
|
|
|
ret = -EFAULT;
|
|
|
|
|
|
|
|
vunmap(user_ptr);
|
|
|
|
no_vmap:
|
|
|
|
put_page(dst_page);
|
|
|
|
no_dst:
|
|
|
|
put_page(src_page);
|
|
|
|
no_src:
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
subsys_initcall(test_size_treshold);
|
|
|
|
|
|
|
|
#endif
|