| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20081216155103.A30039@sedona.ch.intel.com>
Date: Tue, 16 Dec 2008 15:51:03 +0100
From: Markus Metzger <markus.t.metzger@...el.com>
To: linux-kernel@...r.kernel.org, mingo@...e.hu, tglx@...utronix.de,
hpa@...or.com
Cc: markus.t.metzger@...el.com, markus.t.metzger@...il.com,
roland@...hat.com, eranian@...glemail.com
Subject: [patch 2/3] x86, bts: remove recursion from get_context
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@...el.com>
Reported-by: Ingo Molnar <mingo@...e.hu>
---
Index: ftrace/arch/x86/kernel/ds.c
===================================================================
--- ftrace.orig/arch/x86/kernel/ds.c 2008-12-12 14:02:24.000000000 +0100
+++ ftrace/arch/x86/kernel/ds.c 2008-12-12 16:25:22.000000000 +0100
@@ -232,53 +232,45 @@
#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 =
(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;
- if (!context) {
- context = kzalloc(sizeof(*context), GFP_KERNEL);
- if (!context)
- return NULL;
-
- spin_lock_irqsave(&ds_lock, irq);
-
- if (*p_context) {
- kfree(context);
+ /* Chances are small that we already have a context. */
+ new_context = kzalloc(sizeof(*new_context), GFP_KERNEL);
+ if (!new_context)
+ return NULL;
- context = *p_context;
- } else {
- *p_context = context;
+ spin_lock_irqsave(&ds_lock, irq);
- context->this = p_context;
- context->task = task;
+ context = *p_context;
+ if (!context) {
+ context = new_context;
- if (task)
- set_tsk_thread_flag(task, TIF_DS_AREA_MSR);
+ context->this = p_context;
+ context->task = task;
+ context->count = 0;
- if (!task || (task == current))
- wrmsrl(MSR_IA32_DS_AREA,
- (unsigned long)context->ds);
- }
+ if (task)
+ set_tsk_thread_flag(task, TIF_DS_AREA_MSR);
- context->count++;
+ if (!task || (task == current))
+ wrmsrl(MSR_IA32_DS_AREA, (unsigned long)context->ds);
- spin_unlock_irqrestore(&ds_lock, irq);
- } else {
- spin_lock_irqsave(&ds_lock, irq);
+ *p_context = context;
+ }
- context = *p_context;
- if (context)
- context->count++;
+ context->count++;
- spin_unlock_irqrestore(&ds_lock, irq);
+ spin_unlock_irqrestore(&ds_lock, irq);
- if (!context)
- context = ds_get_context(task);
- }
+ if (context != new_context)
+ kfree(new_context);
return context;
}
---------------------------------------------------------------------
Intel GmbH
Dornacher Strasse 1
85622 Feldkirchen/Muenchen Germany
Sitz der Gesellschaft: Feldkirchen bei Muenchen
Geschaeftsfuehrer: Douglas Lusk, Peter Gleissner, Hannes Schwaderer
Registergericht: Muenchen HRB 47456 Ust.-IdNr.
VAT Registration No.: DE129385895
Citibank Frankfurt (BLZ 502 109 00) 600119052
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists