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 v5 2/3] ACPI / NUMA: Add warning message if the padding size for KASLR is not enough
Date: Mon, 1 Oct 2018 10:08:42 -0400 [thread overview]
Message-ID: <20181001140843.26137-3-msys.mizuma@gmail.com> (raw)
In-Reply-To: <20181001140843.26137-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 | 16 ++++++++++++++++
2 files changed, 18 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..5a11aa5 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,7 @@ acpi_table_parse_srat(enum acpi_srat_type id,
int __init acpi_numa_init(void)
{
int cnt = 0;
+ u64 max_possible_phys, max_actual_phys, threshold;
if (acpi_disabled)
return -EINVAL;
@@ -463,6 +465,20 @@ int __init acpi_numa_init(void)
cnt = acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY,
acpi_parse_memory_affinity, 0);
+
+ /* check the padding size for KASLR is enough. */
+ if (parsed_numa_memblks && kaslr_enabled()) {
+ max_actual_phys = roundup(PFN_PHYS(max_pfn),
+ 1ULL << 40);
+ max_possible_phys = roundup(PFN_PHYS(max_possible_pfn),
+ 1ULL << 40);
+ threshold = max_actual_phys +
+ ((u64)rand_mem_physical_padding << 40);
+
+ if (max_possible_phys > threshold)
+ pr_warn("Set 'rand_mem_physical_padding=%llu' to avoid memory hotadd failure.\n",
+ (max_possible_phys - max_actual_phys) >> 40);
+ }
}
/* SLIT: System Locality Information Table */
--
2.18.0
next prev parent reply other threads:[~2018-10-01 14:09 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-01 14:08 [PATCH v5 0/3] Add a kernel parameter to change the padding size for KASLR Masayoshi Mizuma
2018-10-01 14:08 ` [PATCH v5 1/3] x86/mm: Add a kernel parameter to change the padding used for the physical memory mapping Masayoshi Mizuma
2018-10-02 10:18 ` [tip:x86/boot] " tip-bot for Masayoshi Mizuma
2018-10-01 14:08 ` Masayoshi Mizuma [this message]
2018-10-02 10:18 ` [tip:x86/boot] ACPI/NUMA: Add warning message if the padding size for KASLR is not enough tip-bot for Masayoshi Mizuma
2018-10-02 15:05 ` Borislav Petkov
2018-10-02 21:19 ` Masayoshi Mizuma
2018-10-03 10:58 ` Masayoshi Mizuma
2018-10-03 12:34 ` Peter Zijlstra
2018-10-03 12:48 ` Borislav Petkov
2018-10-03 13:02 ` Masayoshi Mizuma
2018-10-03 14:21 ` [tip:x86/boot] x86/kaslr, ACPI/NUMA: Fix KASLR build error tip-bot for Peter Zijlstra (Intel)
2018-10-08 11:03 ` Naresh Kamboju
2018-10-08 13:01 ` Borislav Petkov
2018-10-08 13:48 ` Arnd Bergmann
2018-10-08 14:10 ` Borislav Petkov
2018-10-09 10:39 ` tip-bot for Peter Zijlstra (Intel)
2018-10-01 14:08 ` [PATCH v5 3/3] docs: kernel-parameters.txt: document rand_mem_physical_padding Masayoshi Mizuma
2018-10-02 10:19 ` [tip:x86/boot] Documentation/kernel-parameters.txt: Document rand_mem_physical_padding= tip-bot for 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=20181001140843.26137-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).