From: Peter Zijlstra <peterz@infradead.org>
To: m.mizuma@jp.fujitsu.com, bhe@redhat.com, bp@alien8.de,
torvalds@linux-foundation.org, msys.mizuma@gmail.com,
tglx@linutronix.de, linux-kernel@vger.kernel.org,
mingo@kernel.org, hpa@zytor.com
Cc: linux-tip-commits@vger.kernel.org
Subject: Re: [tip:x86/boot] ACPI/NUMA: Add warning message if the padding size for KASLR is not enough
Date: Wed, 3 Oct 2018 14:34:02 +0200 [thread overview]
Message-ID: <20181003123402.GA15494@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <tip-3b054ca88c4f4dd5f516a12d4b6d6bd0ae826f41@git.kernel.org>
Subject: ACPI/NUMA: Fix KASLR build error
There is no point in trying to compile KASLR specific code when there is
no KASLR.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index 3d69834c692f..5767733976b3 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -436,7 +436,6 @@ 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;
@@ -466,8 +465,11 @@ int __init acpi_numa_init(void)
cnt = acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY,
acpi_parse_memory_affinity, 0);
+#ifdef CONFIG_RANDOMIZE_MEMORY
/* check the padding size for KASLR is enough. */
if (parsed_numa_memblks && kaslr_enabled()) {
+ u64 max_possible_phys, max_actual_phys, threshold;
+
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);
@@ -477,6 +479,7 @@ int __init acpi_numa_init(void)
(max_possible_phys - max_actual_phys) >> 40);
}
}
+#endif
}
/* SLIT: System Locality Information Table */
next prev parent reply other threads:[~2018-10-03 12:34 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 ` [PATCH v5 2/3] ACPI / NUMA: Add warning message if the padding size for KASLR is not enough Masayoshi Mizuma
2018-10-02 10:18 ` [tip:x86/boot] ACPI/NUMA: " 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 [this message]
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=20181003123402.GA15494@hirez.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=bhe@redhat.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=m.mizuma@jp.fujitsu.com \
--cc=mingo@kernel.org \
--cc=msys.mizuma@gmail.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.