lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86, bts: remove recursion from get_context

Browse Source 
Impact: cleanup

Optimistically allocate a DS context. It is extremely unlikely that
one already existed. This simplifies the code a lot.

Signed-off-by: Markus Metzger <markus.t.metzger@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Markus Metzger
2008-12-16 15:51:03 +01:00
committed by Ingo Molnar
parent 9dfc3bc7d2
commit cc1dc6d039
1 changed files with 28 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
arch/x86/kernel/ds.c
View File

@@ -232,53 +232,45 @@ static DEFINE_PER_CPU(struct ds_context *, system_context_array);
#define system_context per_cpu(system_context_array, smp_processor_id()) #define system_context per_cpu(system_context_array, smp_processor_id())
static struct ds_context *ds_get_context(struct task_struct *task)
static inline struct ds_context *ds_get_context(struct task_struct *task)
{ {
struct ds_context **p_context = struct ds_context **p_context =
(task ? &task->thread.ds_ctx : &system_context); (task ? &task->thread.ds_ctx : &system_context);
struct ds_context *context = *p_context; struct ds_context *context = NULL;
struct ds_context *new_context = NULL;
unsigned long irq; unsigned long irq;
if (!context) { /* Chances are small that we already have a context. */
context = kzalloc(sizeof(*context), GFP_KERNEL); new_context = kzalloc(sizeof(*new_context), GFP_KERNEL);
if (!context) if (!new_context)
return NULL; return NULL;
spin_lock_irqsave(&ds_lock, irq); spin_lock_irqsave(&ds_lock, irq);
if (*p_context) {
kfree(context);
context = *p_context; context = *p_context;
} else { if (!context) {
*p_context = context; context = new_context;
context->this = p_context; context->this = p_context;
context->task = task; context->task = task;
context->count = 0;
if (task) if (task)
set_tsk_thread_flag(task, TIF_DS_AREA_MSR); set_tsk_thread_flag(task, TIF_DS_AREA_MSR);
if (!task || (task == current)) if (!task || (task == current))
wrmsrl(MSR_IA32_DS_AREA, wrmsrl(MSR_IA32_DS_AREA, (unsigned long)context->ds);
(unsigned long)context->ds);
*p_context = context;
} }
context->count++; context->count++;
spin_unlock_irqrestore(&ds_lock, irq); spin_unlock_irqrestore(&ds_lock, irq);
} else {
spin_lock_irqsave(&ds_lock, irq);
context = *p_context; if (context != new_context)
if (context) kfree(new_context);
context->count++;
spin_unlock_irqrestore(&ds_lock, irq);
if (!context)
context = ds_get_context(task);
}
return context; return context;
} }