leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[IA64] make mmu_context.h and tlb.c 80-column friendly

Browse Source 
wrap_mmu_context(), delayed_tlb_flush(), get_mmu_context() all
have an extra { } block which cause one extra indentation.
get_mmu_context() is particularly bad with 5 indentations to
the most inner "if".  It finally gets on my nerve that I can't
keep the code within 80 columns.  Remove the extra { } block
and while I'm at it, reformat all the comments to 80-column
friendly.  No functional change at all with this patch.

Signed-off-by: Ken Chen <kenneth.w.chen@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
Chen, Kenneth W 2005-10-29 18:47:04 -07:00 committed by Tony Luck
parent dcc17d1bae
commit 58cd908299
2 changed files with 59 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
arch/ia64/mm/tlb.c
View File

@ -29,7 +29,7 @@
static struct { static struct {
unsigned long mask; /* mask of supported purge page-sizes */ unsigned long mask; /* mask of supported purge page-sizes */
unsigned long max_bits; /* log2() of largest supported purge page-size */ unsigned long max_bits; /* log2 of largest supported purge page-size */
} purge; } purge;
struct ia64_ctx ia64_ctx = { struct ia64_ctx ia64_ctx = {
@ -58,7 +58,7 @@ mmu_context_init (void)
void void
wrap_mmu_context (struct mm_struct *mm) wrap_mmu_context (struct mm_struct *mm)
{ {
int i; int i, cpu;
unsigned long flush_bit; unsigned long flush_bit;
for (i=0; i <= ia64_ctx.max_ctx / BITS_PER_LONG; i++) { for (i=0; i <= ia64_ctx.max_ctx / BITS_PER_LONG; i++) {
@ -72,20 +72,21 @@ wrap_mmu_context (struct mm_struct *mm)
ia64_ctx.limit = find_next_bit(ia64_ctx.bitmap, ia64_ctx.limit = find_next_bit(ia64_ctx.bitmap,
ia64_ctx.max_ctx, ia64_ctx.next); ia64_ctx.max_ctx, ia64_ctx.next);
/* can't call flush_tlb_all() here because of race condition with O(1) scheduler [EF] */ /*
{ * can't call flush_tlb_all() here because of race condition
int cpu = get_cpu(); /* prevent preemption/migration */ * with O(1) scheduler [EF]
for_each_online_cpu(i) { */
if (i != cpu) cpu = get_cpu(); /* prevent preemption/migration */
per_cpu(ia64_need_tlb_flush, i) = 1; for_each_online_cpu(i)
} if (i != cpu)
put_cpu(); per_cpu(ia64_need_tlb_flush, i) = 1;
} put_cpu();
local_flush_tlb_all(); local_flush_tlb_all();
} }
void void
ia64_global_tlb_purge (struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long nbits) ia64_global_tlb_purge (struct mm_struct *mm, unsigned long start,
unsigned long end, unsigned long nbits)
{ {
static DEFINE_SPINLOCK(ptcg_lock); static DEFINE_SPINLOCK(ptcg_lock);
@ -133,7 +134,8 @@ local_flush_tlb_all (void)
} }
void void
flush_tlb_range (struct vm_area_struct *vma, unsigned long start, unsigned long end) flush_tlb_range (struct vm_area_struct *vma, unsigned long start,
unsigned long end)
{ {
struct mm_struct *mm = vma->vm_mm; struct mm_struct *mm = vma->vm_mm;
unsigned long size = end - start; unsigned long size = end - start;
@ -147,7 +149,8 @@ flush_tlb_range (struct vm_area_struct *vma, unsigned long start, unsigned long
#endif #endif
nbits = ia64_fls(size + 0xfff); nbits = ia64_fls(size + 0xfff);
while (unlikely (((1UL << nbits) & purge.mask) == 0) && (nbits < purge.max_bits)) while (unlikely (((1UL << nbits) & purge.mask) == 0) &&
(nbits < purge.max_bits))
++nbits; ++nbits;
if (nbits > purge.max_bits) if (nbits > purge.max_bits)
nbits = purge.max_bits; nbits = purge.max_bits;
@ -189,5 +192,5 @@ ia64_tlb_init (void)
local_cpu_data->ptce_stride[0] = ptce_info.stride[0]; local_cpu_data->ptce_stride[0] = ptce_info.stride[0];
local_cpu_data->ptce_stride[1] = ptce_info.stride[1]; local_cpu_data->ptce_stride[1] = ptce_info.stride[1];
local_flush_tlb_all(); /* nuke left overs from bootstrapping... */ local_flush_tlb_all(); /* nuke left overs from bootstrapping... */
} }

80
include/asm-ia64/mmu_context.h
View File

@ -7,12 +7,13 @@
*/ */
/* /*
* Routines to manage the allocation of task context numbers. Task context numbers are * Routines to manage the allocation of task context numbers. Task context
* used to reduce or eliminate the need to perform TLB flushes due to context switches. * numbers are used to reduce or eliminate the need to perform TLB flushes
* Context numbers are implemented using ia-64 region ids. Since the IA-64 TLB does not * due to context switches. Context numbers are implemented using ia-64
* consider the region number when performing a TLB lookup, we need to assign a unique * region ids. Since the IA-64 TLB does not consider the region number when
* region id to each region in a process. We use the least significant three bits in a * performing a TLB lookup, we need to assign a unique region id to each
* region id for this purpose. * region in a process. We use the least significant three bits in aregion
* id for this purpose.
*/ */
#define IA64_REGION_ID_KERNEL 0 /* the kernel's region id (tlb.c depends on this being 0) */ #define IA64_REGION_ID_KERNEL 0 /* the kernel's region id (tlb.c depends on this being 0) */
@ -51,10 +52,10 @@ enter_lazy_tlb (struct mm_struct *mm, struct task_struct *tsk)
} }
/* /*
* When the context counter wraps around all TLBs need to be flushed because an old * When the context counter wraps around all TLBs need to be flushed because
* context number might have been reused. This is signalled by the ia64_need_tlb_flush * an old context number might have been reused. This is signalled by the
* per-CPU variable, which is checked in the routine below. Called by activate_mm(). * ia64_need_tlb_flush per-CPU variable, which is checked in the routine
* <efocht@ess.nec.de> * below. Called by activate_mm(). <efocht@ess.nec.de>
*/ */
static inline void static inline void
delayed_tlb_flush (void) delayed_tlb_flush (void)
@ -64,11 +65,9 @@ delayed_tlb_flush (void)
if (unlikely(__ia64_per_cpu_var(ia64_need_tlb_flush))) { if (unlikely(__ia64_per_cpu_var(ia64_need_tlb_flush))) {
spin_lock_irqsave(&ia64_ctx.lock, flags); spin_lock_irqsave(&ia64_ctx.lock, flags);
{ if (__ia64_per_cpu_var(ia64_need_tlb_flush)) {
if (__ia64_per_cpu_var(ia64_need_tlb_flush)) { local_flush_tlb_all();
local_flush_tlb_all(); __ia64_per_cpu_var(ia64_need_tlb_flush) = 0;
__ia64_per_cpu_var(ia64_need_tlb_flush) = 0;
}
} }
spin_unlock_irqrestore(&ia64_ctx.lock, flags); spin_unlock_irqrestore(&ia64_ctx.lock, flags);
} }
@ -80,27 +79,27 @@ get_mmu_context (struct mm_struct *mm)
unsigned long flags; unsigned long flags;
nv_mm_context_t context = mm->context; nv_mm_context_t context = mm->context;
if (unlikely(!context)) { if (likely(context))
spin_lock_irqsave(&ia64_ctx.lock, flags); goto out;
{
/* re-check, now that we've got the lock: */ spin_lock_irqsave(&ia64_ctx.lock, flags);
context = mm->context; /* re-check, now that we've got the lock: */
if (context == 0) { context = mm->context;
cpus_clear(mm->cpu_vm_mask); if (context == 0) {
if (ia64_ctx.next >= ia64_ctx.limit) { cpus_clear(mm->cpu_vm_mask);
ia64_ctx.next = find_next_zero_bit(ia64_ctx.bitmap, if (ia64_ctx.next >= ia64_ctx.limit) {
ia64_ctx.max_ctx, ia64_ctx.next); ia64_ctx.next = find_next_zero_bit(ia64_ctx.bitmap,
ia64_ctx.limit = find_next_bit(ia64_ctx.bitmap, ia64_ctx.max_ctx, ia64_ctx.next);
ia64_ctx.max_ctx, ia64_ctx.next); ia64_ctx.limit = find_next_bit(ia64_ctx.bitmap,
if (ia64_ctx.next >= ia64_ctx.max_ctx) ia64_ctx.max_ctx, ia64_ctx.next);
wrap_mmu_context(mm); if (ia64_ctx.next >= ia64_ctx.max_ctx)
} wrap_mmu_context(mm);
mm->context = context = ia64_ctx.next++;
__set_bit(context, ia64_ctx.bitmap);
}
} }
spin_unlock_irqrestore(&ia64_ctx.lock, flags); mm->context = context = ia64_ctx.next++;
__set_bit(context, ia64_ctx.bitmap);
} }
spin_unlock_irqrestore(&ia64_ctx.lock, flags);
out:
/* /*
* Ensure we're not starting to use "context" before any old * Ensure we're not starting to use "context" before any old
* uses of it are gone from our TLB. * uses of it are gone from our TLB.
@ -111,8 +110,8 @@ get_mmu_context (struct mm_struct *mm)
} }
/* /*
* Initialize context number to some sane value. MM is guaranteed to be a brand-new * Initialize context number to some sane value. MM is guaranteed to be a
* address-space, so no TLB flushing is needed, ever. * brand-new address-space, so no TLB flushing is needed, ever.
*/ */
static inline int static inline int
init_new_context (struct task_struct *p, struct mm_struct *mm) init_new_context (struct task_struct *p, struct mm_struct *mm)
@ -173,7 +172,10 @@ activate_context (struct mm_struct *mm)
if (!cpu_isset(smp_processor_id(), mm->cpu_vm_mask)) if (!cpu_isset(smp_processor_id(), mm->cpu_vm_mask))
cpu_set(smp_processor_id(), mm->cpu_vm_mask); cpu_set(smp_processor_id(), mm->cpu_vm_mask);
reload_context(context); reload_context(context);
/* in the unlikely event of a TLB-flush by another thread, redo the load: */ /*
* in the unlikely event of a TLB-flush by another thread,
* redo the load.
*/
} while (unlikely(context != mm->context)); } while (unlikely(context != mm->context));
} }
@ -186,8 +188,8 @@ static inline void
activate_mm (struct mm_struct *prev, struct mm_struct *next) activate_mm (struct mm_struct *prev, struct mm_struct *next)
{ {
/* /*
* We may get interrupts here, but that's OK because interrupt handlers cannot * We may get interrupts here, but that's OK because interrupt
* touch user-space. * handlers cannot touch user-space.
*/ */
ia64_set_kr(IA64_KR_PT_BASE, __pa(next->pgd)); ia64_set_kr(IA64_KR_PT_BASE, __pa(next->pgd));
activate_context(next); activate_context(next);