![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>
254 lines
5.3 KiB
C
254 lines
5.3 KiB
C
/* Kernel module help for sparc64.
|
|
*
|
|
* Copyright (C) 2001 Rusty Russell.
|
|
* Copyright (C) 2002 David S. Miller.
|
|
*/
|
|
|
|
#include <linux/moduleloader.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/elf.h>
|
|
#include <linux/vmalloc.h>
|
|
#include <linux/fs.h>
|
|
#include <linux/gfp.h>
|
|
#include <linux/string.h>
|
|
#include <linux/ctype.h>
|
|
#include <linux/mm.h>
|
|
|
|
#include <asm/processor.h>
|
|
#include <asm/spitfire.h>
|
|
|
|
#ifdef CONFIG_SPARC64
|
|
static void *module_map(unsigned long size)
|
|
{
|
|
struct vm_struct *area;
|
|
|
|
size = PAGE_ALIGN(size);
|
|
if (!size || size > MODULES_LEN)
|
|
return NULL;
|
|
|
|
area = __get_vm_area(size, VM_ALLOC, MODULES_VADDR, MODULES_END);
|
|
if (!area)
|
|
return NULL;
|
|
|
|
return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL);
|
|
}
|
|
|
|
static char *dot2underscore(char *name)
|
|
{
|
|
return name;
|
|
}
|
|
#else
|
|
static void *module_map(unsigned long size)
|
|
{
|
|
return vmalloc(size);
|
|
}
|
|
|
|
/* Replace references to .func with _Func */
|
|
static char *dot2underscore(char *name)
|
|
{
|
|
if (name[0] == '.') {
|
|
name[0] = '_';
|
|
name[1] = toupper(name[1]);
|
|
}
|
|
return name;
|
|
}
|
|
#endif /* CONFIG_SPARC64 */
|
|
|
|
void *module_alloc(unsigned long size)
|
|
{
|
|
void *ret;
|
|
|
|
/* We handle the zero case fine, unlike vmalloc */
|
|
if (size == 0)
|
|
return NULL;
|
|
|
|
ret = module_map(size);
|
|
if (!ret)
|
|
ret = ERR_PTR(-ENOMEM);
|
|
else
|
|
memset(ret, 0, size);
|
|
|
|
return ret;
|
|
}
|
|
|
|
/* Free memory returned from module_core_alloc/module_init_alloc */
|
|
void module_free(struct module *mod, void *module_region)
|
|
{
|
|
vfree(module_region);
|
|
}
|
|
|
|
/* Make generic code ignore STT_REGISTER dummy undefined symbols. */
|
|
int module_frob_arch_sections(Elf_Ehdr *hdr,
|
|
Elf_Shdr *sechdrs,
|
|
char *secstrings,
|
|
struct module *mod)
|
|
{
|
|
unsigned int symidx;
|
|
Elf_Sym *sym;
|
|
char *strtab;
|
|
int i;
|
|
|
|
for (symidx = 0; sechdrs[symidx].sh_type != SHT_SYMTAB; symidx++) {
|
|
if (symidx == hdr->e_shnum-1) {
|
|
printk("%s: no symtab found.\n", mod->name);
|
|
return -ENOEXEC;
|
|
}
|
|
}
|
|
sym = (Elf_Sym *)sechdrs[symidx].sh_addr;
|
|
strtab = (char *)sechdrs[sechdrs[symidx].sh_link].sh_addr;
|
|
|
|
for (i = 1; i < sechdrs[symidx].sh_size / sizeof(Elf_Sym); i++) {
|
|
if (sym[i].st_shndx == SHN_UNDEF) {
|
|
if (ELF_ST_TYPE(sym[i].st_info) == STT_REGISTER) {
|
|
sym[i].st_shndx = SHN_ABS;
|
|
} else {
|
|
char *name = strtab + sym[i].st_name;
|
|
dot2underscore(name);
|
|
}
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
int apply_relocate(Elf_Shdr *sechdrs,
|
|
const char *strtab,
|
|
unsigned int symindex,
|
|
unsigned int relsec,
|
|
struct module *me)
|
|
{
|
|
printk(KERN_ERR "module %s: non-ADD RELOCATION unsupported\n",
|
|
me->name);
|
|
return -ENOEXEC;
|
|
}
|
|
|
|
int apply_relocate_add(Elf_Shdr *sechdrs,
|
|
const char *strtab,
|
|
unsigned int symindex,
|
|
unsigned int relsec,
|
|
struct module *me)
|
|
{
|
|
unsigned int i;
|
|
Elf_Rela *rel = (void *)sechdrs[relsec].sh_addr;
|
|
Elf_Sym *sym;
|
|
u8 *location;
|
|
u32 *loc32;
|
|
|
|
for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
|
|
Elf_Addr v;
|
|
|
|
/* This is where to make the change */
|
|
location = (u8 *)sechdrs[sechdrs[relsec].sh_info].sh_addr
|
|
+ rel[i].r_offset;
|
|
loc32 = (u32 *) location;
|
|
|
|
#ifdef CONFIG_SPARC64
|
|
BUG_ON(((u64)location >> (u64)32) != (u64)0);
|
|
#endif /* CONFIG_SPARC64 */
|
|
|
|
/* This is the symbol it is referring to. Note that all
|
|
undefined symbols have been resolved. */
|
|
sym = (Elf_Sym *)sechdrs[symindex].sh_addr
|
|
+ ELF_R_SYM(rel[i].r_info);
|
|
v = sym->st_value + rel[i].r_addend;
|
|
|
|
switch (ELF_R_TYPE(rel[i].r_info) & 0xff) {
|
|
#ifdef CONFIG_SPARC64
|
|
case R_SPARC_64:
|
|
location[0] = v >> 56;
|
|
location[1] = v >> 48;
|
|
location[2] = v >> 40;
|
|
location[3] = v >> 32;
|
|
location[4] = v >> 24;
|
|
location[5] = v >> 16;
|
|
location[6] = v >> 8;
|
|
location[7] = v >> 0;
|
|
break;
|
|
|
|
case R_SPARC_DISP32:
|
|
v -= (Elf_Addr) location;
|
|
*loc32 = v;
|
|
break;
|
|
|
|
case R_SPARC_WDISP19:
|
|
v -= (Elf_Addr) location;
|
|
*loc32 = (*loc32 & ~0x7ffff) |
|
|
((v >> 2) & 0x7ffff);
|
|
break;
|
|
|
|
case R_SPARC_OLO10:
|
|
*loc32 = (*loc32 & ~0x1fff) |
|
|
(((v & 0x3ff) +
|
|
(ELF_R_TYPE(rel[i].r_info) >> 8))
|
|
& 0x1fff);
|
|
break;
|
|
#endif /* CONFIG_SPARC64 */
|
|
|
|
case R_SPARC_32:
|
|
case R_SPARC_UA32:
|
|
location[0] = v >> 24;
|
|
location[1] = v >> 16;
|
|
location[2] = v >> 8;
|
|
location[3] = v >> 0;
|
|
break;
|
|
|
|
case R_SPARC_WDISP30:
|
|
v -= (Elf_Addr) location;
|
|
*loc32 = (*loc32 & ~0x3fffffff) |
|
|
((v >> 2) & 0x3fffffff);
|
|
break;
|
|
|
|
case R_SPARC_WDISP22:
|
|
v -= (Elf_Addr) location;
|
|
*loc32 = (*loc32 & ~0x3fffff) |
|
|
((v >> 2) & 0x3fffff);
|
|
break;
|
|
|
|
case R_SPARC_LO10:
|
|
*loc32 = (*loc32 & ~0x3ff) | (v & 0x3ff);
|
|
break;
|
|
|
|
case R_SPARC_HI22:
|
|
*loc32 = (*loc32 & ~0x3fffff) |
|
|
((v >> 10) & 0x3fffff);
|
|
break;
|
|
|
|
default:
|
|
printk(KERN_ERR "module %s: Unknown relocation: %x\n",
|
|
me->name,
|
|
(int) (ELF_R_TYPE(rel[i].r_info) & 0xff));
|
|
return -ENOEXEC;
|
|
};
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_SPARC64
|
|
int module_finalize(const Elf_Ehdr *hdr,
|
|
const Elf_Shdr *sechdrs,
|
|
struct module *me)
|
|
{
|
|
/* Cheetah's I-cache is fully coherent. */
|
|
if (tlb_type == spitfire) {
|
|
unsigned long va;
|
|
|
|
flushw_all();
|
|
for (va = 0; va < (PAGE_SIZE << 1); va += 32)
|
|
spitfire_put_icache_tag(va, 0x0);
|
|
__asm__ __volatile__("flush %g6");
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
#else
|
|
int module_finalize(const Elf_Ehdr *hdr,
|
|
const Elf_Shdr *sechdrs,
|
|
struct module *me)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif /* CONFIG_SPARC64 */
|
|
|
|
void module_arch_cleanup(struct module *mod)
|
|
{
|
|
}
|