slab debug and ARCH_SLAB_MINALIGN don't get along
PATCH 1/1 slab debug and ARCH_SLAB_MINALIGN don't get along
When CONFIG_SLAB_DEBUG is used in combination with ARCH_SLAB_MINALIGN, some debug flags should be disabled which depend on BYTES_PER_WORD alignment.
The disabling of these debug flags is not properly handled when BYTES_PER_WORD < ARCH_SLAB_MEMALIGN < cache_line_size()
This patch fixes that and also adds an alignment check to cache_alloc_debugcheck_after() when ARCH_SLAB_MINALIGN is used.
--- mm/slab.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-)
mm/slab.c +11 -6
@@ -2197,18 +2197,17 @@ #endifif (flags &SLAB_RED_ZONE || flags &SLAB_STORE_USER ) ralign =BYTES_PER_WORD ; -/* 2) arch mandated alignment: disables debug if necessary */ +/* 2) arch mandated alignment */ if (ralign <ARCH_SLAB_MINALIGN ) { ralign =ARCH_SLAB_MINALIGN ; -if (ralign >BYTES_PER_WORD ) - flags &= ~(SLAB_RED_ZONE |SLAB_STORE_USER ); } -/* 3) caller mandated alignment: disables debug if necessary */ +/* 3) caller mandated alignment */ if (ralign < align) { ralign = align; -if (ralign >BYTES_PER_WORD ) - flags &= ~(SLAB_RED_ZONE |SLAB_STORE_USER ); } +/* disable deubg if necessary */ +if (ralign >BYTES_PER_WORD ) + flags &= ~(SLAB_RED_ZONE |SLAB_STORE_USER );/* * 4) Store it. */
@@ -3063,6 +3062,12 @@ #endif cachep->ctor(objp, cachep, ctor_flags); } +#if ARCH_SLAB_MINALIGN +if ((u32 )objp & (ARCH_SLAB_MINALIGN -1 )) { +printk (KERN_ERR "0x%p: not aligned to ARCH_SLAB_MINALIGN=%d\n" , + objp,ARCH_SLAB_MINALIGN ); + } +#endif return objp; }#else
Signature · 1 line
1.4.2
Hi Kevin,
Quoted 9 lines · Kevin Hilman
When
CONFIG_SLAB_DEBUGis used in combination withARCH_SLAB_MINALIGN, some debug flags should be disabled which depend onBYTES_PER_WORDalignment.The disabling of these debug flags is not properly handled when
BYTES_PER_WORD<ARCH_SLAB_MEMALIGN<cache_line_size()This patch fixes that and also adds an alignment check to
cache_alloc_debugcheck_after()whenARCH_SLAB_MINALIGNis used.
You forgot to mention which case you are fixing in the patch description (that is, SLAB_HWCACHE_ALIGN, when cache_line_size() > BYTES_PER_WORD) which made the patch bit hard to decipher. Anyway, looks good, thanks!
Pekka
Quoted 8 lines · Pekka Enberg
Quoted 7 lines · Kevin Hilman
When
CONFIG_SLAB_DEBUGis used in combination withARCH_SLAB_MINALIGN, some debug flags should be disabled which depend onBYTES_PER_WORDalignment.The disabling of these debug flags is not properly handled when
BYTES_PER_WORD<ARCH_SLAB_MEMALIGN<cache_line_size()
Quoted 7 lines
Quoted 2 lines
This patch fixes that and also adds an alignment check to
cache_alloc_debugcheck_after()whenARCH_SLAB_MINALIGNis used.You forgot to mention which case you are fixing in the patch description (that is,
SLAB_HWCACHE_ALIGN, whencache_line_size()>BYTES_PER_WORD) which made the patch bit hard to decipher. Anyway, looks good, thanks!
Hi Pekka,
I found this on an ARM platform where ARCH_SLAB_MINALIGN=8, and the default SLAB_HWCACHE_ALIGN is set also.
The ARM EABI requires 8-byte alignment to take full advantage of 8-byte loads/stores for ARM arch >= v5.
Kevin