Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 979366f5 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Greg Kroah-Hartman
Browse files

mm: Move mm_cachep initialization to mm_init() 



commit af80602799681c78f14fbe20b6185a56020dedee upstream.

In order to allow using mm_alloc() much earlier, move initializing
mm_cachep into mm_init().

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20221025201057.751153381@infradead.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3d1b8cfd

include/linux/sched/task.h

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ extern void sched_dead(struct task_struct *p); 
void __noreturn do_task_dead(void);

void __noreturn make_task_dead(int signr);



extern void mm_cache_init(void);

extern void proc_caches_init(void);



extern void fork_init(void);

init/main.c

+1 −0
Original line number Diff line number Diff line
@@ -563,6 +563,7 @@ static void __init mm_init(void) 
	init_espfix_bsp();

	/* Should be run after espfix64 is set up. */

	pti_init();

	mm_cache_init();

}



void __init __weak arch_call_rest_init(void)

kernel/fork.c

+18 −14
Original line number Diff line number Diff line
@@ -2705,10 +2705,27 @@ static void sighand_ctor(void *data) 
	init_waitqueue_head(&sighand->signalfd_wqh);

}



void __init proc_caches_init(void)

void __init mm_cache_init(void)

{

	unsigned int mm_size;



	/*

	 * The mm_cpumask is located at the end of mm_struct, and is

	 * dynamically sized based on the maximum CPU number this system

	 * can have, taking hotplug into account (nr_cpu_ids).

	 */

	mm_size = sizeof(struct mm_struct) + cpumask_size();



	mm_cachep = kmem_cache_create_usercopy("mm_struct",

			mm_size, ARCH_MIN_MMSTRUCT_ALIGN,

			SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_ACCOUNT,

			offsetof(struct mm_struct, saved_auxv),

			sizeof_field(struct mm_struct, saved_auxv),

			NULL);

}



void __init proc_caches_init(void)

{

	sighand_cachep = kmem_cache_create("sighand_cache",

			sizeof(struct sighand_struct), 0,

			SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_TYPESAFE_BY_RCU|
@@ -2726,19 +2743,6 @@ void __init proc_caches_init(void) 
			SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_ACCOUNT,

			NULL);



	/*

	 * The mm_cpumask is located at the end of mm_struct, and is

	 * dynamically sized based on the maximum CPU number this system

	 * can have, taking hotplug into account (nr_cpu_ids).

	 */

	mm_size = sizeof(struct mm_struct) + cpumask_size();



	mm_cachep = kmem_cache_create_usercopy("mm_struct",

			mm_size, ARCH_MIN_MMSTRUCT_ALIGN,

			SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_ACCOUNT,

			offsetof(struct mm_struct, saved_auxv),

			sizeof_field(struct mm_struct, saved_auxv),

			NULL);

	vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC|SLAB_ACCOUNT);

	mmap_init();

	nsproxy_cache_init();