linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] slub: always align cpu_slab to honor cmpxchg_double requirement
@ 2011-06-02 14:19 Chris Metcalf
  2011-06-02 17:16 ` David Rientjes
  0 siblings, 1 reply; 8+ messages in thread
From: Chris Metcalf @ 2011-06-02 14:19 UTC (permalink / raw)
  To: Tejun Heo, Christoph Lameter, Pekka Enberg, Matt Mackall,
	linux-kernel, linux-mm

On an architecture without CMPXCHG_LOCAL but with DEBUG_VM enabled,
the VM_BUG_ON() in __pcpu_double_call_return_bool() will cause an early
panic during boot unless we always align cpu_slab properly.

In principle we could remove the alignment-testing VM_BUG_ON() for
architectures that don't have CMPXCHG_LOCAL, but leaving it in means
that new code will tend not to break x86 even if it is introduced
on another platform, and it's low cost to require alignment.

Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
---
This needs to be pushed for 3.0 to allow arch/tile to boot.
I'm happy to push it but I assume it would be better coming
from an mm or percpu tree.  Thanks!

 include/linux/percpu.h |    3 +++
 mm/slub.c              |   12 ++++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/include/linux/percpu.h b/include/linux/percpu.h
index 8b97308..9ca008f 100644
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@ -259,6 +259,9 @@ extern void __bad_size_call_parameter(void);
  * Special handling for cmpxchg_double.  cmpxchg_double is passed two
  * percpu variables.  The first has to be aligned to a double word
  * boundary and the second has to follow directly thereafter.
+ * We enforce this on all architectures even if they don't support
+ * a double cmpxchg instruction, since it's a cheap requirement, and it
+ * avoids breaking the requirement for architectures with the instruction.
  */
 #define __pcpu_double_call_return_bool(stem, pcp1, pcp2, ...)		\
 ({									\
diff --git a/mm/slub.c b/mm/slub.c
index 7be0223..35f351f 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2320,16 +2320,12 @@ static inline int alloc_kmem_cache_cpus(struct kmem_cache *s)
 	BUILD_BUG_ON(PERCPU_DYNAMIC_EARLY_SIZE <
 			SLUB_PAGE_SHIFT * sizeof(struct kmem_cache_cpu));
 
-#ifdef CONFIG_CMPXCHG_LOCAL
 	/*
-	 * Must align to double word boundary for the double cmpxchg instructions
-	 * to work.
+	 * Must align to double word boundary for the double cmpxchg
+	 * instructions to work; see __pcpu_double_call_return_bool().
 	 */
-	s->cpu_slab = __alloc_percpu(sizeof(struct kmem_cache_cpu), 2 * sizeof(void *));
-#else
-	/* Regular alignment is sufficient */
-	s->cpu_slab = alloc_percpu(struct kmem_cache_cpu);
-#endif
+	s->cpu_slab = __alloc_percpu(sizeof(struct kmem_cache_cpu),
+				     2 * sizeof(void *));
 
 	if (!s->cpu_slab)
 		return 0;
-- 
1.6.5.2

--
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>

^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-06-03 18:07 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-02 14:19 [PATCH] slub: always align cpu_slab to honor cmpxchg_double requirement Chris Metcalf
2011-06-02 17:16 ` David Rientjes
2011-06-02 18:13   ` Chris Metcalf
2011-06-03  5:49     ` Pekka Enberg
2011-06-03 14:06       ` Christoph Lameter
2011-06-03 14:33         ` Chris Metcalf
2011-06-03 14:41           ` Christoph Lameter
2011-06-03 18:06             ` Pekka Enberg

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).