From: Rick Edgecombe <rick.p.edgecombe@intel.com>
To: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com,
x86@kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org,
kernel-hardening@lists.openwall.com, daniel@iogearbox.net,
jannh@google.com, keescook@chromium.org
Cc: kristen@linux.intel.com, dave.hansen@intel.com,
arjan@linux.intel.com,
Rick Edgecombe <rick.p.edgecombe@intel.com>
Subject: [PATCH v4 3/3] vmalloc: Add debugfs modfraginfo
Date: Wed, 29 Aug 2018 15:59:39 -0700 [thread overview]
Message-ID: <1535583579-6138-4-git-send-email-rick.p.edgecombe@intel.com> (raw)
In-Reply-To: <1535583579-6138-1-git-send-email-rick.p.edgecombe@intel.com>
Add debugfs file "modfraginfo" for providing info on module space fragmentation.
This can be used for determining if loadable module randomization is causing any
problems for extreme module loading situations, like huge numbers of modules or
extremely large modules.
Sample output when KASLR is enabled and X86_64 is configured:
Largest free space: 897912 kB
Total free space: 1025424 kB
Allocations in backup area: 0
Sample output when just X86_64:
Largest free space: 897912 kB
Total free space: 1025424 kB
Signed-off-by: Rick Edgecombe <rick.p.edgecombe@intel.com>
---
mm/vmalloc.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 101 insertions(+), 1 deletion(-)
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 1954458..a44b902 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -18,6 +18,7 @@
#include <linux/interrupt.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
+#include <linux/debugfs.h>
#include <linux/debugobjects.h>
#include <linux/kallsyms.h>
#include <linux/list.h>
@@ -33,6 +34,7 @@
#include <linux/bitops.h>
#include <linux/uaccess.h>
+#include <asm/setup.h>
#include <asm/tlbflush.h>
#include <asm/shmparam.h>
@@ -2919,7 +2921,105 @@ static int __init proc_vmalloc_init(void)
proc_create_seq("vmallocinfo", 0400, NULL, &vmalloc_op);
return 0;
}
-module_init(proc_vmalloc_init);
+#else
+static int __init proc_vmalloc_init(void)
+{
+ return 0;
+}
+#endif
+
+#if defined(CONFIG_RANDOMIZE_BASE) && defined(CONFIG_X86_64)
+static inline unsigned long is_in_backup(unsigned long addr)
+{
+ return addr >= MODULES_VADDR + MODULES_RAND_LEN;
+}
+#else
+static inline unsigned long is_in_backup(unsigned long addr)
+{
+ return 0;
+}
+inline bool kaslr_enabled(void);
#endif
+
+#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_X86_64)
+static int modulefraginfo_debug_show(struct seq_file *m, void *v)
+{
+ unsigned long last_end = MODULES_VADDR;
+ unsigned long total_free = 0;
+ unsigned long largest_free = 0;
+ unsigned long backup_cnt = 0;
+ unsigned long gap;
+ struct vmap_area *prev, *cur = NULL;
+
+ spin_lock(&vmap_area_lock);
+
+ if (!pvm_find_next_prev(MODULES_VADDR, &cur, &prev) || !cur)
+ goto done;
+
+ for (; cur->va_end <= MODULES_END; cur = list_next_entry(cur, list)) {
+ /* Don't count areas that are marked to be lazily freed */
+ if (!(cur->flags & VM_LAZY_FREE)) {
+ backup_cnt += is_in_backup(cur->va_start);
+ gap = cur->va_start - last_end;
+ if (gap > largest_free)
+ largest_free = gap;
+ total_free += gap;
+ last_end = cur->va_end;
+ }
+
+ if (list_is_last(&cur->list, &vmap_area_list))
+ break;
+ }
+
+done:
+ gap = (MODULES_END - last_end);
+ if (gap > largest_free)
+ largest_free = gap;
+ total_free += gap;
+
+ spin_unlock(&vmap_area_lock);
+
+ seq_printf(m, "\tLargest free space:\t%lu kB\n", largest_free / 1024);
+ seq_printf(m, "\t Total free space:\t%lu kB\n", total_free / 1024);
+
+ if (IS_ENABLED(CONFIG_RANDOMIZE_BASE) && kaslr_enabled())
+ seq_printf(m, "Allocations in backup area:\t%lu\n", backup_cnt);
+
+ return 0;
+}
+
+static int proc_module_frag_debug_open(struct inode *inode, struct file *file)
+{
+ return single_open(file, modulefraginfo_debug_show, NULL);
+}
+
+static const struct file_operations debug_module_frag_operations = {
+ .open = proc_module_frag_debug_open,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .release = single_release,
+};
+
+static void __init debug_modfrag_init(void)
+{
+ debugfs_create_file("modfraginfo", 0400, NULL, NULL,
+ &debug_module_frag_operations);
+}
+#else /* defined(CONFIG_DEBUG_FS) && defined(CONFIG_X86_64) */
+static void __init debug_modfrag_init(void)
+{
+}
+#endif
+
+#if defined(CONFIG_DEBUG_FS) || defined(CONFIG_PROC_FS)
+static int __init info_vmalloc_init(void)
+{
+ proc_vmalloc_init();
+ debug_modfrag_init();
+ return 0;
+}
+
+module_init(info_vmalloc_init);
+#endif
--
2.7.4
next prev parent reply other threads:[~2018-08-29 22:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-29 22:59 [PATCH v4 0/3] KASLR feature to randomize each loadable module Rick Edgecombe
2018-08-29 22:59 ` [PATCH v4 1/3] vmalloc: Add __vmalloc_node_try_addr function Rick Edgecombe
2018-08-29 22:59 ` [PATCH v4 2/3] x86/modules: Increase randomization for modules Rick Edgecombe
2018-08-29 22:59 ` Rick Edgecombe [this message]
2018-08-30 2:27 ` [PATCH v4 0/3] KASLR feature to randomize each loadable module Alexei Starovoitov
2018-08-30 18:24 ` Edgecombe, Rick P
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1535583579-6138-4-git-send-email-rick.p.edgecombe@intel.com \
--to=rick.p.edgecombe@intel.com \
--cc=arjan@linux.intel.com \
--cc=daniel@iogearbox.net \
--cc=dave.hansen@intel.com \
--cc=hpa@zytor.com \
--cc=jannh@google.com \
--cc=keescook@chromium.org \
--cc=kernel-hardening@lists.openwall.com \
--cc=kristen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).