mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-22 09:22:37 +00:00
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>
185 lines
4.7 KiB
C
185 lines
4.7 KiB
C
/*
|
|
* SPU local store allocation routines
|
|
*
|
|
* Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2, or (at your option)
|
|
* any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
#undef DEBUG
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/vmalloc.h>
|
|
|
|
#include <asm/spu.h>
|
|
#include <asm/spu_csa.h>
|
|
#include <asm/mmu.h>
|
|
|
|
#include "spufs.h"
|
|
|
|
static int spu_alloc_lscsa_std(struct spu_state *csa)
|
|
{
|
|
struct spu_lscsa *lscsa;
|
|
unsigned char *p;
|
|
|
|
lscsa = vmalloc(sizeof(struct spu_lscsa));
|
|
if (!lscsa)
|
|
return -ENOMEM;
|
|
memset(lscsa, 0, sizeof(struct spu_lscsa));
|
|
csa->lscsa = lscsa;
|
|
|
|
/* Set LS pages reserved to allow for user-space mapping. */
|
|
for (p = lscsa->ls; p < lscsa->ls + LS_SIZE; p += PAGE_SIZE)
|
|
SetPageReserved(vmalloc_to_page(p));
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void spu_free_lscsa_std(struct spu_state *csa)
|
|
{
|
|
/* Clear reserved bit before vfree. */
|
|
unsigned char *p;
|
|
|
|
if (csa->lscsa == NULL)
|
|
return;
|
|
|
|
for (p = csa->lscsa->ls; p < csa->lscsa->ls + LS_SIZE; p += PAGE_SIZE)
|
|
ClearPageReserved(vmalloc_to_page(p));
|
|
|
|
vfree(csa->lscsa);
|
|
}
|
|
|
|
#ifdef CONFIG_SPU_FS_64K_LS
|
|
|
|
#define SPU_64K_PAGE_SHIFT 16
|
|
#define SPU_64K_PAGE_ORDER (SPU_64K_PAGE_SHIFT - PAGE_SHIFT)
|
|
#define SPU_64K_PAGE_COUNT (1ul << SPU_64K_PAGE_ORDER)
|
|
|
|
int spu_alloc_lscsa(struct spu_state *csa)
|
|
{
|
|
struct page **pgarray;
|
|
unsigned char *p;
|
|
int i, j, n_4k;
|
|
|
|
/* Check availability of 64K pages */
|
|
if (!spu_64k_pages_available())
|
|
goto fail;
|
|
|
|
csa->use_big_pages = 1;
|
|
|
|
pr_debug("spu_alloc_lscsa(csa=0x%p), trying to allocate 64K pages\n",
|
|
csa);
|
|
|
|
/* First try to allocate our 64K pages. We need 5 of them
|
|
* with the current implementation. In the future, we should try
|
|
* to separate the lscsa with the actual local store image, thus
|
|
* allowing us to require only 4 64K pages per context
|
|
*/
|
|
for (i = 0; i < SPU_LSCSA_NUM_BIG_PAGES; i++) {
|
|
/* XXX This is likely to fail, we should use a special pool
|
|
* similiar to what hugetlbfs does.
|
|
*/
|
|
csa->lscsa_pages[i] = alloc_pages(GFP_KERNEL,
|
|
SPU_64K_PAGE_ORDER);
|
|
if (csa->lscsa_pages[i] == NULL)
|
|
goto fail;
|
|
}
|
|
|
|
pr_debug(" success ! creating vmap...\n");
|
|
|
|
/* Now we need to create a vmalloc mapping of these for the kernel
|
|
* and SPU context switch code to use. Currently, we stick to a
|
|
* normal kernel vmalloc mapping, which in our case will be 4K
|
|
*/
|
|
n_4k = SPU_64K_PAGE_COUNT * SPU_LSCSA_NUM_BIG_PAGES;
|
|
pgarray = kmalloc(sizeof(struct page *) * n_4k, GFP_KERNEL);
|
|
if (pgarray == NULL)
|
|
goto fail;
|
|
for (i = 0; i < SPU_LSCSA_NUM_BIG_PAGES; i++)
|
|
for (j = 0; j < SPU_64K_PAGE_COUNT; j++)
|
|
/* We assume all the struct page's are contiguous
|
|
* which should be hopefully the case for an order 4
|
|
* allocation..
|
|
*/
|
|
pgarray[i * SPU_64K_PAGE_COUNT + j] =
|
|
csa->lscsa_pages[i] + j;
|
|
csa->lscsa = vmap(pgarray, n_4k, VM_USERMAP, PAGE_KERNEL);
|
|
kfree(pgarray);
|
|
if (csa->lscsa == NULL)
|
|
goto fail;
|
|
|
|
memset(csa->lscsa, 0, sizeof(struct spu_lscsa));
|
|
|
|
/* Set LS pages reserved to allow for user-space mapping.
|
|
*
|
|
* XXX isn't that a bit obsolete ? I think we should just
|
|
* make sure the page count is high enough. Anyway, won't harm
|
|
* for now
|
|
*/
|
|
for (p = csa->lscsa->ls; p < csa->lscsa->ls + LS_SIZE; p += PAGE_SIZE)
|
|
SetPageReserved(vmalloc_to_page(p));
|
|
|
|
pr_debug(" all good !\n");
|
|
|
|
return 0;
|
|
fail:
|
|
pr_debug("spufs: failed to allocate lscsa 64K pages, falling back\n");
|
|
spu_free_lscsa(csa);
|
|
return spu_alloc_lscsa_std(csa);
|
|
}
|
|
|
|
void spu_free_lscsa(struct spu_state *csa)
|
|
{
|
|
unsigned char *p;
|
|
int i;
|
|
|
|
if (!csa->use_big_pages) {
|
|
spu_free_lscsa_std(csa);
|
|
return;
|
|
}
|
|
csa->use_big_pages = 0;
|
|
|
|
if (csa->lscsa == NULL)
|
|
goto free_pages;
|
|
|
|
for (p = csa->lscsa->ls; p < csa->lscsa->ls + LS_SIZE; p += PAGE_SIZE)
|
|
ClearPageReserved(vmalloc_to_page(p));
|
|
|
|
vunmap(csa->lscsa);
|
|
csa->lscsa = NULL;
|
|
|
|
free_pages:
|
|
|
|
for (i = 0; i < SPU_LSCSA_NUM_BIG_PAGES; i++)
|
|
if (csa->lscsa_pages[i])
|
|
__free_pages(csa->lscsa_pages[i], SPU_64K_PAGE_ORDER);
|
|
}
|
|
|
|
#else /* CONFIG_SPU_FS_64K_LS */
|
|
|
|
int spu_alloc_lscsa(struct spu_state *csa)
|
|
{
|
|
return spu_alloc_lscsa_std(csa);
|
|
}
|
|
|
|
void spu_free_lscsa(struct spu_state *csa)
|
|
{
|
|
spu_free_lscsa_std(csa);
|
|
}
|
|
|
|
#endif /* !defined(CONFIG_SPU_FS_64K_LS) */
|