forked from Minki/linux
5a0e3ad6af
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>
230 lines
5.9 KiB
C
230 lines
5.9 KiB
C
/*
|
|
* Copyright (c) 2006, 2007 QLogic Corporation. All rights reserved.
|
|
* Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
|
|
*
|
|
* This software is available to you under a choice of one of two
|
|
* licenses. You may choose to be licensed under the terms of the GNU
|
|
* General Public License (GPL) Version 2, available from the file
|
|
* COPYING in the main directory of this source tree, or the
|
|
* OpenIB.org BSD license below:
|
|
*
|
|
* Redistribution and use in source and binary forms, with or
|
|
* without modification, are permitted provided that the following
|
|
* conditions are met:
|
|
*
|
|
* - Redistributions of source code must retain the above
|
|
* copyright notice, this list of conditions and the following
|
|
* disclaimer.
|
|
*
|
|
* - Redistributions in binary form must reproduce the above
|
|
* copyright notice, this list of conditions and the following
|
|
* disclaimer in the documentation and/or other materials
|
|
* provided with the distribution.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
* SOFTWARE.
|
|
*/
|
|
|
|
#include <linux/mm.h>
|
|
#include <linux/device.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/sched.h>
|
|
|
|
#include "ipath_kernel.h"
|
|
|
|
static void __ipath_release_user_pages(struct page **p, size_t num_pages,
|
|
int dirty)
|
|
{
|
|
size_t i;
|
|
|
|
for (i = 0; i < num_pages; i++) {
|
|
ipath_cdbg(MM, "%lu/%lu put_page %p\n", (unsigned long) i,
|
|
(unsigned long) num_pages, p[i]);
|
|
if (dirty)
|
|
set_page_dirty_lock(p[i]);
|
|
put_page(p[i]);
|
|
}
|
|
}
|
|
|
|
/* call with current->mm->mmap_sem held */
|
|
static int __get_user_pages(unsigned long start_page, size_t num_pages,
|
|
struct page **p, struct vm_area_struct **vma)
|
|
{
|
|
unsigned long lock_limit;
|
|
size_t got;
|
|
int ret;
|
|
|
|
lock_limit = rlimit(RLIMIT_MEMLOCK) >> PAGE_SHIFT;
|
|
|
|
if (num_pages > lock_limit) {
|
|
ret = -ENOMEM;
|
|
goto bail;
|
|
}
|
|
|
|
ipath_cdbg(VERBOSE, "pin %lx pages from vaddr %lx\n",
|
|
(unsigned long) num_pages, start_page);
|
|
|
|
for (got = 0; got < num_pages; got += ret) {
|
|
ret = get_user_pages(current, current->mm,
|
|
start_page + got * PAGE_SIZE,
|
|
num_pages - got, 1, 1,
|
|
p + got, vma);
|
|
if (ret < 0)
|
|
goto bail_release;
|
|
}
|
|
|
|
current->mm->locked_vm += num_pages;
|
|
|
|
ret = 0;
|
|
goto bail;
|
|
|
|
bail_release:
|
|
__ipath_release_user_pages(p, got, 0);
|
|
bail:
|
|
return ret;
|
|
}
|
|
|
|
/**
|
|
* ipath_map_page - a safety wrapper around pci_map_page()
|
|
*
|
|
* A dma_addr of all 0's is interpreted by the chip as "disabled".
|
|
* Unfortunately, it can also be a valid dma_addr returned on some
|
|
* architectures.
|
|
*
|
|
* The powerpc iommu assigns dma_addrs in ascending order, so we don't
|
|
* have to bother with retries or mapping a dummy page to insure we
|
|
* don't just get the same mapping again.
|
|
*
|
|
* I'm sure we won't be so lucky with other iommu's, so FIXME.
|
|
*/
|
|
dma_addr_t ipath_map_page(struct pci_dev *hwdev, struct page *page,
|
|
unsigned long offset, size_t size, int direction)
|
|
{
|
|
dma_addr_t phys;
|
|
|
|
phys = pci_map_page(hwdev, page, offset, size, direction);
|
|
|
|
if (phys == 0) {
|
|
pci_unmap_page(hwdev, phys, size, direction);
|
|
phys = pci_map_page(hwdev, page, offset, size, direction);
|
|
/*
|
|
* FIXME: If we get 0 again, we should keep this page,
|
|
* map another, then free the 0 page.
|
|
*/
|
|
}
|
|
|
|
return phys;
|
|
}
|
|
|
|
/**
|
|
* ipath_map_single - a safety wrapper around pci_map_single()
|
|
*
|
|
* Same idea as ipath_map_page().
|
|
*/
|
|
dma_addr_t ipath_map_single(struct pci_dev *hwdev, void *ptr, size_t size,
|
|
int direction)
|
|
{
|
|
dma_addr_t phys;
|
|
|
|
phys = pci_map_single(hwdev, ptr, size, direction);
|
|
|
|
if (phys == 0) {
|
|
pci_unmap_single(hwdev, phys, size, direction);
|
|
phys = pci_map_single(hwdev, ptr, size, direction);
|
|
/*
|
|
* FIXME: If we get 0 again, we should keep this page,
|
|
* map another, then free the 0 page.
|
|
*/
|
|
}
|
|
|
|
return phys;
|
|
}
|
|
|
|
/**
|
|
* ipath_get_user_pages - lock user pages into memory
|
|
* @start_page: the start page
|
|
* @num_pages: the number of pages
|
|
* @p: the output page structures
|
|
*
|
|
* This function takes a given start page (page aligned user virtual
|
|
* address) and pins it and the following specified number of pages. For
|
|
* now, num_pages is always 1, but that will probably change at some point
|
|
* (because caller is doing expected sends on a single virtually contiguous
|
|
* buffer, so we can do all pages at once).
|
|
*/
|
|
int ipath_get_user_pages(unsigned long start_page, size_t num_pages,
|
|
struct page **p)
|
|
{
|
|
int ret;
|
|
|
|
down_write(¤t->mm->mmap_sem);
|
|
|
|
ret = __get_user_pages(start_page, num_pages, p, NULL);
|
|
|
|
up_write(¤t->mm->mmap_sem);
|
|
|
|
return ret;
|
|
}
|
|
|
|
void ipath_release_user_pages(struct page **p, size_t num_pages)
|
|
{
|
|
down_write(¤t->mm->mmap_sem);
|
|
|
|
__ipath_release_user_pages(p, num_pages, 1);
|
|
|
|
current->mm->locked_vm -= num_pages;
|
|
|
|
up_write(¤t->mm->mmap_sem);
|
|
}
|
|
|
|
struct ipath_user_pages_work {
|
|
struct work_struct work;
|
|
struct mm_struct *mm;
|
|
unsigned long num_pages;
|
|
};
|
|
|
|
static void user_pages_account(struct work_struct *_work)
|
|
{
|
|
struct ipath_user_pages_work *work =
|
|
container_of(_work, struct ipath_user_pages_work, work);
|
|
|
|
down_write(&work->mm->mmap_sem);
|
|
work->mm->locked_vm -= work->num_pages;
|
|
up_write(&work->mm->mmap_sem);
|
|
mmput(work->mm);
|
|
kfree(work);
|
|
}
|
|
|
|
void ipath_release_user_pages_on_close(struct page **p, size_t num_pages)
|
|
{
|
|
struct ipath_user_pages_work *work;
|
|
struct mm_struct *mm;
|
|
|
|
__ipath_release_user_pages(p, num_pages, 1);
|
|
|
|
mm = get_task_mm(current);
|
|
if (!mm)
|
|
return;
|
|
|
|
work = kmalloc(sizeof(*work), GFP_KERNEL);
|
|
if (!work)
|
|
goto bail_mm;
|
|
|
|
INIT_WORK(&work->work, user_pages_account);
|
|
work->mm = mm;
|
|
work->num_pages = num_pages;
|
|
|
|
schedule_work(&work->work);
|
|
return;
|
|
|
|
bail_mm:
|
|
mmput(mm);
|
|
return;
|
|
}
|