cpumask: truncate mm_struct.cpu_vm_mask for CONFIG_CPUMASK_OFFSTACK
Subsystems (6)
PATCH 1/6 cpumask: truncate mm_struct.cpu_vm_mask for CONFIG_CPUMASK_OFFSTACK
Turns cpu_vm_mask into a bitmap, and truncate it to nr_cpu_ids if CONFIG_CPUMASK_OFFSTACK is set.
I do this rather than the classic [0] dangling array trick, because of init_mm, which is static and widely referenced.
Signed-off-by Rusty Russell <[email protected]>
--- arch/x86/kernel/tboot.c | 2 +- include/linux/mm_types.h | 8 +++++--- kernel/fork.c | 19 ++++++++++++++++++- mm/init-mm.c | 2 +- 4 files changed, 25 insertions(+), 6 deletions(-)
include/linux/mm_types.h +5 -3
@@ -242,8 +242,6 @@ struct mm_struct {s8 oom_adj;/* OOM kill score adjustment (bit shift) */ -cpumask_t cpu_vm_mask; -/* Architecture-specific MM context */ mm_context_t context;
@@ -288,9 +286,13 @@ struct mm_struct {#ifdef CONFIG_MMU_NOTIFIER struct mmu_notifier_mm *mmu_notifier_mm;#endif + +/* This has to go at the end: if CONFIG_CPUMASK_OFFSTACK=y, only +* nr_cpu_ids bits will actually be allocated. */ + DECLARE_BITMAP(cpu_vm_mask, CONFIG_NR_CPUS); };/* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ -#define mm_cpumask (mm) (&(mm)->cpu_vm_mask) +#define mm_cpumask (mm) (to_cpumask((mm)->cpu_vm_mask))#endif /* _LINUX_MM_TYPES_H */
kernel/fork.c +18 -1
@@ -1468,6 +1468,23 @@ static void sighand_ctor(void *data)void __init proc_caches_init (void ) { +unsigned int mm_size; + +#ifdef CONFIG_CPUMASK_OFFSTACK +/* +* Restrict mm_struct allocations so cpu_vm_mask is only +* nr_cpu_ids long. cpu_vm_mask must be a NR_CPUS bitmap at +* end for this to work. +*/ +BUILD_BUG_ON (offsetof(struct mm_struct , cpu_vm_mask) + +BITS_TO_LONGS (CONFIG_NR_CPUS )*sizeof (long ) + !=sizeof (struct mm_struct )); + mm_size = offsetof(struct mm_struct , cpu_vm_mask) + +BITS_TO_LONGS (nr_cpu_ids) *sizeof (long ); +#else + mm_size =sizeof (struct mm_struct ); +#endif + sighand_cachep = kmem_cache_create("sighand_cache", sizeof(struct sighand_struct), 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_DESTROY_BY_RCU|
@@ -1482,7 +1499,7 @@ void __init proc_caches_init(void)sizeof (struct fs_struct ),0 , SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL); mm_cachep =kmem_cache_create ("mm_struct" , -sizeof (struct mm_struct ),ARCH_MIN_MMSTRUCT_ALIGN , + mm_size,ARCH_MIN_MMSTRUCT_ALIGN ,SLAB_HWCACHE_ALIGN |SLAB_PANIC |SLAB_NOTRACK ,NULL ); vm_area_cachep =KMEM_CACHE (vm_area_struct,SLAB_PANIC );mmap_init ();
mm/init-mm.c +1 -1
@@ -16,5 +16,5 @@ struct mm_struct init_mm = { .mmap_sem = __RWSEM_INITIALIZER(init_mm.mmap_sem), .page_table_lock = __SPIN_LOCK_UNLOCKED(init_mm.page_table_lock), .mmlist = LIST_HEAD_INIT(init_mm.mmlist), - .cpu_vm_mask = CPU_MASK_ALL, + .cpu_vm_mask = CPU_BITS_ALL, };
arch/x86/kernel/tboot.c +1 -1
@@ -109,7 +109,7 @@ static struct mm_struct tboot_mm = { .mmap_sem = __RWSEM_INITIALIZER(init_mm.mmap_sem), .page_table_lock = __SPIN_LOCK_UNLOCKED(init_mm.page_table_lock), .mmlist = LIST_HEAD_INIT(init_mm.mmlist), - .cpu_vm_mask = CPU_MASK_ALL, + .cpu_vm_mask = CPU_BITS_ALL, };static inline void switch_to_tboot_pt (void )