The quilt patch titled
Subject: modules: wait do_free_init correctly
has been removed from the -mm tree. Its filename was
modules-wait-do_free_init-correctly.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: Changbin Du <changbin.du@xxxxxxxxxx>
Subject: modules: wait do_free_init correctly
Date: Tue, 19 Dec 2023 22:12:31 +0800
Commit 1a7b7d922081 ("modules: Use vmalloc special flag") moves
do_free_init() into a global workqueue instead of call_rcu(). So now we
should wait it via flush_work().
[changbin.du@xxxxxxxxxx: fix compilation issue for no CONFIG_MODULES found by 0-DAY]
Link: https://lkml.kernel.org/r/20231225061513.2984575-1-changbin.du@xxxxxxxxxx
Link: https://lkml.kernel.org/r/20231219141231.2218215-1-changbin.du@xxxxxxxxxx
Fixes: 1a7b7d922081 ("modules: Use vmalloc special flag")
Signed-off-by: Changbin Du <changbin.du@xxxxxxxxxx>
Cc: Xiaoyi Su <suxiaoyi@xxxxxxxxxx>
Cc: Hui Wang <hw.huiwang@xxxxxxxxxx>
Cc: Luis Chamberlain <mcgrof@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/moduleloader.h | 8 ++++++++
init/main.c | 5 +++--
kernel/module/main.c | 5 +++++
3 files changed, 16 insertions(+), 2 deletions(-)
--- a/include/linux/moduleloader.h~modules-wait-do_free_init-correctly
+++ a/include/linux/moduleloader.h
@@ -115,6 +115,14 @@ int module_finalize(const Elf_Ehdr *hdr,
const Elf_Shdr *sechdrs,
struct module *mod);
+#ifdef CONFIG_MODULES
+void flush_module_init_free_work(void);
+#else
+static inline void flush_module_init_free_work(void)
+{
+}
+#endif
+
/* Any cleanup needed when module leaves. */
void module_arch_cleanup(struct module *mod);
--- a/init/main.c~modules-wait-do_free_init-correctly
+++ a/init/main.c
@@ -99,6 +99,7 @@
#include <linux/init_syscalls.h>
#include <linux/stackdepot.h>
#include <linux/randomize_kstack.h>
+#include <linux/moduleloader.h>
#include <net/net_namespace.h>
#include <asm/io.h>
@@ -1402,11 +1403,11 @@ static void mark_readonly(void)
if (rodata_enabled) {
/*
* load_module() results in W+X mappings, which are cleaned
- * up with call_rcu(). Let's make sure that queued work is
+ * up with init_free_wq. Let's make sure that queued work is
* flushed so that we don't hit false positives looking for
* insecure pages which are W+X.
*/
- rcu_barrier();
+ flush_module_init_free_work();
mark_rodata_ro();
rodata_test();
} else
--- a/kernel/module/main.c~modules-wait-do_free_init-correctly
+++ a/kernel/module/main.c
@@ -2489,6 +2489,11 @@ static void do_free_init(struct work_str
}
}
+void flush_module_init_free_work(void)
+{
+ flush_work(&init_free_wq);
+}
+
#undef MODULE_PARAM_PREFIX
#define MODULE_PARAM_PREFIX "module."
/* Default value for module->async_probe_requested */
_
Patches currently in -mm which might be from changbin.du@xxxxxxxxxx are
