From: Christoph Lameter <cl@linux.com>
To: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: David Rientjes <rientjes@google.com>,
linux-mm@kvack.org, Eric Dumazet <eric.dumazet@gmail.com>,
"H. Peter Anvin" <hpa@zytor.com>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Subject: [slubll1 01/19] percpu: Fixup __this_cpu_xchg* operations
Date: Wed, 30 Mar 2011 15:23:43 -0500 [thread overview]
Message-ID: <20110330202415.596399815@linux.com> (raw)
In-Reply-To: 20110330202342.669400887@linux.com
[-- Attachment #1: fixup_xchg --]
[-- Type: text/plain, Size: 2752 bytes --]
Somehow we got into a situation where the __this_cpu_xchg() operations were
not defined in the same way as this_cpu_xchg() and friends. I had some build
failures under 32 bit compiles that were addressed by these fixes.
Signed-off-by: Christoph Lameter <cl@linux.com>
---
arch/x86/include/asm/percpu.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
Index: linux-2.6/arch/x86/include/asm/percpu.h
===================================================================
--- linux-2.6.orig/arch/x86/include/asm/percpu.h 2011-03-30 14:09:28.000000000 -0500
+++ linux-2.6/arch/x86/include/asm/percpu.h 2011-03-30 14:10:16.000000000 -0500
@@ -388,12 +388,9 @@ do { \
#define __this_cpu_xor_1(pcp, val) percpu_to_op("xor", (pcp), val)
#define __this_cpu_xor_2(pcp, val) percpu_to_op("xor", (pcp), val)
#define __this_cpu_xor_4(pcp, val) percpu_to_op("xor", (pcp), val)
-/*
- * Generic fallback operations for __this_cpu_xchg_[1-4] are okay and much
- * faster than an xchg with forced lock semantics.
- */
-#define __this_cpu_xchg_8(pcp, nval) percpu_xchg_op(pcp, nval)
-#define __this_cpu_cmpxchg_8(pcp, oval, nval) percpu_cmpxchg_op(pcp, oval, nval)
+#define __this_cpu_xchg_1(pcp, val) percpu_xchg_op(pcp, val)
+#define __this_cpu_xchg_2(pcp, val) percpu_xchg_op(pcp, val)
+#define __this_cpu_xchg_4(pcp, val) percpu_xchg_op(pcp, val)
#define this_cpu_read_1(pcp) percpu_from_op("mov", (pcp), "m"(pcp))
#define this_cpu_read_2(pcp) percpu_from_op("mov", (pcp), "m"(pcp))
@@ -471,6 +468,7 @@ do { \
#define __this_cpu_cmpxchg_double_4(pcp1, pcp2, o1, o2, n1, n2) percpu_cmpxchg8b_double(pcp1, o1, o2, n1, n2)
#define this_cpu_cmpxchg_double_4(pcp1, pcp2, o1, o2, n1, n2) percpu_cmpxchg8b_double(pcp1, o1, o2, n1, n2)
#define irqsafe_cpu_cmpxchg_double_4(pcp1, pcp2, o1, o2, n1, n2) percpu_cmpxchg8b_double(pcp1, o1, o2, n1, n2)
+
#endif /* CONFIG_X86_CMPXCHG64 */
/*
@@ -485,6 +483,8 @@ do { \
#define __this_cpu_or_8(pcp, val) percpu_to_op("or", (pcp), val)
#define __this_cpu_xor_8(pcp, val) percpu_to_op("xor", (pcp), val)
#define __this_cpu_add_return_8(pcp, val) percpu_add_return_op(pcp, val)
+#define __this_cpu_xchg_8(pcp, nval) percpu_xchg_op(pcp, nval)
+#define __this_cpu_cmpxchg_8(pcp, oval, nval) percpu_cmpxchg_op(pcp, oval, nval)
#define this_cpu_read_8(pcp) percpu_from_op("mov", (pcp), "m"(pcp))
#define this_cpu_write_8(pcp, val) percpu_to_op("mov", (pcp), val)
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2011-03-30 20:24 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-30 20:23 [slubll1 00/19] SLUB: Implement mostly lockless slowpaths Christoph Lameter
2011-03-30 20:23 ` Christoph Lameter [this message]
2011-03-30 20:23 ` [slubll1 02/19] slub: get_map() function to establish map of free objects in a slab Christoph Lameter
2011-03-30 20:23 ` [slubll1 03/19] slub: Eliminate repeated use of c->page through a new page variable Christoph Lameter
2011-03-30 20:23 ` [slubll1 04/19] slub: Move node determination out of hotpath Christoph Lameter
2011-03-30 20:23 ` [slubll1 05/19] slub: Move debug handlign in __slab_free Christoph Lameter
2011-03-30 20:23 ` [slubll1 06/19] slub: Do not use frozen page flag but a bit in the page counters Christoph Lameter
2011-03-30 20:23 ` [slubll1 07/19] slub: Move page->frozen handling near where the page->freelist handling occurs Christoph Lameter
2011-03-30 20:23 ` [slubll1 08/19] x86: Add support for cmpxchg_double Christoph Lameter
2011-03-30 20:23 ` [slubll1 09/19] mm: Rearrange struct page Christoph Lameter
2011-03-30 20:23 ` [slubll1 10/19] slub: Add cmpxchg_double_slab() Christoph Lameter
2011-03-30 20:23 ` [slubll1 11/19] slub: explicit list_lock taking Christoph Lameter
2011-03-30 20:23 ` [slubll1 12/19] slub: Pass kmem_cache struct to lock and freeze slab Christoph Lameter
2011-03-30 20:23 ` [slubll1 13/19] slub: Rework allocator fastpaths Christoph Lameter
2011-03-30 20:23 ` [slubll1 14/19] slub: Invert locking and avoid slab lock Christoph Lameter
2011-03-30 20:23 ` [slubll1 15/19] slub: Disable interrupts in free_debug processing Christoph Lameter
2011-03-30 20:23 ` [slubll1 16/19] slub: Avoid disabling interrupts in free slowpath Christoph Lameter
2011-03-30 20:23 ` [slubll1 17/19] slub: Get rid of the another_slab label Christoph Lameter
2011-03-30 20:24 ` [slubll1 18/19] slub: fast release on full slab Christoph Lameter
2011-03-30 20:24 ` [slubll1 19/19] slub: Not necessary to check for empty slab on load_freelist Christoph Lameter
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=20110330202415.596399815@linux.com \
--to=cl@linux.com \
--cc=eric.dumazet@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-mm@kvack.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=penberg@cs.helsinki.fi \
--cc=rientjes@google.com \
/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).