| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20230524213620.3509138-3-mcgrof@kernel.org>
Date: Wed, 24 May 2023 14:36:20 -0700
From: Luis Chamberlain <mcgrof@...nel.org>
To: david@...hat.com, tglx@...utronix.de, hch@....de,
patches@...ts.linux.dev, linux-modules@...r.kernel.org,
linux-mm@...ck.org, linux-kernel@...r.kernel.org, pmladek@...e.com,
petr.pavlu@...e.com, prarit@...hat.com,
torvalds@...ux-foundation.org, lennart@...ttering.net
Cc: gregkh@...uxfoundation.org, rafael@...nel.org, song@...nel.org,
lucas.de.marchi@...il.com, lucas.demarchi@...el.com,
christophe.leroy@...roup.eu, peterz@...radead.org, rppt@...nel.org,
dave@...olabs.net, willy@...radead.org, vbabka@...e.cz,
mhocko@...e.com, dave.hansen@...ux.intel.com,
colin.i.king@...il.com, jim.cromie@...il.com,
catalin.marinas@....com, jbaron@...mai.com,
rick.p.edgecombe@...el.com, yujie.liu@...el.com, mcgrof@...nel.org
Subject: [PATCH 2/2] module: add support to avoid duplicates early on load
Add support to use the new kread_uniq_fd() to avoid duplicate kernel
reads on modules. At the cost of about ~945 bytes to your kernel size,
enabling this on a 255 CPU x86_64 qemu guest this saves about ~1.8 GiB
of memory during boot which would otherwise be free'd, and reduces boot
time by about ~11 seconds.
Userspace loads modules through finit_module(), this in turn will
use vmalloc space up to 3 times:
a) The kernel_read_file() call
b) Optional module decompression
c) Our final copy of the module
Commit 064f4536d139 ("module: avoid allocation if module is already
present and ready") shows a graph of the amount of vmalloc space
observed allocated but freed for duplicate module request which end
up in the trash bin. Since there is a linear relationship with the
number of CPUs eventually this will bite us and you end up not being
able to boot. That commit put a stop gap for c) but to avoid the
vmalloc() space wasted on a) and b) we need to detect duplicates
earlier.
We could just have userspace fix this, but as reviewed at LSFMM 2023
this year in Vancouver, fixing this in userspace can be complex and we
also can't know when userpace is fixed. Fixing this in kernel turned
out to be easy with the inode and with a simple kconfig option we can
let users / distros decide if this full stop gap is worthy to enable.
With this enabled I'm now able to see 0 bytes wasted on vmalloc space
due to duplicates.
Before:
# sudo systemd-analyze
Startup finished in 41.653s (kernel) + 44.305s (userspace) = 1min 25.958s
graphical.target reached after 44.178s in userspace.
# grep "Virtual mem wasted bytes" /sys/kernel/debug/modules/stats
Virtual mem wasted bytes 1949006968
So ~1.8 GiB... of vmalloc space wasted during boot.
After:
# sudo systemd-analyze
Startup finished in 29.883s (kernel) + 45.817s (userspace) = 1min 15.700s
graphical.target reached after 45.682s in userspace.
# grep "Virtual mem wasted bytes" /sys/kernel/debug/modules/stats
Virtual mem wasted bytes 0
Suggested-by: Lennart Poettering <lennart@...ttering.net>
Signed-off-by: Luis Chamberlain <mcgrof@...nel.org>
---
include/linux/module.h | 1 +
kernel/module/Kconfig | 20 ++++++++++++++++++++
kernel/module/internal.h | 1 +
kernel/module/main.c | 19 ++++++++++++-------
4 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/include/linux/module.h b/include/linux/module.h
index 9e56763dff81..afc44df96278 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -557,6 +557,7 @@ struct module {
unsigned int printk_index_size;
struct pi_entry **printk_index_start;
#endif
+ unsigned long i_ino;
#ifdef CONFIG_MODULE_UNLOAD
/* What modules depend on me? */
diff --git a/kernel/module/Kconfig b/kernel/module/Kconfig
index 33a2e991f608..85a6c7c5ddc0 100644
--- a/kernel/module/Kconfig
+++ b/kernel/module/Kconfig
@@ -157,6 +157,26 @@ config MODULE_UNLOAD_TAINT_TRACKING
page (see bad_page()), the aforementioned details are also
shown. If unsure, say N.
+config MODULE_KREAD_UNIQ
+ bool "Avoid duplicate module kernel reads"
+ select KREAD_UNIQ
+ help
+ Enable this option to avoid vmalloc() space for duplicate module
+ requests early before we can even check for the module name. This
+ is useful to avoid duplicate module requests which userspace or kernel
+ can issue. On some architectures such as x86_64 there is only 128 MiB
+ of virtual memory space and since in the worst case we can end up
+ allocating up to 3 times the module size in vmalloc space, avoiding
+ duplicates can save virtual memory on boot.
+
+ Enabling this will incrase your kernel by about 945 bytes, but can
+ save considerable memory during bootup which would otherwise be freed
+ and this in turn can help speed up kernel boot time.
+
+ Disable this if you have enabled CONFIG_MODULE_STATS and have
+ verified you see no duplicates or virtual memory being freed on
+ bootup.
+
config MODVERSIONS
bool "Module versioning support"
help
diff --git a/kernel/module/internal.h b/kernel/module/internal.h
index dc7b0160c480..7ea7f177f907 100644
--- a/kernel/module/internal.h
+++ b/kernel/module/internal.h
@@ -67,6 +67,7 @@ struct load_info {
unsigned int max_pages;
unsigned int used_pages;
#endif
+ unsigned long i_ino;
struct {
unsigned int sym, str, mod, vers, info, pcpu;
} index;
diff --git a/kernel/module/main.c b/kernel/module/main.c
index ea7d0c7f3e60..e35900ee616a 100644
--- a/kernel/module/main.c
+++ b/kernel/module/main.c
@@ -1283,6 +1283,7 @@ static void free_module(struct module *mod)
kfree(mod->args);
percpu_modfree(mod);
+ kread_uniq_fd_free(mod->i_ino);
free_mod_mem(mod);
}
@@ -1964,12 +1965,14 @@ static int copy_module_from_user(const void __user *umod, unsigned long len,
return err;
}
-static void free_copy(struct load_info *info, int flags)
+static void free_copy(struct load_info *info, int flags, bool error)
{
if (flags & MODULE_INIT_COMPRESSED_FILE)
module_decompress_cleanup(info);
else
vfree(info->hdr);
+ if (error)
+ kread_uniq_fd_free(info->i_ino);
}
static int rewrite_section_headers(struct load_info *info, int flags)
@@ -2965,7 +2968,7 @@ static int load_module(struct load_info *info, const char __user *uargs,
}
/* Get rid of temporary copy. */
- free_copy(info, flags);
+ free_copy(info, flags, false);
/* Done! */
trace_module_load(mod);
@@ -3023,7 +3026,7 @@ static int load_module(struct load_info *info, const char __user *uargs,
*/
if (!module_allocated)
mod_stat_bump_becoming(info, flags);
- free_copy(info, flags);
+ free_copy(info, flags, true);
return err;
}
@@ -3068,11 +3071,12 @@ SYSCALL_DEFINE3(finit_module, int, fd, const char __user *, uargs, int, flags)
|MODULE_INIT_COMPRESSED_FILE))
return -EINVAL;
- len = kernel_read_file_from_fd(fd, 0, &buf, INT_MAX, NULL,
- READING_MODULE);
+ len = kread_uniq_fd(fd, 0, &buf, &info.i_ino, INT_MAX, NULL, READING_MODULE);
if (len < 0) {
- mod_stat_inc(&failed_kreads);
- mod_stat_add_long(len, &invalid_kread_bytes);
+ if (len != -EBUSY) {
+ mod_stat_inc(&failed_kreads);
+ mod_stat_add_long(len, &invalid_kread_bytes);
+ }
return len;
}
@@ -3082,6 +3086,7 @@ SYSCALL_DEFINE3(finit_module, int, fd, const char __user *, uargs, int, flags)
if (err) {
mod_stat_inc(&failed_decompress);
mod_stat_add_long(len, &invalid_decompress_bytes);
+ kread_uniq_fd_free(info.i_ino);
return err;
}
} else {
--
2.39.2
Powered by blists - more mailing lists