From: Masayoshi Mizuma <msys.mizuma@gmail.com>
To: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, Baoquan He <bhe@redhat.com>
Cc: Masayoshi Mizuma <msys.mizuma@gmail.com>,
Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v4 2/3] ACPI / NUMA: Add warning message if the padding size for KASLR is not enough
Date: Thu, 27 Sep 2018 16:31:45 -0400 [thread overview]
Message-ID: <20180927203146.12201-3-msys.mizuma@gmail.com> (raw)
In-Reply-To: <20180927203146.12201-1-msys.mizuma@gmail.com>
From: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
Add warning message if the padding size for KASLR,
rand_mem_physical_padding, is not enough. The message also
says the suitable padding size.
Signed-off-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
---
arch/x86/include/asm/setup.h | 2 ++
drivers/acpi/numa.c | 14 ++++++++++++++
2 files changed, 16 insertions(+)
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
index ae13bc9..65a5bf8 100644
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@ -80,6 +80,8 @@ static inline unsigned long kaslr_offset(void)
return (unsigned long)&_text - __START_KERNEL;
}
+extern int rand_mem_physical_padding;
+
/*
* Do NOT EVER look at the BIOS memory size location.
* It does not work on many machines.
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index 8516760..9c3cc3c 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -32,6 +32,7 @@
#include <linux/numa.h>
#include <linux/nodemask.h>
#include <linux/topology.h>
+#include <asm/setup.h>
static nodemask_t nodes_found_map = NODE_MASK_NONE;
@@ -435,6 +436,8 @@ acpi_table_parse_srat(enum acpi_srat_type id,
int __init acpi_numa_init(void)
{
int cnt = 0;
+ u32 max_phys_addr_tb;
+ u64 max_phys_addr;
if (acpi_disabled)
return -EINVAL;
@@ -463,6 +466,17 @@ int __init acpi_numa_init(void)
cnt = acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY,
acpi_parse_memory_affinity, 0);
+
+ if (parsed_numa_memblks && kaslr_enabled()) {
+ max_phys_addr = PFN_PHYS(max_possible_pfn);
+ max_phys_addr_tb = (roundup(max_phys_addr, 1ULL << 40)) >> 40;
+
+ if (max_phys_addr_tb > rand_mem_physical_padding)
+ pr_warn("Set 'rand_mem_physical_padding=%d' "
+ "as the kernel parameter. "
+ "Otherwise, memory hotadd may be failed.\n",
+ max_phys_addr_tb);
+ }
}
/* SLIT: System Locality Information Table */
--
2.18.0
next prev parent reply other threads:[~2018-09-27 20:34 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-27 20:31 [PATCH v4 0/3] Add a kernel parameter to change the padding size for KASLR Masayoshi Mizuma
2018-09-27 20:31 ` [PATCH v4 1/3] x86/mm: Add a kernel parameter to change the padding used for the physical memory mapping Masayoshi Mizuma
2018-09-27 20:31 ` Masayoshi Mizuma [this message]
2018-09-27 21:14 ` [PATCH v4 2/3] ACPI / NUMA: Add warning message if the padding size for KASLR is not enough Borislav Petkov
2018-09-28 2:21 ` Masayoshi Mizuma
2018-09-28 2:48 ` Baoquan He
2018-09-28 14:26 ` Masayoshi Mizuma
2018-09-27 20:31 ` [PATCH v4 3/3] docs: kernel-parameters.txt: document rand_mem_physical_padding parameter Masayoshi Mizuma
2018-09-27 21:17 ` Borislav Petkov
2018-09-28 2:26 ` Masayoshi Mizuma
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=20180927203146.12201-3-msys.mizuma@gmail.com \
--to=msys.mizuma@gmail.com \
--cc=bhe@redhat.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=m.mizuma@jp.fujitsu.com \
--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).