[tip:x86/boot] x86/kaslr, ACPI/NUMA: Fix KASLR build error
Commit-ID: 9d94e8b1d4f94a3c4cee5ad11a1be460cd070839
Gitweb: https://git.kernel.org/tip/9d94e8b1d4f94a3c4cee5ad11a1be460cd070839
Author: Peter Zijlstra (Intel)
AuthorDate: Wed, 3 Oct 2018 14:41:27 +0200
Committer: Borislav Petkov
CommitDate: Tue, 9 Oct 2018 12:30:25 +0200
x86/kaslr, ACPI/NUMA: Fix KASLR build error
There is no point in trying to compile KASLR-specific code when there is
no KASLR.
[ bp: Move the whole crap into kaslr.c and make
rand_mem_physical_padding static. Make kaslr_check_padding()
weak to avoid build breakage on other architectures. ]
Reported-by: Naresh Kamboju
Reported-by: Mark Brown
Signed-off-by: Peter Zijlstra (Intel)
Signed-off-by: Borislav Petkov
Cc:
Cc:
Cc:
Cc:
Cc:
Cc:
Link:
http://lkml.kernel.org/r/20181003123402.ga15...@hirez.programming.kicks-ass.net
---
arch/x86/include/asm/setup.h | 2 --
arch/x86/mm/kaslr.c | 19 ++-
drivers/acpi/numa.c | 17 +
3 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
index 65a5bf8f6aba..ae13bc974416 100644
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@ -80,8 +80,6 @@ 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/arch/x86/mm/kaslr.c b/arch/x86/mm/kaslr.c
index 00cf4cae38f5..b3471388288d 100644
--- a/arch/x86/mm/kaslr.c
+++ b/arch/x86/mm/kaslr.c
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#include
#include
@@ -40,7 +41,7 @@
*/
static const unsigned long vaddr_end = CPU_ENTRY_AREA_BASE;
-int __initdata rand_mem_physical_padding =
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING;
+static int __initdata rand_mem_physical_padding =
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING;
/*
* Memory regions randomized by KASLR (except modules that use a separate logic
* earlier during boot). The list is ordered based on virtual addresses. This
@@ -70,6 +71,22 @@ static inline bool kaslr_memory_enabled(void)
return kaslr_enabled() && !IS_ENABLED(CONFIG_KASAN);
}
+/*
+ * Check the padding size for KASLR is enough.
+ */
+void __init kaslr_check_padding(void)
+{
+ 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);
+
+ 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);
+}
+
static int __init rand_mem_physical_padding_setup(char *str)
{
int max_padding = (1 << (MAX_PHYSMEM_BITS - TB_SHIFT)) - 1;
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index 3d69834c692f..ba62004f4d86 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -32,7 +32,6 @@
#include
#include
#include
-#include
static nodemask_t nodes_found_map = NODE_MASK_NONE;
@@ -433,10 +432,12 @@ acpi_table_parse_srat(enum acpi_srat_type id,
handler, max_entries);
}
+/* To be overridden by architectures */
+void __init __weak kaslr_check_padding(void) { }
+
int __init acpi_numa_init(void)
{
int cnt = 0;
- u64 max_possible_phys, max_actual_phys, threshold;
if (acpi_disabled)
return -EINVAL;
@@ -466,17 +467,9 @@ 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 (parsed_numa_memblks)
+ kaslr_check_padding();
- 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 */
[tip:x86/boot] x86/kaslr, ACPI/NUMA: Fix KASLR build error
Commit-ID: 9d94e8b1d4f94a3c4cee5ad11a1be460cd070839
Gitweb: https://git.kernel.org/tip/9d94e8b1d4f94a3c4cee5ad11a1be460cd070839
Author: Peter Zijlstra (Intel)
AuthorDate: Wed, 3 Oct 2018 14:41:27 +0200
Committer: Borislav Petkov
CommitDate: Tue, 9 Oct 2018 12:30:25 +0200
x86/kaslr, ACPI/NUMA: Fix KASLR build error
There is no point in trying to compile KASLR-specific code when there is
no KASLR.
[ bp: Move the whole crap into kaslr.c and make
rand_mem_physical_padding static. Make kaslr_check_padding()
weak to avoid build breakage on other architectures. ]
Reported-by: Naresh Kamboju
Reported-by: Mark Brown
Signed-off-by: Peter Zijlstra (Intel)
Signed-off-by: Borislav Petkov
Cc:
Cc:
Cc:
Cc:
Cc:
Cc:
Link:
http://lkml.kernel.org/r/20181003123402.ga15...@hirez.programming.kicks-ass.net
---
arch/x86/include/asm/setup.h | 2 --
arch/x86/mm/kaslr.c | 19 ++-
drivers/acpi/numa.c | 17 +
3 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
index 65a5bf8f6aba..ae13bc974416 100644
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@ -80,8 +80,6 @@ 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/arch/x86/mm/kaslr.c b/arch/x86/mm/kaslr.c
index 00cf4cae38f5..b3471388288d 100644
--- a/arch/x86/mm/kaslr.c
+++ b/arch/x86/mm/kaslr.c
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#include
#include
@@ -40,7 +41,7 @@
*/
static const unsigned long vaddr_end = CPU_ENTRY_AREA_BASE;
-int __initdata rand_mem_physical_padding =
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING;
+static int __initdata rand_mem_physical_padding =
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING;
/*
* Memory regions randomized by KASLR (except modules that use a separate logic
* earlier during boot). The list is ordered based on virtual addresses. This
@@ -70,6 +71,22 @@ static inline bool kaslr_memory_enabled(void)
return kaslr_enabled() && !IS_ENABLED(CONFIG_KASAN);
}
+/*
+ * Check the padding size for KASLR is enough.
+ */
+void __init kaslr_check_padding(void)
+{
+ 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);
+
+ 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);
+}
+
static int __init rand_mem_physical_padding_setup(char *str)
{
int max_padding = (1 << (MAX_PHYSMEM_BITS - TB_SHIFT)) - 1;
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index 3d69834c692f..ba62004f4d86 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -32,7 +32,6 @@
#include
#include
#include
-#include
static nodemask_t nodes_found_map = NODE_MASK_NONE;
@@ -433,10 +432,12 @@ acpi_table_parse_srat(enum acpi_srat_type id,
handler, max_entries);
}
+/* To be overridden by architectures */
+void __init __weak kaslr_check_padding(void) { }
+
int __init acpi_numa_init(void)
{
int cnt = 0;
- u64 max_possible_phys, max_actual_phys, threshold;
if (acpi_disabled)
return -EINVAL;
@@ -466,17 +467,9 @@ 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 (parsed_numa_memblks)
+ kaslr_check_padding();
- 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 */
Re: [tip:x86/boot] x86/kaslr, ACPI/NUMA: Fix KASLR build error
On Mon, Oct 08, 2018 at 03:48:28PM +0200, Arnd Bergmann wrote: > I think __weak functions are too fragile, when you do this and it > turns out that another architecture does need to do something, > you won't ever get any indication of it. > > If we know that arm64 doesn't need to do anything here, just > add an arch/arm64/include/asm/kaslr.h with an empty function > there. I'm looking at fs/proc/vmcore.c and all those other weak functions there and just doing the same. Also, judging by $ git grep CONFIG_PROC_VMCORE output, ia64, mips and powerpc would need that include too. -- Regards/Gruss, Boris. SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)
Re: [tip:x86/boot] x86/kaslr, ACPI/NUMA: Fix KASLR build error
On Mon, Oct 08, 2018 at 03:48:28PM +0200, Arnd Bergmann wrote: > I think __weak functions are too fragile, when you do this and it > turns out that another architecture does need to do something, > you won't ever get any indication of it. > > If we know that arm64 doesn't need to do anything here, just > add an arch/arm64/include/asm/kaslr.h with an empty function > there. I'm looking at fs/proc/vmcore.c and all those other weak functions there and just doing the same. Also, judging by $ git grep CONFIG_PROC_VMCORE output, ia64, mips and powerpc would need that include too. -- Regards/Gruss, Boris. SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)
Re: [tip:x86/boot] x86/kaslr, ACPI/NUMA: Fix KASLR build error
On Mon, Oct 8, 2018 at 3:01 PM Borislav Petkov wrote:
>
> On Mon, Oct 08, 2018 at 04:33:29PM +0530, Naresh Kamboju wrote:
> > Linux next build for arm64 failed due to
> > numa.c:34:10: fatal error: asm/kaslr.h: No such file or directory
>
> Thanks for letting me know, I guess we could fix that with a weak
> function:
>
> +/* To be overridden by architectures */
> +void __init __weak kaslr_check_padding(void) { }
> +
> int __init acpi_numa_init(void)
> {
> int cnt = 0;
>
I think __weak functions are too fragile, when you do this and it
turns out that another architecture does need to do something,
you won't ever get any indication of it.
If we know that arm64 doesn't need to do anything here, just
add an arch/arm64/include/asm/kaslr.h with an empty function
there.
Arnd
Re: [tip:x86/boot] x86/kaslr, ACPI/NUMA: Fix KASLR build error
On Mon, Oct 8, 2018 at 3:01 PM Borislav Petkov wrote:
>
> On Mon, Oct 08, 2018 at 04:33:29PM +0530, Naresh Kamboju wrote:
> > Linux next build for arm64 failed due to
> > numa.c:34:10: fatal error: asm/kaslr.h: No such file or directory
>
> Thanks for letting me know, I guess we could fix that with a weak
> function:
>
> +/* To be overridden by architectures */
> +void __init __weak kaslr_check_padding(void) { }
> +
> int __init acpi_numa_init(void)
> {
> int cnt = 0;
>
I think __weak functions are too fragile, when you do this and it
turns out that another architecture does need to do something,
you won't ever get any indication of it.
If we know that arm64 doesn't need to do anything here, just
add an arch/arm64/include/asm/kaslr.h with an empty function
there.
Arnd
Re: [tip:x86/boot] x86/kaslr, ACPI/NUMA: Fix KASLR build error
On Mon, Oct 08, 2018 at 04:33:29PM +0530, Naresh Kamboju wrote:
> Linux next build for arm64 failed due to
> numa.c:34:10: fatal error: asm/kaslr.h: No such file or directory
Thanks for letting me know, I guess we could fix that with a weak
function:
---
arch/x86/include/asm/kaslr.h | 2 --
drivers/acpi/numa.c | 4 +++-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/include/asm/kaslr.h b/arch/x86/include/asm/kaslr.h
index 95ef3fc01d12..db7ba2feb947 100644
--- a/arch/x86/include/asm/kaslr.h
+++ b/arch/x86/include/asm/kaslr.h
@@ -6,10 +6,8 @@ unsigned long kaslr_get_random_long(const char *purpose);
#ifdef CONFIG_RANDOMIZE_MEMORY
void kernel_randomize_memory(void);
-void kaslr_check_padding(void);
#else
static inline void kernel_randomize_memory(void) { }
-static inline void kaslr_check_padding(void) { }
#endif /* CONFIG_RANDOMIZE_MEMORY */
#endif
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index 4408e37600ef..ba62004f4d86 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -32,7 +32,6 @@
#include
#include
#include
-#include
static nodemask_t nodes_found_map = NODE_MASK_NONE;
@@ -433,6 +432,9 @@ acpi_table_parse_srat(enum acpi_srat_type id,
handler, max_entries);
}
+/* To be overridden by architectures */
+void __init __weak kaslr_check_padding(void) { }
+
int __init acpi_numa_init(void)
{
int cnt = 0;
--
2.19.0.271.gfe8321ec057f
--
Regards/Gruss,
Boris.
SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284
(AG Nürnberg)
Re: [tip:x86/boot] x86/kaslr, ACPI/NUMA: Fix KASLR build error
On Mon, Oct 08, 2018 at 04:33:29PM +0530, Naresh Kamboju wrote:
> Linux next build for arm64 failed due to
> numa.c:34:10: fatal error: asm/kaslr.h: No such file or directory
Thanks for letting me know, I guess we could fix that with a weak
function:
---
arch/x86/include/asm/kaslr.h | 2 --
drivers/acpi/numa.c | 4 +++-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/include/asm/kaslr.h b/arch/x86/include/asm/kaslr.h
index 95ef3fc01d12..db7ba2feb947 100644
--- a/arch/x86/include/asm/kaslr.h
+++ b/arch/x86/include/asm/kaslr.h
@@ -6,10 +6,8 @@ unsigned long kaslr_get_random_long(const char *purpose);
#ifdef CONFIG_RANDOMIZE_MEMORY
void kernel_randomize_memory(void);
-void kaslr_check_padding(void);
#else
static inline void kernel_randomize_memory(void) { }
-static inline void kaslr_check_padding(void) { }
#endif /* CONFIG_RANDOMIZE_MEMORY */
#endif
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index 4408e37600ef..ba62004f4d86 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -32,7 +32,6 @@
#include
#include
#include
-#include
static nodemask_t nodes_found_map = NODE_MASK_NONE;
@@ -433,6 +432,9 @@ acpi_table_parse_srat(enum acpi_srat_type id,
handler, max_entries);
}
+/* To be overridden by architectures */
+void __init __weak kaslr_check_padding(void) { }
+
int __init acpi_numa_init(void)
{
int cnt = 0;
--
2.19.0.271.gfe8321ec057f
--
Regards/Gruss,
Boris.
SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284
(AG Nürnberg)
Re: [tip:x86/boot] x86/kaslr, ACPI/NUMA: Fix KASLR build error
Linux next build for arm64 failed due to numa.c:34:10: fatal error: asm/kaslr.h: No such file or directory On Wed, 3 Oct 2018 at 19:52, tip-bot for Peter Zijlstra (Intel) wrote: > > Commit-ID: 3a387c6d96e69f1710a3804eb68e1253263298f2 > Gitweb: > https://git.kernel.org/tip/3a387c6d96e69f1710a3804eb68e1253263298f2 > Author: Peter Zijlstra (Intel) > AuthorDate: Wed, 3 Oct 2018 14:41:27 +0200 > Committer: Borislav Petkov > CommitDate: Wed, 3 Oct 2018 16:15:49 +0200 > > x86/kaslr, ACPI/NUMA: Fix KASLR build error > > There is no point in trying to compile KASLR-specific code when there is > no KASLR. > > [ bp: Move the whole crap into kaslr.c and make >rand_mem_physical_padding static. ] > > Signed-off-by: Peter Zijlstra (Intel) > diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c > index 3d69834c692f..4408e37600ef 100644 > --- a/drivers/acpi/numa.c > +++ b/drivers/acpi/numa.c > @@ -32,7 +32,7 @@ > #include > #include > #include > -#include > +#include kernel-source/drivers/acpi/numa.c:34:10: fatal error: asm/kaslr.h: No such file or directory #include ^ compilation terminated. kernel-source/scripts/Makefile.build:295: recipe for target 'drivers/acpi/numa.o' failed make[4]: *** [drivers/acpi/numa.o] Error 1 make[4]: *** Waiting for unfinished jobs CC lib/win_minmax.o CC drivers/base/soc.o kernel-source/scripts/Makefile.build:520: recipe for target 'drivers/acpi' failed make[3]: *** [drivers/acpi] Error 2
Re: [tip:x86/boot] x86/kaslr, ACPI/NUMA: Fix KASLR build error
Linux next build for arm64 failed due to numa.c:34:10: fatal error: asm/kaslr.h: No such file or directory On Wed, 3 Oct 2018 at 19:52, tip-bot for Peter Zijlstra (Intel) wrote: > > Commit-ID: 3a387c6d96e69f1710a3804eb68e1253263298f2 > Gitweb: > https://git.kernel.org/tip/3a387c6d96e69f1710a3804eb68e1253263298f2 > Author: Peter Zijlstra (Intel) > AuthorDate: Wed, 3 Oct 2018 14:41:27 +0200 > Committer: Borislav Petkov > CommitDate: Wed, 3 Oct 2018 16:15:49 +0200 > > x86/kaslr, ACPI/NUMA: Fix KASLR build error > > There is no point in trying to compile KASLR-specific code when there is > no KASLR. > > [ bp: Move the whole crap into kaslr.c and make >rand_mem_physical_padding static. ] > > Signed-off-by: Peter Zijlstra (Intel) > diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c > index 3d69834c692f..4408e37600ef 100644 > --- a/drivers/acpi/numa.c > +++ b/drivers/acpi/numa.c > @@ -32,7 +32,7 @@ > #include > #include > #include > -#include > +#include kernel-source/drivers/acpi/numa.c:34:10: fatal error: asm/kaslr.h: No such file or directory #include ^ compilation terminated. kernel-source/scripts/Makefile.build:295: recipe for target 'drivers/acpi/numa.o' failed make[4]: *** [drivers/acpi/numa.o] Error 1 make[4]: *** Waiting for unfinished jobs CC lib/win_minmax.o CC drivers/base/soc.o kernel-source/scripts/Makefile.build:520: recipe for target 'drivers/acpi' failed make[3]: *** [drivers/acpi] Error 2
[tip:x86/boot] x86/kaslr, ACPI/NUMA: Fix KASLR build error
Commit-ID: 3a387c6d96e69f1710a3804eb68e1253263298f2
Gitweb: https://git.kernel.org/tip/3a387c6d96e69f1710a3804eb68e1253263298f2
Author: Peter Zijlstra (Intel)
AuthorDate: Wed, 3 Oct 2018 14:41:27 +0200
Committer: Borislav Petkov
CommitDate: Wed, 3 Oct 2018 16:15:49 +0200
x86/kaslr, ACPI/NUMA: Fix KASLR build error
There is no point in trying to compile KASLR-specific code when there is
no KASLR.
[ bp: Move the whole crap into kaslr.c and make
rand_mem_physical_padding static. ]
Signed-off-by: Peter Zijlstra (Intel)
Signed-off-by: Borislav Petkov
Cc:
Cc:
Cc:
Cc:
Cc:
Cc:
Link:
http://lkml.kernel.org/r/20181003123402.ga15...@hirez.programming.kicks-ass.net
---
arch/x86/include/asm/kaslr.h | 2 ++
arch/x86/include/asm/setup.h | 2 --
arch/x86/mm/kaslr.c | 19 ++-
drivers/acpi/numa.c | 15 +++
4 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/arch/x86/include/asm/kaslr.h b/arch/x86/include/asm/kaslr.h
index db7ba2feb947..95ef3fc01d12 100644
--- a/arch/x86/include/asm/kaslr.h
+++ b/arch/x86/include/asm/kaslr.h
@@ -6,8 +6,10 @@ unsigned long kaslr_get_random_long(const char *purpose);
#ifdef CONFIG_RANDOMIZE_MEMORY
void kernel_randomize_memory(void);
+void kaslr_check_padding(void);
#else
static inline void kernel_randomize_memory(void) { }
+static inline void kaslr_check_padding(void) { }
#endif /* CONFIG_RANDOMIZE_MEMORY */
#endif
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
index 65a5bf8f6aba..ae13bc974416 100644
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@ -80,8 +80,6 @@ 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/arch/x86/mm/kaslr.c b/arch/x86/mm/kaslr.c
index 00cf4cae38f5..b3471388288d 100644
--- a/arch/x86/mm/kaslr.c
+++ b/arch/x86/mm/kaslr.c
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#include
#include
@@ -40,7 +41,7 @@
*/
static const unsigned long vaddr_end = CPU_ENTRY_AREA_BASE;
-int __initdata rand_mem_physical_padding =
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING;
+static int __initdata rand_mem_physical_padding =
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING;
/*
* Memory regions randomized by KASLR (except modules that use a separate logic
* earlier during boot). The list is ordered based on virtual addresses. This
@@ -70,6 +71,22 @@ static inline bool kaslr_memory_enabled(void)
return kaslr_enabled() && !IS_ENABLED(CONFIG_KASAN);
}
+/*
+ * Check the padding size for KASLR is enough.
+ */
+void __init kaslr_check_padding(void)
+{
+ 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);
+
+ 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);
+}
+
static int __init rand_mem_physical_padding_setup(char *str)
{
int max_padding = (1 << (MAX_PHYSMEM_BITS - TB_SHIFT)) - 1;
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index 3d69834c692f..4408e37600ef 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -32,7 +32,7 @@
#include
#include
#include
-#include
+#include
static nodemask_t nodes_found_map = NODE_MASK_NONE;
@@ -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,17 +465,9 @@ 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 (parsed_numa_memblks)
+ kaslr_check_padding();
- 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
[tip:x86/boot] x86/kaslr, ACPI/NUMA: Fix KASLR build error
Commit-ID: 3a387c6d96e69f1710a3804eb68e1253263298f2
Gitweb: https://git.kernel.org/tip/3a387c6d96e69f1710a3804eb68e1253263298f2
Author: Peter Zijlstra (Intel)
AuthorDate: Wed, 3 Oct 2018 14:41:27 +0200
Committer: Borislav Petkov
CommitDate: Wed, 3 Oct 2018 16:15:49 +0200
x86/kaslr, ACPI/NUMA: Fix KASLR build error
There is no point in trying to compile KASLR-specific code when there is
no KASLR.
[ bp: Move the whole crap into kaslr.c and make
rand_mem_physical_padding static. ]
Signed-off-by: Peter Zijlstra (Intel)
Signed-off-by: Borislav Petkov
Cc:
Cc:
Cc:
Cc:
Cc:
Cc:
Link:
http://lkml.kernel.org/r/20181003123402.ga15...@hirez.programming.kicks-ass.net
---
arch/x86/include/asm/kaslr.h | 2 ++
arch/x86/include/asm/setup.h | 2 --
arch/x86/mm/kaslr.c | 19 ++-
drivers/acpi/numa.c | 15 +++
4 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/arch/x86/include/asm/kaslr.h b/arch/x86/include/asm/kaslr.h
index db7ba2feb947..95ef3fc01d12 100644
--- a/arch/x86/include/asm/kaslr.h
+++ b/arch/x86/include/asm/kaslr.h
@@ -6,8 +6,10 @@ unsigned long kaslr_get_random_long(const char *purpose);
#ifdef CONFIG_RANDOMIZE_MEMORY
void kernel_randomize_memory(void);
+void kaslr_check_padding(void);
#else
static inline void kernel_randomize_memory(void) { }
+static inline void kaslr_check_padding(void) { }
#endif /* CONFIG_RANDOMIZE_MEMORY */
#endif
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
index 65a5bf8f6aba..ae13bc974416 100644
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@ -80,8 +80,6 @@ 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/arch/x86/mm/kaslr.c b/arch/x86/mm/kaslr.c
index 00cf4cae38f5..b3471388288d 100644
--- a/arch/x86/mm/kaslr.c
+++ b/arch/x86/mm/kaslr.c
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#include
#include
@@ -40,7 +41,7 @@
*/
static const unsigned long vaddr_end = CPU_ENTRY_AREA_BASE;
-int __initdata rand_mem_physical_padding =
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING;
+static int __initdata rand_mem_physical_padding =
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING;
/*
* Memory regions randomized by KASLR (except modules that use a separate logic
* earlier during boot). The list is ordered based on virtual addresses. This
@@ -70,6 +71,22 @@ static inline bool kaslr_memory_enabled(void)
return kaslr_enabled() && !IS_ENABLED(CONFIG_KASAN);
}
+/*
+ * Check the padding size for KASLR is enough.
+ */
+void __init kaslr_check_padding(void)
+{
+ 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);
+
+ 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);
+}
+
static int __init rand_mem_physical_padding_setup(char *str)
{
int max_padding = (1 << (MAX_PHYSMEM_BITS - TB_SHIFT)) - 1;
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index 3d69834c692f..4408e37600ef 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -32,7 +32,7 @@
#include
#include
#include
-#include
+#include
static nodemask_t nodes_found_map = NODE_MASK_NONE;
@@ -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,17 +465,9 @@ 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 (parsed_numa_memblks)
+ kaslr_check_padding();
- 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
