x86/mm: Use mm_alloc() in poking_init()

commit 3f4c8211d982099be693be9aa7d6fc4607dff290 upstream.

Instead of duplicating init_mm, allocate a fresh mm. The advantage is
that mm_alloc() has much simpler dependencies. Additionally it makes
more conceptual sense, init_mm has no (and must not have) user state
to duplicate.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20221025201057.816175235@infradead.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 5bb3cc66cccc9865fa0c2a4e09b11aaeab257982..56d5ab70bfa1c4b4115803cdc57eae4f2f30e2db 100644 (file)
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -823,7 +823,7 @@ void __init poking_init(void)
        spinlock_t *ptl;
        pte_t *ptep;
 
-       poking_mm = copy_init_mm();
+       poking_mm = mm_alloc();
        BUG_ON(!poking_mm);
 
        /* Xen PV guests need the PGD to be pinned. */

diff --git a/include/linux/sched/task.h b/include/linux/sched/task.h
index d351f1b362ef922c69648d03575aea4df6250029..a702d4d1a4958274a286c008df80c67b6b4d4583 100644 (file)
--- a/include/linux/sched/task.h
+++ b/include/linux/sched/task.h
@@ -87,7 +87,6 @@ extern void exit_itimers(struct task_struct *);
 extern pid_t kernel_clone(struct kernel_clone_args *kargs);
 struct task_struct *create_io_thread(int (*fn)(void *), void *arg, int node);
 struct task_struct *fork_idle(int);
-struct mm_struct *copy_init_mm(void);
 extern pid_t kernel_thread(int (*fn)(void *), void *arg, unsigned long flags);
 extern long kernel_wait4(pid_t, int __user *, int, struct rusage *);
 int kernel_wait(pid_t pid, int *stat);

diff --git a/kernel/fork.c b/kernel/fork.c
index 1906230a000e36af8dd860533e7de88b62b9aabb..0835c3e89311623b5111a434143cdc4b9fc4b183 100644 (file)
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -2522,11 +2522,6 @@ struct task_struct * __init fork_idle(int cpu)
        return task;
 }
 
-struct mm_struct *copy_init_mm(void)
-{
-       return dup_mm(NULL, &init_mm);
-}
-
 /*
  * This is like kernel_clone(), but shaved down and tailored to just
  * creating io_uring workers. It returns a created task, or an error pointer.