![Tejun Heo](/assets/img/avatar_default.png)
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>
151 lines
4.2 KiB
C
151 lines
4.2 KiB
C
/**************************************************************************
|
|
*
|
|
* Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
|
|
* All Rights Reserved.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the
|
|
* "Software"), to deal in the Software without restriction, including
|
|
* without limitation the rights to use, copy, modify, merge, publish,
|
|
* distribute, sub license, and/or sell copies of the Software, and to
|
|
* permit persons to whom the Software is furnished to do so, subject to
|
|
* the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the
|
|
* next paragraph) shall be included in all copies or substantial portions
|
|
* of the Software.
|
|
*
|
|
* 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 NON-INFRINGEMENT. IN NO EVENT SHALL
|
|
* THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS 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.
|
|
*
|
|
**************************************************************************/
|
|
/*
|
|
* Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
|
|
* Keith Packard.
|
|
*/
|
|
|
|
#include "ttm/ttm_module.h"
|
|
#include "ttm/ttm_bo_driver.h"
|
|
#ifdef TTM_HAS_AGP
|
|
#include "ttm/ttm_placement.h"
|
|
#include <linux/agp_backend.h>
|
|
#include <linux/module.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/io.h>
|
|
#include <asm/agp.h>
|
|
|
|
struct ttm_agp_backend {
|
|
struct ttm_backend backend;
|
|
struct agp_memory *mem;
|
|
struct agp_bridge_data *bridge;
|
|
};
|
|
|
|
static int ttm_agp_populate(struct ttm_backend *backend,
|
|
unsigned long num_pages, struct page **pages,
|
|
struct page *dummy_read_page)
|
|
{
|
|
struct ttm_agp_backend *agp_be =
|
|
container_of(backend, struct ttm_agp_backend, backend);
|
|
struct page **cur_page, **last_page = pages + num_pages;
|
|
struct agp_memory *mem;
|
|
|
|
mem = agp_allocate_memory(agp_be->bridge, num_pages, AGP_USER_MEMORY);
|
|
if (unlikely(mem == NULL))
|
|
return -ENOMEM;
|
|
|
|
mem->page_count = 0;
|
|
for (cur_page = pages; cur_page < last_page; ++cur_page) {
|
|
struct page *page = *cur_page;
|
|
if (!page)
|
|
page = dummy_read_page;
|
|
|
|
mem->pages[mem->page_count++] = page;
|
|
}
|
|
agp_be->mem = mem;
|
|
return 0;
|
|
}
|
|
|
|
static int ttm_agp_bind(struct ttm_backend *backend, struct ttm_mem_reg *bo_mem)
|
|
{
|
|
struct ttm_agp_backend *agp_be =
|
|
container_of(backend, struct ttm_agp_backend, backend);
|
|
struct agp_memory *mem = agp_be->mem;
|
|
int cached = (bo_mem->placement & TTM_PL_FLAG_CACHED);
|
|
int ret;
|
|
|
|
mem->is_flushed = 1;
|
|
mem->type = (cached) ? AGP_USER_CACHED_MEMORY : AGP_USER_MEMORY;
|
|
|
|
ret = agp_bind_memory(mem, bo_mem->mm_node->start);
|
|
if (ret)
|
|
printk(KERN_ERR TTM_PFX "AGP Bind memory failed.\n");
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int ttm_agp_unbind(struct ttm_backend *backend)
|
|
{
|
|
struct ttm_agp_backend *agp_be =
|
|
container_of(backend, struct ttm_agp_backend, backend);
|
|
|
|
if (agp_be->mem->is_bound)
|
|
return agp_unbind_memory(agp_be->mem);
|
|
else
|
|
return 0;
|
|
}
|
|
|
|
static void ttm_agp_clear(struct ttm_backend *backend)
|
|
{
|
|
struct ttm_agp_backend *agp_be =
|
|
container_of(backend, struct ttm_agp_backend, backend);
|
|
struct agp_memory *mem = agp_be->mem;
|
|
|
|
if (mem) {
|
|
ttm_agp_unbind(backend);
|
|
agp_free_memory(mem);
|
|
}
|
|
agp_be->mem = NULL;
|
|
}
|
|
|
|
static void ttm_agp_destroy(struct ttm_backend *backend)
|
|
{
|
|
struct ttm_agp_backend *agp_be =
|
|
container_of(backend, struct ttm_agp_backend, backend);
|
|
|
|
if (agp_be->mem)
|
|
ttm_agp_clear(backend);
|
|
kfree(agp_be);
|
|
}
|
|
|
|
static struct ttm_backend_func ttm_agp_func = {
|
|
.populate = ttm_agp_populate,
|
|
.clear = ttm_agp_clear,
|
|
.bind = ttm_agp_bind,
|
|
.unbind = ttm_agp_unbind,
|
|
.destroy = ttm_agp_destroy,
|
|
};
|
|
|
|
struct ttm_backend *ttm_agp_backend_init(struct ttm_bo_device *bdev,
|
|
struct agp_bridge_data *bridge)
|
|
{
|
|
struct ttm_agp_backend *agp_be;
|
|
|
|
agp_be = kmalloc(sizeof(*agp_be), GFP_KERNEL);
|
|
if (!agp_be)
|
|
return NULL;
|
|
|
|
agp_be->mem = NULL;
|
|
agp_be->bridge = bridge;
|
|
agp_be->backend.func = &ttm_agp_func;
|
|
agp_be->backend.bdev = bdev;
|
|
return &agp_be->backend;
|
|
}
|
|
EXPORT_SYMBOL(ttm_agp_backend_init);
|
|
|
|
#endif
|