Skip to contentSkip to conversation

arm64: kaslr: Use standard early random function

PATCH In review Guenter Roeck 3 participants 5 messages Aug 7, 2020 arm64

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 arm64: kaslr: Use standard early random function

Commit 585524081ecd ("random: random.h should include archrandom.h, not the other way around") tries to fix a problem with recursive inclusion of linux/random.h and arch/archrandom.h for arm64. Unfortunately, this results in the following compile error if ARCH_RANDOM is disabled.

arch/arm64/kernel/kaslr.c: In function 'kaslr_early_init':
arch/arm64/kernel/kaslr.c:128:6: error: implicit declaration of function '__early_cpu_has_rndr'; did you mean '__early_pfn_to_nid'? [-Werror=implicit-function-declaration]

  if (__early_cpu_has_rndr()) {
      ^~~~~~~~~~~~~~~~~~~~
      __early_pfn_to_nid
arch/arm64/kernel/kaslr.c:131:7: error: implicit declaration of function
'__arm64_rndr' [-Werror=implicit-function-declaration]
   if (__arm64_rndr(&raw))
       ^~~~~~~~~~~~

Problem is that arch/archrandom.h is only included from linux/random.h if ARCH_RANDOM is enabled. If not, __arm64_rndr() and __early_cpu_has_rndr() are undeclared, causing the problem.

Use arch_get_random_seed_long_early() instead of arm64 specific functions to solve the problem.

Fixes 585524081ecd ("random: random.h should include archrandom.h, not the other way around")
Cc Qian Cai <[email protected]>
Cc Mark Brown <[email protected]>

---
v2: Added Reviewed-by: and Tested-by: tags
Removed comment about side effect
(it wasn't correct; code functionality is the same)
Removed second Fixes: tag (did not apply)

 arch/arm64/kernel/kaslr.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
arch/arm64/kernel/kaslr.c +5 -7
index 9ded4237e1c1..b181e0544b79 100644
@@ -84,6 +84,7 @@ u64 __init kaslr_early_init(u64 dt_phys)
 	void *fdt;
 	u64 seed, offset, mask, module_range;
 	const u8 *cmdline, *str;
+	unsigned long raw;
 	int size;
 
 	/*
@@ -122,15 +123,12 @@ u64 __init kaslr_early_init(u64 dt_phys)
 	}
 
 	/*
-	 * Mix in any entropy obtainable architecturally, open coded
-	 * since this runs extremely early.
+	 * Mix in any entropy obtainable architecturally if enabled
+	 * and supported.
 	 */
-	if (__early_cpu_has_rndr()) {
-		unsigned long raw;
 
-		if (__arm64_rndr(&raw))
-			seed ^= raw;
-	}
+	if (arch_get_random_seed_long_early(&raw))
+		seed ^= raw;
 
 	if (!seed) {
 		kaslr_status = KASLR_DISABLED_NO_SEED;
Signature · 1 line
2.17.1
maintainer Acked-by on v2 1/1
#1 lore raw
Quoted 24 lines · Guenter Roeck

Commit 585524081ecd ("random: random.h should include archrandom.h, not the other way around") tries to fix a problem with recursive inclusion of linux/random.h and arch/archrandom.h for arm64. Unfortunately, this results in the following compile error if ARCH_RANDOM is disabled.

arch/arm64/kernel/kaslr.c: In function 'kaslr_early_init':
arch/arm64/kernel/kaslr.c:128:6: error: implicit declaration of function '__early_cpu_has_rndr'; did you mean '__early_pfn_to_nid'? [-Werror=implicit-function-declaration]

  if (__early_cpu_has_rndr()) {
      ^~~~~~~~~~~~~~~~~~~~
      __early_pfn_to_nid
arch/arm64/kernel/kaslr.c:131:7: error: implicit declaration of function
'__arm64_rndr' [-Werror=implicit-function-declaration]
   if (__arm64_rndr(&raw))
       ^~~~~~~~~~~~

Problem is that arch/archrandom.h is only included from linux/random.h if ARCH_RANDOM is enabled. If not, __arm64_rndr() and __early_cpu_has_rndr() are undeclared, causing the problem.

Use arch_get_random_seed_long_early() instead of arm64 specific functions to solve the problem.

Quoted 8 lines
Fixes 585524081ecd ("random: random.h should include archrandom.h, not the other way around")
Cc Qian Cai <[email protected]>
Cc Mark Brown <[email protected]>

Linus, could you please pick this up directly? Otherwise, it will wait until we reach -rc1 to avoid basing a branch on a random commit.

(at the moment I can't build Linus' tree at all, fails early with some device tree errors)

Thanks.

Signature · 1 line
Catalin
#2 lore raw
Quoted 5 lines · Catalin Marinas

Linus, could you please pick this up directly? Otherwise, it will wait until we reach -rc1 to avoid basing a branch on a random commit.

Already done, since I was the cause of the mess. But because I did it early, your Acked-by didn't get in.

Linus

maintainer
#3 lore raw
Quoted 8 lines · Linus Torvalds
Quoted 4 lines · Catalin Marinas

Linus, could you please pick this up directly? Otherwise, it will wait until we reach -rc1 to avoid basing a branch on a random commit.

Already done, since I was the cause of the mess. But because I did it early, your Acked-by didn't get in.

Thanks (and no problem about the ack).

Signature · 1 line
Catalin
#4 lore raw
In reply to Catalin Marinas
Quoted 34 lines · Catalin Marinas
Quoted 24 lines · Guenter Roeck

Commit 585524081ecd ("random: random.h should include archrandom.h, not the other way around") tries to fix a problem with recursive inclusion of linux/random.h and arch/archrandom.h for arm64. Unfortunately, this results in the following compile error if ARCH_RANDOM is disabled.

arch/arm64/kernel/kaslr.c: In function 'kaslr_early_init':
arch/arm64/kernel/kaslr.c:128:6: error: implicit declaration of function '__early_cpu_has_rndr'; did you mean '__early_pfn_to_nid'? [-Werror=implicit-function-declaration]

  if (__early_cpu_has_rndr()) {
      ^~~~~~~~~~~~~~~~~~~~
      __early_pfn_to_nid
arch/arm64/kernel/kaslr.c:131:7: error: implicit declaration of function
'__arm64_rndr' [-Werror=implicit-function-declaration]
   if (__arm64_rndr(&raw))
       ^~~~~~~~~~~~

Problem is that arch/archrandom.h is only included from linux/random.h if ARCH_RANDOM is enabled. If not, __arm64_rndr() and __early_cpu_has_rndr() are undeclared, causing the problem.

Use arch_get_random_seed_long_early() instead of arm64 specific functions to solve the problem.

Quoted 8 lines
Fixes 585524081ecd ("random: random.h should include archrandom.h, not the other way around")
Cc Qian Cai <[email protected]>
Cc Mark Brown <[email protected]>
Quoted 8 lines

Linus, could you please pick this up directly? Otherwise, it will wait until we reach -rc1 to avoid basing a branch on a random commit.

(at the moment I can't build Linus' tree at all, fails early with some device tree errors)

You either need to revert the dts changes, or you have to pull in "dt-bindings: agilex: add NAND_X_CLK and NAND_ECC_CLK" from linux-next to fix that problem. I did the latter to test this patch. Hopefully the problem resolves itself after the clock tree has been merged (though -next itself is in pretty bad shape too, so by then we may see other problems).

Guenter