From: Peter Zijlstra <a.p.zijlstra@chello.nl>
To: linux-kernel@vger.kernel.org, Ingo Molnar <mingo@elte.hu>,
Thomas Gleixner <tglx@linutronix.de>
Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>,
Oleg Nesterov <oleg@tv-sign.ru>,
Steven Rostedt <rostedt@goodmis.org>,
Christoph Lameter <clameter@sgi.com>,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: [PATCH -rt 3/5] asm/local.h cmpxchg
Date: Sat, 14 Jul 2007 19:57:36 +0200 [thread overview]
Message-ID: <20070714175839.921317000@chello.nl> (raw)
In-Reply-To: 20070714175733.194012000@chello.nl
[-- Attachment #1: local.patch --]
[-- Type: text/plain, Size: 4307 bytes --]
From: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
include/asm-generic/local.h | 25 +++++++++++++++++++++++--
include/asm-i386/local.h | 13 +++++++++++++
include/asm-x86_64/local.h | 16 ++++++++++++++++
3 files changed, 52 insertions(+), 2 deletions(-)
Index: linux-2.6.22-rc6-mm1/include/asm-generic/local.h
===================================================================
--- linux-2.6.22-rc6-mm1.orig/include/asm-generic/local.h 2007-07-12 19:44:18.000000000 -0700
+++ linux-2.6.22-rc6-mm1/include/asm-generic/local.h 2007-07-12 19:44:57.000000000 -0700
@@ -46,13 +46,34 @@ typedef struct
#define local_add_unless(l, a, u) atomic_long_add_unless((&(l)->a), (a), (u))
#define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
-/* Non-atomic variants, ie. preemption disabled and won't be touched
- * in interrupt, etc. Some archs can optimize this case well. */
+/*
+ * Establish a state necessary for __local_xx functions to work.
+ */
+#define __local_begin(flags) local_irq_disable(flags)
+
+static inline void __local_end(unsigned long flags)
+{
+ local_irq_restore(flags);
+}
+
+/*
+ * Non-atomic variants, ie. within local_begin() / local_end() or
+ * preempt_disable / enable() and won't be touched in interrupt, etc.
+ * Some archs can optimize this case well.
+ */
#define __local_inc(l) local_set((l), local_read(l) + 1)
#define __local_dec(l) local_set((l), local_read(l) - 1)
#define __local_add(i,l) local_set((l), local_read(l) + (i))
#define __local_sub(i,l) local_set((l), local_read(l) - (i))
+#define __local_cmpxchg((v), (o), (n)) (*(v) = (n), (o))
+#define __local_xchg((v), (n)) \
+({ \
+ __typeof(v) x = *(v); \
+ *(v) = (n); \
+ x; \
+)}
+
/* Use these for per-cpu local_t variables: on some archs they are
* much more efficient than these naive implementations. Note they take
* a variable (eg. mystruct.foo), not an address.
Index: linux-2.6.22-rc6-mm1/include/asm-x86_64/local.h
===================================================================
--- linux-2.6.22-rc6-mm1.orig/include/asm-x86_64/local.h 2007-07-12 19:44:18.000000000 -0700
+++ linux-2.6.22-rc6-mm1/include/asm-x86_64/local.h 2007-07-12 19:44:57.000000000 -0700
@@ -9,6 +9,7 @@ typedef struct
atomic_long_t a;
} local_t;
+
#define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
#define local_read(l) atomic_long_read(&(l)->a)
@@ -181,11 +182,26 @@ static __inline__ long local_sub_return(
/* On x86-64 these are better than the atomic variants on SMP kernels
because they dont use a lock prefix. */
+
+#define __local_begin(__flags) \
+{ \
+ (__flags) = 0; \
+ preempt_disable(); \
+}
+
+static inline void __local_end(unsigned long flags) {
+ preempt_enable();
+}
+
#define __local_inc(l) local_inc(l)
#define __local_dec(l) local_dec(l)
#define __local_add(i,l) local_add((i),(l))
#define __local_sub(i,l) local_sub((i),(l))
+#define __local_cmpxchg cmpxchg_local
+#define __local_xchg xchg
+
+
/* Use these for per-cpu local_t variables: on some archs they are
* much more efficient than these naive implementations. Note they take
* a variable, not an address.
Index: linux-2.6.22-rc6-mm1/include/asm-i386/local.h
===================================================================
--- linux-2.6.22-rc6-mm1.orig/include/asm-i386/local.h 2007-07-12 19:53:00.000000000 -0700
+++ linux-2.6.22-rc6-mm1/include/asm-i386/local.h 2007-07-12 19:55:22.000000000 -0700
@@ -194,12 +194,25 @@ static __inline__ long local_sub_return(
})
#define local_inc_not_zero(l) local_add_unless((l), 1, 0)
+#define __local_begin(__flags) \
+{ \
+ (__flags) = 0; \
+ preempt_disable(); \
+}
+
+static inline void __local_end(unsigned long flags) {
+ preempt_enable();
+}
+
/* On x86, these are no better than the atomic variants. */
#define __local_inc(l) local_inc(l)
#define __local_dec(l) local_dec(l)
#define __local_add(i,l) local_add((i),(l))
#define __local_sub(i,l) local_sub((i),(l))
+#define __local_cmpxchg cmpxchg_local
+#define __local_xchg xchg
+
/* Use these for per-cpu local_t variables: on some archs they are
* much more efficient than these naive implementations. Note they take
* a variable, not an address.
--
next prev parent reply other threads:[~2007-07-14 16:02 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-14 17:57 [PATCH -rt 0/5] making SLUB -rt friendly Peter Zijlstra
2007-07-14 17:57 ` [PATCH -rt 1/5] workqueue: queue_work_cpu Peter Zijlstra
2007-07-14 17:14 ` Oleg Nesterov
2007-07-14 18:00 ` Peter Zijlstra
2007-07-14 17:57 ` [PATCH -rt 2/5] Thread Migration Preemption - v2 Peter Zijlstra
2007-07-14 16:49 ` Mathieu Desnoyers
2007-07-14 17:16 ` Oleg Nesterov
2007-07-14 17:34 ` Peter Zijlstra
2007-07-14 18:44 ` Peter Zijlstra
2007-07-14 19:07 ` Peter Zijlstra
2007-07-14 20:39 ` Mathieu Desnoyers
2007-07-14 20:48 ` Oleg Nesterov
2007-07-14 20:53 ` Peter Zijlstra
2007-07-14 17:57 ` Peter Zijlstra [this message]
2007-07-14 16:52 ` [PATCH -rt 3/5] asm/local.h cmpxchg Daniel Walker
2007-07-14 17:14 ` Mathieu Desnoyers
2007-07-14 17:31 ` Peter Zijlstra
2007-07-14 18:33 ` Mathieu Desnoyers
2007-07-14 17:57 ` [PATCH -rt 4/5] use migrate_disable for __local_begin Peter Zijlstra
2007-07-14 17:16 ` Mathieu Desnoyers
2007-07-14 17:32 ` Peter Zijlstra
2007-07-14 18:35 ` Mathieu Desnoyers
2007-07-14 18:41 ` Peter Zijlstra
2007-07-14 18:52 ` Mathieu Desnoyers
2007-07-14 17:57 ` [PATCH -rt 5/5] slub: -rt port Peter Zijlstra
2007-07-14 17:39 ` Oleg Nesterov
2007-07-14 17:50 ` Peter Zijlstra
2007-07-14 19:38 ` Oleg Nesterov
2007-07-14 19:49 ` Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070714175839.921317000@chello.nl \
--to=a.p.zijlstra@chello.nl \
--cc=clameter@sgi.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@polymtl.ca \
--cc=mingo@elte.hu \
--cc=oleg@tv-sign.ru \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).