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>
213 lines
5.3 KiB
C
213 lines
5.3 KiB
C
/*
|
|
* Copyright 2004-2009 Analog Devices Inc.
|
|
*
|
|
* Licensed under the GPL-2 or later.
|
|
*/
|
|
|
|
#ifndef __BLACKFIN_MMU_CONTEXT_H__
|
|
#define __BLACKFIN_MMU_CONTEXT_H__
|
|
|
|
#include <linux/slab.h>
|
|
#include <linux/sched.h>
|
|
#include <asm/setup.h>
|
|
#include <asm/page.h>
|
|
#include <asm/pgalloc.h>
|
|
#include <asm/cplbinit.h>
|
|
#include <asm/sections.h>
|
|
|
|
/* Note: L1 stacks are CPU-private things, so we bluntly disable this
|
|
feature in SMP mode, and use the per-CPU scratch SRAM bank only to
|
|
store the PDA instead. */
|
|
|
|
extern void *current_l1_stack_save;
|
|
extern int nr_l1stack_tasks;
|
|
extern void *l1_stack_base;
|
|
extern unsigned long l1_stack_len;
|
|
|
|
extern int l1sram_free(const void*);
|
|
extern void *l1sram_alloc_max(void*);
|
|
|
|
static inline void free_l1stack(void)
|
|
{
|
|
nr_l1stack_tasks--;
|
|
if (nr_l1stack_tasks == 0)
|
|
l1sram_free(l1_stack_base);
|
|
}
|
|
|
|
static inline unsigned long
|
|
alloc_l1stack(unsigned long length, unsigned long *stack_base)
|
|
{
|
|
if (nr_l1stack_tasks == 0) {
|
|
l1_stack_base = l1sram_alloc_max(&l1_stack_len);
|
|
if (!l1_stack_base)
|
|
return 0;
|
|
}
|
|
|
|
if (l1_stack_len < length) {
|
|
if (nr_l1stack_tasks == 0)
|
|
l1sram_free(l1_stack_base);
|
|
return 0;
|
|
}
|
|
*stack_base = (unsigned long)l1_stack_base;
|
|
nr_l1stack_tasks++;
|
|
return l1_stack_len;
|
|
}
|
|
|
|
static inline int
|
|
activate_l1stack(struct mm_struct *mm, unsigned long sp_base)
|
|
{
|
|
if (current_l1_stack_save)
|
|
memcpy(current_l1_stack_save, l1_stack_base, l1_stack_len);
|
|
mm->context.l1_stack_save = current_l1_stack_save = (void*)sp_base;
|
|
memcpy(l1_stack_base, current_l1_stack_save, l1_stack_len);
|
|
return 1;
|
|
}
|
|
|
|
#define deactivate_mm(tsk,mm) do { } while (0)
|
|
|
|
#define activate_mm(prev, next) switch_mm(prev, next, NULL)
|
|
|
|
static inline void __switch_mm(struct mm_struct *prev_mm, struct mm_struct *next_mm,
|
|
struct task_struct *tsk)
|
|
{
|
|
#ifdef CONFIG_MPU
|
|
unsigned int cpu = smp_processor_id();
|
|
#endif
|
|
if (prev_mm == next_mm)
|
|
return;
|
|
#ifdef CONFIG_MPU
|
|
if (prev_mm->context.page_rwx_mask == current_rwx_mask[cpu]) {
|
|
flush_switched_cplbs(cpu);
|
|
set_mask_dcplbs(next_mm->context.page_rwx_mask, cpu);
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_APP_STACK_L1
|
|
/* L1 stack switching. */
|
|
if (!next_mm->context.l1_stack_save)
|
|
return;
|
|
if (next_mm->context.l1_stack_save == current_l1_stack_save)
|
|
return;
|
|
if (current_l1_stack_save) {
|
|
memcpy(current_l1_stack_save, l1_stack_base, l1_stack_len);
|
|
}
|
|
current_l1_stack_save = next_mm->context.l1_stack_save;
|
|
memcpy(l1_stack_base, current_l1_stack_save, l1_stack_len);
|
|
#endif
|
|
}
|
|
|
|
#ifdef CONFIG_IPIPE
|
|
#define lock_mm_switch(flags) local_irq_save_hw_cond(flags)
|
|
#define unlock_mm_switch(flags) local_irq_restore_hw_cond(flags)
|
|
#else
|
|
#define lock_mm_switch(flags) do { (void)(flags); } while (0)
|
|
#define unlock_mm_switch(flags) do { (void)(flags); } while (0)
|
|
#endif /* CONFIG_IPIPE */
|
|
|
|
#ifdef CONFIG_MPU
|
|
static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
|
|
struct task_struct *tsk)
|
|
{
|
|
unsigned long flags;
|
|
lock_mm_switch(flags);
|
|
__switch_mm(prev, next, tsk);
|
|
unlock_mm_switch(flags);
|
|
}
|
|
|
|
static inline void protect_page(struct mm_struct *mm, unsigned long addr,
|
|
unsigned long flags)
|
|
{
|
|
unsigned long *mask = mm->context.page_rwx_mask;
|
|
unsigned long page;
|
|
unsigned long idx;
|
|
unsigned long bit;
|
|
|
|
if (unlikely(addr >= ASYNC_BANK0_BASE && addr < ASYNC_BANK3_BASE + ASYNC_BANK3_SIZE))
|
|
page = (addr - (ASYNC_BANK0_BASE - _ramend)) >> 12;
|
|
else
|
|
page = addr >> 12;
|
|
idx = page >> 5;
|
|
bit = 1 << (page & 31);
|
|
|
|
if (flags & VM_READ)
|
|
mask[idx] |= bit;
|
|
else
|
|
mask[idx] &= ~bit;
|
|
mask += page_mask_nelts;
|
|
if (flags & VM_WRITE)
|
|
mask[idx] |= bit;
|
|
else
|
|
mask[idx] &= ~bit;
|
|
mask += page_mask_nelts;
|
|
if (flags & VM_EXEC)
|
|
mask[idx] |= bit;
|
|
else
|
|
mask[idx] &= ~bit;
|
|
}
|
|
|
|
static inline void update_protections(struct mm_struct *mm)
|
|
{
|
|
unsigned int cpu = smp_processor_id();
|
|
if (mm->context.page_rwx_mask == current_rwx_mask[cpu]) {
|
|
flush_switched_cplbs(cpu);
|
|
set_mask_dcplbs(mm->context.page_rwx_mask, cpu);
|
|
}
|
|
}
|
|
#else /* !CONFIG_MPU */
|
|
static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
|
|
struct task_struct *tsk)
|
|
{
|
|
__switch_mm(prev, next, tsk);
|
|
}
|
|
#endif
|
|
|
|
static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
|
|
{
|
|
}
|
|
|
|
/* Called when creating a new context during fork() or execve(). */
|
|
static inline int
|
|
init_new_context(struct task_struct *tsk, struct mm_struct *mm)
|
|
{
|
|
#ifdef CONFIG_MPU
|
|
unsigned long p = __get_free_pages(GFP_KERNEL, page_mask_order);
|
|
mm->context.page_rwx_mask = (unsigned long *)p;
|
|
memset(mm->context.page_rwx_mask, 0,
|
|
page_mask_nelts * 3 * sizeof(long));
|
|
#endif
|
|
return 0;
|
|
}
|
|
|
|
static inline void destroy_context(struct mm_struct *mm)
|
|
{
|
|
struct sram_list_struct *tmp;
|
|
#ifdef CONFIG_MPU
|
|
unsigned int cpu = smp_processor_id();
|
|
#endif
|
|
|
|
#ifdef CONFIG_APP_STACK_L1
|
|
if (current_l1_stack_save == mm->context.l1_stack_save)
|
|
current_l1_stack_save = 0;
|
|
if (mm->context.l1_stack_save)
|
|
free_l1stack();
|
|
#endif
|
|
|
|
while ((tmp = mm->context.sram_list)) {
|
|
mm->context.sram_list = tmp->next;
|
|
sram_free(tmp->addr);
|
|
kfree(tmp);
|
|
}
|
|
#ifdef CONFIG_MPU
|
|
if (current_rwx_mask[cpu] == mm->context.page_rwx_mask)
|
|
current_rwx_mask[cpu] = NULL;
|
|
free_pages((unsigned long)mm->context.page_rwx_mask, page_mask_order);
|
|
#endif
|
|
}
|
|
|
|
#define ipipe_mm_switch_protect(flags) \
|
|
local_irq_save_hw_cond(flags)
|
|
|
|
#define ipipe_mm_switch_unprotect(flags) \
|
|
local_irq_restore_hw_cond(flags)
|
|
|
|
#endif
|