fork: Honor task_struct's declared alignment
Subsystems (4)
PATCH 1/1 fork: Honor task_struct's declared alignment
Since commit cb7ca40a3882 ("x86/fpu: Make task_struct::thread constant size"), struct task_struct is declared __attribute__((aligned(64))) on all architectures.
But fork_init() still sets the task_struct slab cache's alignment to
align = max(L1_CACHE_BYTES, ARCH_MIN_TASKALIGN)
which is smaller than 64 on architectures whose cache lines are below 64 bytes: e.g. 32 on ARMv5.
In practice plain SLUB happens to hand out 64-byte-aligned objects anyway. With CONFIG_SLUB_DEBUG_ON the red-zone padding shifts objects to the requested alignment.
With CONFIG_UBSAN_ALIGNMENT=y a boot on QEMU versatilepb (ARM926EJ-S, v7.2-rc2, gcc 13.3) floods the console with reports like:
UBSAN: misaligned-access in include/linux/sched.h:2087:9 member access within misaligned address c295d7e0 for type 'struct task_struct' which requires 64 byte alignment CPU: 0 UID: 0 PID: 15 Comm: pr/ttyAMA-1 Not tainted 7.2.0-rc2 #1 VOLUNTARY
Set the slab alignment to at least the type's declared alignment.
--- kernel/fork.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/fork.c +2 -1
@@ -857,7 +857,8 @@ void __init fork_init(void)#ifndef ARCH_MIN_TASKALIGN #define ARCH_MIN_TASKALIGN 0#endif -int align =max_t (int,L1_CACHE_BYTES ,ARCH_MIN_TASKALIGN ); +int align =max3 (L1_CACHE_BYTES ,ARCH_MIN_TASKALIGN , + __alignof__(struct task_struct ));unsigned long useroffset, usersize;/* create a slab on which task_structs can be allocated */
Signature · 1 line
2.39.5 (Apple Git-154)
Quoted 18 lines
Since commit
cb7ca40a3882("x86/fpu: Maketask_struct::threadconstant size"), structtask_structis declared __attribute__((aligned(64))) on all architectures.But
fork_init()still sets thetask_structslab cache's alignment toalign =
max(L1_CACHE_BYTES, ARCH_MIN_TASKALIGN)which is smaller than 64 on architectures whose cache lines are below 64 bytes: e.g. 32 on ARMv5.
In practice plain SLUB happens to hand out 64-byte-aligned objects anyway. With
CONFIG_SLUB_DEBUG_ONthe red-zone padding shifts objects to the requested alignment.With
CONFIG_UBSAN_ALIGNMENT=ya boot on QEMU versatilepb (ARM926EJ-S, v7.2-rc2, gcc 13.3) floods the console with reports like:
Quoted 8 lines
UBSAN: misaligned-access in include/linux/sched.h:2087:9 member access within misaligned address c295d7e0 for type 'struct task_struct' which requires 64 byte alignment CPU: 0 UID: 0 PID: 15 Comm: pr/ttyAMA-1 Not tainted 7.2.0-rc2 #1 VOLUNTARYSet the slab alignment to at least the type's declared alignment.
Fixes cb7ca40a3882 ("x86/fpu: Make task_struct::thread constant size")
Nice!
Please add
Quoted 22 lines
Assisted-by Claude:claude-fable-5Signed-off-by Karl Mehltretter <[email protected]>--- kernel/fork.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)kernel/fork.c +2
-1@@ -857,7 +857,8 @@ void __init fork_init(void)#ifndef ARCH_MIN_TASKALIGN #define ARCH_MIN_TASKALIGN 0#endif -int align =max_t (int,L1_CACHE_BYTES ,ARCH_MIN_TASKALIGN ); +int align =max3 (L1_CACHE_BYTES ,ARCH_MIN_TASKALIGN , + __alignof__(struct task_struct ));unsigned long useroffset, usersize;/* create a slab on which task_structs can be allocated */ Signature · 1 line
2.39.5 (Apple Git-154)
Thanks!
Vlastimil Babka (SUSE)
reviewerQuoted 23 lines · Karl Mehltretter
Since commit
cb7ca40a3882("x86/fpu: Maketask_struct::threadconstant size"), structtask_structis declared __attribute__((aligned(64))) on all architectures.But
fork_init()still sets thetask_structslab cache's alignment toalign =
max(L1_CACHE_BYTES, ARCH_MIN_TASKALIGN)which is smaller than 64 on architectures whose cache lines are below 64 bytes: e.g. 32 on ARMv5.
In practice plain SLUB happens to hand out 64-byte-aligned objects anyway. With
CONFIG_SLUB_DEBUG_ONthe red-zone padding shifts objects to the requested alignment.With
CONFIG_UBSAN_ALIGNMENT=ya boot on QEMU versatilepb (ARM926EJ-S, v7.2-rc2, gcc 13.3) floods the console with reports like:UBSAN: misaligned-access in include/linux/sched.h:2087:9 member access within misaligned address c295d7e0 for type 'struct task_struct' which requires 64 byte alignment CPU: 0 UID: 0 PID: 15 Comm: pr/ttyAMA-1 Not tainted 7.2.0-rc2 #1 VOLUNTARY
Quoted 5 lines
Set the slab alignment to at least the type's declared alignment.
Fixes cb7ca40a3882 ("x86/fpu: Make task_struct::thread constant size")Assisted-by Claude:claude-fable-5Signed-off-by Karl Mehltretter <[email protected]>
LGTM. Additionally I think you can replace the manual L1_CACHE_BYTES handling with a SLAB_HWCACHE_ALIGN flag. That will apply cache_line_size().
Quoted 18 lines
--- kernel/fork.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)kernel/fork.c +2
-1@@ -857,7 +857,8 @@ void __init fork_init(void)#ifndef ARCH_MIN_TASKALIGN #define ARCH_MIN_TASKALIGN 0#endif -int align =max_t (int,L1_CACHE_BYTES ,ARCH_MIN_TASKALIGN ); +int align =max3 (L1_CACHE_BYTES ,ARCH_MIN_TASKALIGN , + __alignof__(struct task_struct ));unsigned long useroffset, usersize;/* create a slab on which task_structs can be allocated */