From: Kees Cook <keescook@chromium.org>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: Kees Cook <keescook@chromium.org>,
Rick Edgecombe <rick.p.edgecombe@intel.com>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
Andy Lutomirski <luto@kernel.org>, Arnd Bergmann <arnd@arndb.de>,
linux-arch@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
linux-alpha@vger.kernel.org, linux-ia64@vger.kernel.org,
linux-s390@vger.kernel.org, linux-c6x-dev@linux-c6x.org,
Yoshinori Sato <ysato@users.sourceforge.jp>,
Michal Simek <monstr@monstr.eu>,
linux-parisc@vger.kernel.org, linux-xtensa@linux-xtensa.org,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 27/29] x86/mm: Report which part of kernel image is freed
Date: Thu, 26 Sep 2019 10:56:00 -0700 [thread overview]
Message-ID: <20190926175602.33098-28-keescook@chromium.org> (raw)
In-Reply-To: <20190926175602.33098-1-keescook@chromium.org>
The memory freeing report wasn't very useful for figuring out which
parts of the kernel image were being freed. This adds the details for
clearer reporting.
Before:
[ 2.150450] Freeing unused kernel image memory: 1348K
[ 2.154574] Write protecting the kernel read-only data: 20480k
[ 2.157641] Freeing unused kernel image memory: 2040K
[ 2.158827] Freeing unused kernel image memory: 172K
After:
[ 2.329678] Freeing unused kernel image (initmem) memory: 1348K
[ 2.331953] Write protecting the kernel read-only data: 20480k
[ 2.335361] Freeing unused kernel image (text/rodata gap) memory: 2040K
[ 2.336927] Freeing unused kernel image (rodata/data gap) memory: 172K
Signed-off-by: Kees Cook <keescook@chromium.org>
---
arch/x86/include/asm/processor.h | 2 +-
arch/x86/mm/init.c | 8 ++++----
arch/x86/mm/init_64.c | 6 ++++--
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 6e0a3b43d027..790f250d39a8 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -958,7 +958,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
extern unsigned long arch_align_stack(unsigned long sp);
void free_init_pages(const char *what, unsigned long begin, unsigned long end);
-extern void free_kernel_image_pages(void *begin, void *end);
+extern void free_kernel_image_pages(const char *what, void *begin, void *end);
void default_idle(void);
#ifdef CONFIG_XEN
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index fd10d91a6115..e7bb483557c9 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -829,14 +829,13 @@ void free_init_pages(const char *what, unsigned long begin, unsigned long end)
* used for the kernel image only. free_init_pages() will do the
* right thing for either kind of address.
*/
-void free_kernel_image_pages(void *begin, void *end)
+void free_kernel_image_pages(const char *what, void *begin, void *end)
{
unsigned long begin_ul = (unsigned long)begin;
unsigned long end_ul = (unsigned long)end;
unsigned long len_pages = (end_ul - begin_ul) >> PAGE_SHIFT;
-
- free_init_pages("unused kernel image", begin_ul, end_ul);
+ free_init_pages(what, begin_ul, end_ul);
/*
* PTI maps some of the kernel into userspace. For performance,
@@ -865,7 +864,8 @@ void __ref free_initmem(void)
mem_encrypt_free_decrypted_mem();
- free_kernel_image_pages(&__init_begin, &__init_end);
+ free_kernel_image_pages("unused kernel image (initmem)",
+ &__init_begin, &__init_end);
}
#ifdef CONFIG_BLK_DEV_INITRD
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index e67ddca8b7a8..dcb9bc961b39 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -1334,8 +1334,10 @@ void mark_rodata_ro(void)
set_memory_ro(start, (end-start) >> PAGE_SHIFT);
#endif
- free_kernel_image_pages((void *)text_end, (void *)rodata_start);
- free_kernel_image_pages((void *)rodata_end, (void *)_sdata);
+ free_kernel_image_pages("unused kernel image (text/rodata gap)",
+ (void *)text_end, (void *)rodata_start);
+ free_kernel_image_pages("unused kernel image (rodata/data gap)",
+ (void *)rodata_end, (void *)_sdata);
debug_checkwx();
}
--
2.17.1
next prev parent reply other threads:[~2019-09-26 17:56 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-26 17:55 [PATCH 00/29] vmlinux.lds.h: Refactor EXCEPTION_TABLE and NOTES Kees Cook
2019-09-26 17:55 ` [PATCH 01/29] powerpc: Rename "notes" PT_NOTE to "note" Kees Cook
2019-09-26 17:55 ` [PATCH 02/29] powerpc: Remove PT_NOTE workaround Kees Cook
2019-09-26 17:55 ` [PATCH 03/29] powerpc: Rename PT_LOAD identifier "kernel" to "text" Kees Cook
2019-09-26 17:55 ` [PATCH 04/29] alpha: " Kees Cook
2019-09-26 17:55 ` [PATCH 05/29] ia64: Rename PT_LOAD identifier "code" " Kees Cook
2019-09-26 17:55 ` [PATCH 06/29] s390: Move RO_DATA into "text" PT_LOAD Program Header Kees Cook
2019-09-26 17:55 ` [PATCH 07/29] x86: Restore "text" Program Header with dummy section Kees Cook
2019-10-10 10:33 ` Borislav Petkov
2019-10-10 16:46 ` Kees Cook
2019-09-26 17:55 ` [PATCH 08/29] vmlinux.lds.h: Provide EMIT_PT_NOTE to indicate export of .notes Kees Cook
2019-10-10 10:40 ` Borislav Petkov
2019-09-26 17:55 ` [PATCH 09/29] vmlinux.lds.h: Move Program Header restoration into NOTES macro Kees Cook
2019-09-26 17:55 ` [PATCH 10/29] vmlinux.lds.h: Move NOTES into RO_DATA Kees Cook
2019-09-26 17:55 ` [PATCH 11/29] vmlinux.lds.h: Replace RODATA with RO_DATA Kees Cook
2019-09-26 17:55 ` [PATCH 12/29] vmlinux.lds.h: Replace RO_DATA_SECTION " Kees Cook
2019-09-26 17:55 ` [PATCH 13/29] vmlinux.lds.h: Replace RW_DATA_SECTION with RW_DATA Kees Cook
2019-09-26 17:55 ` [PATCH 14/29] vmlinux.lds.h: Allow EXCEPTION_TABLE to live in RO_DATA Kees Cook
2019-10-01 9:05 ` Will Deacon
2019-10-10 15:25 ` Borislav Petkov
2019-10-10 16:47 ` Kees Cook
2019-09-26 17:55 ` [PATCH 15/29] x86: Actually use _etext for end of text segment Kees Cook
2019-09-26 17:55 ` [PATCH 16/29] x86: Move EXCEPTION_TABLE to RO_DATA segment Kees Cook
2019-09-26 17:55 ` [PATCH 17/29] alpha: " Kees Cook
2019-09-26 17:55 ` [PATCH 18/29] arm64: " Kees Cook
2019-10-01 9:03 ` Will Deacon
2019-10-01 15:48 ` Kees Cook
2019-09-26 17:55 ` [PATCH 19/29] c6x: " Kees Cook
2019-09-26 17:55 ` [PATCH 20/29] h8300: " Kees Cook
2019-09-26 17:55 ` [PATCH 21/29] ia64: " Kees Cook
2019-09-26 17:55 ` [PATCH 22/29] microblaze: " Kees Cook
2019-09-26 17:55 ` [PATCH 23/29] parisc: " Kees Cook
2019-09-26 17:55 ` [PATCH 24/29] powerpc: " Kees Cook
2019-09-26 17:55 ` [PATCH 25/29] xtensa: " Kees Cook
2019-09-26 17:55 ` [PATCH 26/29] x86/mm: Remove redundant &s on addresses Kees Cook
2019-09-26 17:56 ` Kees Cook [this message]
2019-09-26 17:56 ` [PATCH 28/29] x86/mm: Report actual image regions in /proc/iomem Kees Cook
2019-10-10 18:00 ` Borislav Petkov
2019-09-26 17:56 ` [PATCH 29/29] x86: Use INT3 instead of NOP for linker fill bytes Kees Cook
2019-10-10 18:03 ` [PATCH 00/29] vmlinux.lds.h: Refactor EXCEPTION_TABLE and NOTES Borislav Petkov
2019-10-10 23:57 ` Kees Cook
2019-10-11 1:38 ` hpa
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=20190926175602.33098-28-keescook@chromium.org \
--to=keescook@chromium.org \
--cc=arnd@arndb.de \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-c6x-dev@linux-c6x.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=monstr@monstr.eu \
--cc=rick.p.edgecombe@intel.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
--cc=ysato@users.sourceforge.jp \
/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).