Skip to contentSkip to conversation

powerpc: wire up rng during setup_arch

PATCH Superseded Jason A. Donenfeld 4 participants 17 messages Jun 11, 2022 – Jun 26, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v3 cover powerpc: wire up rng during setup_arch

The platform's RNG must be available before random_init() in order to be useful for initial seeding, which in turn means that it needs to be called from setup_arch(), rather than from an init call. This series wires that up properly on the three platforms that currently initialize the RNG from the wrong place.

Cc Michael Ellerman <[email protected]>
Cc Christophe Leroy <[email protected]>

Jason A. Donenfeld (3):
powerpc/microwatt: wire up rng during setup_arch powerpc/powernv: wire up rng during setup_arch powerpc/pseries: wire up rng during setup_arch

 arch/powerpc/platforms/microwatt/microwatt.h |  7 +++++++
 arch/powerpc/platforms/microwatt/rng.c       | 10 +++-------
 arch/powerpc/platforms/microwatt/setup.c     |  8 ++++++++
 arch/powerpc/platforms/powernv/powernv.h     |  2 ++
 arch/powerpc/platforms/powernv/rng.c         | 18 +++++-------------
 arch/powerpc/platforms/powernv/setup.c       |  2 ++
 arch/powerpc/platforms/pseries/pseries.h     |  2 ++
 arch/powerpc/platforms/pseries/rng.c         | 11 +++--------
 arch/powerpc/platforms/pseries/setup.c       |  1 +
 9 files changed, 33 insertions(+), 28 deletions(-)
 create mode 100644 arch/powerpc/platforms/microwatt/microwatt.h
Signature · 1 line
2.35.1
#1 lore raw

PATCH v3 1/3 powerpc/microwatt: wire up rng during setup_arch

The platform's RNG must be available before random_init() in order to be useful for initial seeding, which in turn means that it needs to be called from setup_arch(), rather than from an init call. Fortunately, each platform already has a setup_arch function pointer, which means it's easy to wire this up. This commit also removes some noisy log messages that don't add much.

Cc Michael Ellerman <[email protected]>
Cc Christophe Leroy <[email protected]>
Fixes c25769fddaec ("powerpc/microwatt: Add support for hardware random number generator")
---
 arch/powerpc/platforms/microwatt/microwatt.h |  7 +++++++
 arch/powerpc/platforms/microwatt/rng.c       | 10 +++-------
 arch/powerpc/platforms/microwatt/setup.c     |  8 ++++++++
 3 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 arch/powerpc/platforms/microwatt/microwatt.h
arch/powerpc/platforms/microwatt/microwatt.h new file +7 -0
new file mode 100644
index 000000000000..335417e95e66
@@ -0,0 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _MICROWATT_H
+#define _MICROWATT_H
+
+void microwatt_rng_init(void);
+
+#endif /* _MICROWATT_H */
arch/powerpc/platforms/microwatt/rng.c +3 -7
index 7bc4d1cbfaf0..8ece87d005c8 100644
@@ -11,6 +11,7 @@
 #include <asm/archrandom.h>
 #include <asm/cputable.h>
 #include <asm/machdep.h>
+#include "microwatt.h"
 
 #define DARN_ERR 0xFFFFFFFFFFFFFFFFul
 
@@ -29,7 +30,7 @@ static int microwatt_get_random_darn(unsigned long *v)
 	return 1;
 }
 
-static __init int rng_init(void)
+void __init microwatt_rng_init(void)
 {
 	unsigned long val;
 	int i;
@@ -37,12 +38,7 @@ static __init int rng_init(void)
 	for (i = 0; i < 10; i++) {
 		if (microwatt_get_random_darn(&val)) {
 			ppc_md.get_random_seed = microwatt_get_random_darn;
-			return 0;
+			return;
 		}
 	}
-
-	pr_warn("Unable to use DARN for get_random_seed()\n");
-
-	return -EIO;
 }
-machine_subsys_initcall(, rng_init);
arch/powerpc/platforms/microwatt/setup.c +8 -0
index 0b02603bdb74..6b32539395a4 100644
@@ -16,6 +16,8 @@
 #include <asm/xics.h>
 #include <asm/udbg.h>
 
+#include "microwatt.h"
+
 static void __init microwatt_init_IRQ(void)
 {
 	xics_init();
@@ -32,10 +34,16 @@ static int __init microwatt_populate(void)
 }
 machine_arch_initcall(microwatt, microwatt_populate);
 
+static void __init microwatt_setup_arch(void)
+{
+	microwatt_rng_init();
+}
+
 define_machine(microwatt) {
 	.name			= "microwatt",
 	.probe			= microwatt_probe,
 	.init_IRQ		= microwatt_init_IRQ,
+	.setup_arch		= microwatt_setup_arch,
 	.progress		= udbg_progress,
 	.calibrate_decr		= generic_calibrate_decr,
 };
Signature · 1 line
2.35.1
Reviewed-by on v3 1/3
#2 lore raw

Re: [PATCH v3 1/3] powerpc/microwatt: wire up rng during setup_arch

Le 11/06/2022 à 17:10, Jason A. Donenfeld a écrit :

Quoted 7 lines

The platform's RNG must be available before random_init() in order to be useful for initial seeding, which in turn means that it needs to be called from setup_arch(), rather than from an init call. Fortunately, each platform already has a setup_arch function pointer, which means it's easy to wire this up. This commit also removes some noisy log messages that don't add much.

Quoted 5 lines
Cc Michael Ellerman <[email protected]>
Cc Christophe Leroy <[email protected]>
Fixes c25769fddaec ("powerpc/microwatt: Add support for hardware random number generator")
Quoted 85 lines
---
  arch/powerpc/platforms/microwatt/microwatt.h |  7 +++++++
  arch/powerpc/platforms/microwatt/rng.c       | 10 +++-------
  arch/powerpc/platforms/microwatt/setup.c     |  8 ++++++++
  3 files changed, 18 insertions(+), 7 deletions(-)

create mode 100644 arch/powerpc/platforms/microwatt/microwatt.h

arch/powerpc/platforms/microwatt/microwatt.h new file +7 -0
new file mode 100644
index 000000000000..335417e95e66
@@ -0,0 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _MICROWATT_H
+#define _MICROWATT_H
+
+void microwatt_rng_init(void);
+
+#endif /* _MICROWATT_H */
arch/powerpc/platforms/microwatt/rng.c +3 -7
index 7bc4d1cbfaf0..8ece87d005c8 100644
@@ -11,6 +11,7 @@
  #include <asm/archrandom.h>
  #include <asm/cputable.h>
  #include <asm/machdep.h>
+#include "microwatt.h"
 
  #define DARN_ERR 0xFFFFFFFFFFFFFFFFul
 
@@ -29,7 +30,7 @@ static int microwatt_get_random_darn(unsigned long *v)
  	return 1;
  }
 
-static __init int rng_init(void)
+void __init microwatt_rng_init(void)
  {
  	unsigned long val;
  	int i;
@@ -37,12 +38,7 @@ static __init int rng_init(void)
  	for (i = 0; i < 10; i++) {
  		if (microwatt_get_random_darn(&val)) {
  			ppc_md.get_random_seed = microwatt_get_random_darn;
-			return 0;
+			return;
  		}
  	}
-
-	pr_warn("Unable to use DARN for get_random_seed()\n");
-
-	return -EIO;
  }
-machine_subsys_initcall(, rng_init);
arch/powerpc/platforms/microwatt/setup.c +8 -0
index 0b02603bdb74..6b32539395a4 100644
@@ -16,6 +16,8 @@
  #include <asm/xics.h>
  #include <asm/udbg.h>
 
+#include "microwatt.h"
+
  static void __init microwatt_init_IRQ(void)
  {
  	xics_init();
@@ -32,10 +34,16 @@ static int __init microwatt_populate(void)
  }
  machine_arch_initcall(microwatt, microwatt_populate);
 
+static void __init microwatt_setup_arch(void)
+{
+	microwatt_rng_init();
+}
+
  define_machine(microwatt) {
  	.name			= "microwatt",
  	.probe			= microwatt_probe,
  	.init_IRQ		= microwatt_init_IRQ,
+	.setup_arch		= microwatt_setup_arch,
  	.progress		= udbg_progress,
  	.calibrate_decr		= generic_calibrate_decr,
  };
#3 lore raw

PATCH v3 2/3 powerpc/powernv: wire up rng during setup_arch

In reply to Jason A. Donenfeld

The platform's RNG must be available before random_init() in order to be useful for initial seeding, which in turn means that it needs to be called from setup_arch(), rather than from an init call. Fortunately, each platform already has a setup_arch function pointer, which means it's easy to wire this up. This commit also removes some noisy log messages that don't add much.

Cc Michael Ellerman <[email protected]>
Cc Christophe Leroy <[email protected]>
Fixes a4da0d50b2a0 ("powerpc: Implement arch_get_random_long/int() for powernv")
---
 arch/powerpc/platforms/powernv/powernv.h |  2 ++
 arch/powerpc/platforms/powernv/rng.c     | 18 +++++-------------
 arch/powerpc/platforms/powernv/setup.c   |  2 ++
 3 files changed, 9 insertions(+), 13 deletions(-)
arch/powerpc/platforms/powernv/powernv.h +2 -0
index e297bf4abfcb..fd3f5e1eb10b 100644
@@ -42,4 +42,6 @@ ssize_t memcons_copy(struct memcons *mc, char *to, loff_t pos, size_t count);
 u32 __init memcons_get_size(struct memcons *mc);
 struct memcons *__init memcons_init(struct device_node *node, const char *mc_prop_name);
 
+void powernv_rng_init(void);
+
 #endif /* _POWERNV_H */
arch/powerpc/platforms/powernv/rng.c +5 -13
index e3d44b36ae98..c86bf097e407 100644
@@ -17,6 +17,7 @@
 #include <asm/prom.h>
 #include <asm/machdep.h>
 #include <asm/smp.h>
+#include "powernv.h"
 
 #define DARN_ERR 0xFFFFFFFFFFFFFFFFul
 
@@ -84,24 +85,20 @@ static int powernv_get_random_darn(unsigned long *v)
 	return 1;
 }
 
-static int __init initialise_darn(void)
+static void __init initialise_darn(void)
 {
 	unsigned long val;
 	int i;
 
 	if (!cpu_has_feature(CPU_FTR_ARCH_300))
-		return -ENODEV;
+		return;
 
 	for (i = 0; i < 10; i++) {
 		if (powernv_get_random_darn(&val)) {
 			ppc_md.get_random_seed = powernv_get_random_darn;
-			return 0;
+			return;
 		}
 	}
-
-	pr_warn("Unable to use DARN for get_random_seed()\n");
-
-	return -EIO;
 }
 
 int powernv_get_random_long(unsigned long *v)
@@ -163,14 +160,12 @@ static __init int rng_create(struct device_node *dn)
 
 	rng_init_per_cpu(rng, dn);
 
-	pr_info_once("Registering arch random hook.\n");
-
 	ppc_md.get_random_seed = powernv_get_random_long;
 
 	return 0;
 }
 
-static __init int rng_init(void)
+void __init powernv_rng_init(void)
 {
 	struct device_node *dn;
 	int rc;
@@ -188,7 +183,4 @@ static __init int rng_init(void)
 	}
 
 	initialise_darn();
-
-	return 0;
 }
-machine_subsys_initcall(powernv, rng_init);
arch/powerpc/platforms/powernv/setup.c +2 -0
index 824c3ad7a0fa..a5fcb6796b22 100644
@@ -203,6 +203,8 @@ static void __init pnv_setup_arch(void)
 	pnv_check_guarded_cores();
 
 	/* XXX PMCS */
+
+	powernv_rng_init();
 }
 
 static void __init pnv_init(void)
Signature · 1 line
2.35.1
Reviewed-by on v3 2/3
#4 lore raw

Re: [PATCH v3 2/3] powerpc/powernv: wire up rng during setup_arch

Le 11/06/2022 à 17:10, Jason A. Donenfeld a écrit :

Quoted 7 lines

The platform's RNG must be available before random_init() in order to be useful for initial seeding, which in turn means that it needs to be called from setup_arch(), rather than from an init call. Fortunately, each platform already has a setup_arch function pointer, which means it's easy to wire this up. This commit also removes some noisy log messages that don't add much.

Quoted 5 lines
Cc Michael Ellerman <[email protected]>
Cc Christophe Leroy <[email protected]>
Fixes a4da0d50b2a0 ("powerpc: Implement arch_get_random_long/int() for powernv")
Quoted 94 lines
---
  arch/powerpc/platforms/powernv/powernv.h |  2 ++
  arch/powerpc/platforms/powernv/rng.c     | 18 +++++-------------
  arch/powerpc/platforms/powernv/setup.c   |  2 ++
  3 files changed, 9 insertions(+), 13 deletions(-)
arch/powerpc/platforms/powernv/powernv.h +2 -0
index e297bf4abfcb..fd3f5e1eb10b 100644
@@ -42,4 +42,6 @@ ssize_t memcons_copy(struct memcons *mc, char *to, loff_t pos, size_t count);
  u32 __init memcons_get_size(struct memcons *mc);
  struct memcons *__init memcons_init(struct device_node *node, const char *mc_prop_name);
 
+void powernv_rng_init(void);
+
  #endif /* _POWERNV_H */
arch/powerpc/platforms/powernv/rng.c +5 -13
index e3d44b36ae98..c86bf097e407 100644
@@ -17,6 +17,7 @@
  #include <asm/prom.h>
  #include <asm/machdep.h>
  #include <asm/smp.h>
+#include "powernv.h"
 
  #define DARN_ERR 0xFFFFFFFFFFFFFFFFul
 
@@ -84,24 +85,20 @@ static int powernv_get_random_darn(unsigned long *v)
  	return 1;
  }
 
-static int __init initialise_darn(void)
+static void __init initialise_darn(void)
  {
  	unsigned long val;
  	int i;
 
  	if (!cpu_has_feature(CPU_FTR_ARCH_300))
-		return -ENODEV;
+		return;
 
  	for (i = 0; i < 10; i++) {
  		if (powernv_get_random_darn(&val)) {
  			ppc_md.get_random_seed = powernv_get_random_darn;
-			return 0;
+			return;
  		}
  	}
-
-	pr_warn("Unable to use DARN for get_random_seed()\n");
-
-	return -EIO;
  }
 
  int powernv_get_random_long(unsigned long *v)
@@ -163,14 +160,12 @@ static __init int rng_create(struct device_node *dn)
 
  	rng_init_per_cpu(rng, dn);
 
-	pr_info_once("Registering arch random hook.\n");
-
  	ppc_md.get_random_seed = powernv_get_random_long;
 
  	return 0;
  }
 
-static __init int rng_init(void)
+void __init powernv_rng_init(void)
  {
  	struct device_node *dn;
  	int rc;
@@ -188,7 +183,4 @@ static __init int rng_init(void)
  	}
 
  	initialise_darn();
-
-	return 0;
  }
-machine_subsys_initcall(powernv, rng_init);
arch/powerpc/platforms/powernv/setup.c +2 -0
index 824c3ad7a0fa..a5fcb6796b22 100644
@@ -203,6 +203,8 @@ static void __init pnv_setup_arch(void)
  	pnv_check_guarded_cores();
 
  	/* XXX PMCS */
+
+	powernv_rng_init();
  }
 
  static void __init pnv_init(void)
#5 lore raw

Re: [PATCH v3 2/3] powerpc/powernv: wire up rng during setup_arch

In reply to Jason A. Donenfeld
Quoted 18 lines · Jason A. Donenfeld

The platform's RNG must be available before random_init() in order to be useful for initial seeding, which in turn means that it needs to be called from setup_arch(), rather than from an init call. Fortunately, each platform already has a setup_arch function pointer, which means it's easy to wire this up. This commit also removes some noisy log messages that don't add much.

Cc Michael Ellerman <[email protected]>
Cc Christophe Leroy <[email protected]>
Fixes a4da0d50b2a0 ("powerpc: Implement arch_get_random_long/int() for powernv")
---
 arch/powerpc/platforms/powernv/powernv.h |  2 ++
 arch/powerpc/platforms/powernv/rng.c     | 18 +++++-------------
 arch/powerpc/platforms/powernv/setup.c   |  2 ++
 3 files changed, 9 insertions(+), 13 deletions(-)

...

arch/powerpc/platforms/powernv/setup.c static void __init pnv_setup_arch(void) · line 208

Quoted 11 lines
arch/powerpc/platforms/powernv/setup.c +2 -0
index 824c3ad7a0fa..a5fcb6796b22 100644
@@ -203,6 +203,8 @@ static void __init pnv_setup_arch(void)
 	pnv_check_guarded_cores();
 
 	/* XXX PMCS */
+
+	powernv_rng_init();
 }

This crashes on power8 because it's too early to call kzalloc() in rng_create(), and it's also too early to setup the percpu variables in there.

I'll rework it and post a v4.

cheers

#6 lore raw

Re: [PATCH v3 2/3] powerpc/powernv: wire up rng during setup_arch

Hi Michael,

Quoted 5 lines · Michael Ellerman

This crashes on power8 because it's too early to call kzalloc() in rng_create(), and it's also too early to setup the percpu variables in there.

I'll rework it and post a v4.

Oh, darn. Sorry about that. Thanks for reworking it.

Jason

#7 lore raw

PATCH v4 1/1 powerpc/powernv: wire up rng during setup_arch

The platform's RNG must be available before random_init() in order to be useful for initial seeding, which in turn means that it needs to be called from setup_arch(), rather than from an init call. Fortunately, each platform already has a setup_arch function pointer, which means we can wire it up that way. Complicating things, however, is that POWER8 systems need some per-cpu state and kmalloc, which isn't available at this stage. So we split things into an early phase and a late phase, with the early phase working well enough to seed the RNG with a spinlock, before later getting fast per-cpu allocations. This commit also removes some noisy log messages that don't add much.

Cc Michael Ellerman <[email protected]>
Fixes a4da0d50b2a0 ("powerpc: Implement arch_get_random_long/int() for powernv")
---
 arch/powerpc/platforms/powernv/powernv.h |  2 +
 arch/powerpc/platforms/powernv/rng.c     | 68 ++++++++++++++++++------
 arch/powerpc/platforms/powernv/setup.c   |  2 +
 3 files changed, 55 insertions(+), 17 deletions(-)
arch/powerpc/platforms/powernv/powernv.h +2 -0
index e297bf4abfcb..fd3f5e1eb10b 100644
@@ -42,4 +42,6 @@ ssize_t memcons_copy(struct memcons *mc, char *to, loff_t pos, size_t count);
 u32 __init memcons_get_size(struct memcons *mc);
 struct memcons *__init memcons_init(struct device_node *node, const char *mc_prop_name);
 
+void powernv_rng_init(void);
+
 #endif /* _POWERNV_H */
arch/powerpc/platforms/powernv/rng.c +51 -17

112 lines not on this page · raw message

arch/powerpc/platforms/powernv/setup.c +2 -0
index 824c3ad7a0fa..a5fcb6796b22 100644
@@ -203,6 +203,8 @@ static void __init pnv_setup_arch(void)
 	pnv_check_guarded_cores();
 
 	/* XXX PMCS */
+
+	powernv_rng_init();
 }
 
 static void __init pnv_init(void)
Signature · 1 line
2.35.1
#8 lore raw

PATCH v5 1/1 powerpc/powernv: wire up rng during setup_arch

The platform's RNG must be available before random_init() in order to be useful for initial seeding, which in turn means that it needs to be called from setup_arch(), rather than from an init call. Fortunately, each platform already has a setup_arch function pointer, which means we can wire it up that way. Complicating things, however, is that POWER8 systems need some per-cpu state and kmalloc, which isn't available at this stage. So we split things up into an early phase and a later opportunistic phase. This commit also removes some noisy log messages that don't add much.

Cc Michael Ellerman <[email protected]>
Fixes a4da0d50b2a0 ("powerpc: Implement arch_get_random_long/int() for powernv")
---
 arch/powerpc/platforms/powernv/powernv.h |  2 +
 arch/powerpc/platforms/powernv/rng.c     | 47 ++++++++++++++++--------
 arch/powerpc/platforms/powernv/setup.c   |  2 +
 3 files changed, 35 insertions(+), 16 deletions(-)
arch/powerpc/platforms/powernv/powernv.h +2 -0
index e297bf4abfcb..fd3f5e1eb10b 100644
@@ -42,4 +42,6 @@ ssize_t memcons_copy(struct memcons *mc, char *to, loff_t pos, size_t count);
 u32 __init memcons_get_size(struct memcons *mc);
 struct memcons *__init memcons_init(struct device_node *node, const char *mc_prop_name);
 
+void powernv_rng_init(void);
+
 #endif /* _POWERNV_H */
arch/powerpc/platforms/powernv/rng.c +31 -16

85 lines not on this page · raw message

arch/powerpc/platforms/powernv/setup.c +2 -0
index 824c3ad7a0fa..a5fcb6796b22 100644
@@ -203,6 +203,8 @@ static void __init pnv_setup_arch(void)
 	pnv_check_guarded_cores();
 
 	/* XXX PMCS */
+
+	powernv_rng_init();
 }
 
 static void __init pnv_init(void)
Signature · 1 line
2.35.1
#9 lore raw

Re: [PATCH v5] powerpc/powernv: wire up rng during setup_arch

Le 21/06/2022 à 16:08, Jason A. Donenfeld a écrit :

Quoted 9 lines

The platform's RNG must be available before random_init() in order to be useful for initial seeding, which in turn means that it needs to be called from setup_arch(), rather than from an init call. Fortunately, each platform already has a setup_arch function pointer, which means we can wire it up that way. Complicating things, however, is that POWER8 systems need some per-cpu state and kmalloc, which isn't available at this stage. So we split things up into an early phase and a later opportunistic phase. This commit also removes some noisy log messages that don't add much.

Regarding the kmalloc(), I have not looked at it in details, but usually you can use memblock_alloc() when kmalloc is not available yet.

Christophe

#10 lore raw

Re: [PATCH v5] powerpc/powernv: wire up rng during setup_arch

Hi Christophe,

Quoted 11 lines · Christophe Leroy

Le 21/06/2022 à 16:08, Jason A. Donenfeld a écrit :

Quoted 9 lines

The platform's RNG must be available before random_init() in order to be useful for initial seeding, which in turn means that it needs to be called from setup_arch(), rather than from an init call. Fortunately, each platform already has a setup_arch function pointer, which means we can wire it up that way. Complicating things, however, is that POWER8 systems need some per-cpu state and kmalloc, which isn't available at this stage. So we split things up into an early phase and a later opportunistic phase. This commit also removes some noisy log messages that don't add much.

Quoted 2 lines

Regarding the kmalloc(), I have not looked at it in details, but usually you can use memblock_alloc() when kmalloc is not available yet.

That seems a bit excessive, especially as those allocations are long lived. And we don't even *need* it that early, but just before random_init(). Michael is running this v5 on the test rig overnight, so we'll learn in the Australian morning whether this finally did the trick (I hope).

Jason

#11 lore raw

Re: [PATCH v5] powerpc/powernv: wire up rng during setup_arch

Le 21/06/2022 à 20:47, Jason A. Donenfeld a écrit :

Quoted 14 lines

Hi Christophe,

Quoted 11 lines · Christophe Leroy

Le 21/06/2022 à 16:08, Jason A. Donenfeld a écrit :

Quoted 9 lines

The platform's RNG must be available before random_init() in order to be useful for initial seeding, which in turn means that it needs to be called from setup_arch(), rather than from an init call. Fortunately, each platform already has a setup_arch function pointer, which means we can wire it up that way. Complicating things, however, is that POWER8 systems need some per-cpu state and kmalloc, which isn't available at this stage. So we split things up into an early phase and a later opportunistic phase. This commit also removes some noisy log messages that don't add much.

Quoted 9 lines
Quoted 2 lines

Regarding the kmalloc(), I have not looked at it in details, but usually you can use memblock_alloc() when kmalloc is not available yet.

That seems a bit excessive, especially as those allocations are long lived. And we don't even *need* it that early, but just before random_init(). Michael is running this v5 on the test rig overnight, so we'll learn in the Australian morning whether this finally did the trick (I hope).

The fact that they are long lived make them a good candidate for memblock_alloc().

But fair enough, if they are not required that early then just do it later.

Christophe

#12 lore raw

Re: [PATCH v5] powerpc/powernv: wire up rng during setup_arch

Quoted 22 lines · Christophe Leroy

Le 21/06/2022 à 20:47, Jason A. Donenfeld a écrit :

Quoted 12 lines · Christophe Leroy
Quoted 11 lines

Le 21/06/2022 à 16:08, Jason A. Donenfeld a écrit :

Quoted 9 lines

The platform's RNG must be available before random_init() in order to be useful for initial seeding, which in turn means that it needs to be called from setup_arch(), rather than from an init call. Fortunately, each platform already has a setup_arch function pointer, which means we can wire it up that way. Complicating things, however, is that POWER8 systems need some per-cpu state and kmalloc, which isn't available at this stage. So we split things up into an early phase and a later opportunistic phase. This commit also removes some noisy log messages that don't add much.

Quoted 8 lines
Quoted 2 lines

Regarding the kmalloc(), I have not looked at it in details, but usually you can use memblock_alloc() when kmalloc is not available yet.

That seems a bit excessive, especially as those allocations are long lived. And we don't even *need* it that early, but just before random_init(). Michael is running this v5 on the test rig overnight, so we'll learn in the Australian morning whether this finally did the trick (I hope).

Quoted 4 lines

The fact that they are long lived make them a good candidate for memblock_alloc().

But fair enough, if they are not required that early then just do it later.

memblock works but then we trip on ioremap vs early_ioremap.

Fixing that is a bit of a pain as we'd have to stop using of_iomap() and we'd also need to switch the mappings to ioremap() later in boot.

We'd also have to defer the percpu initialisation.

So it's all just a bit of a pain when we actually only need to get the hook ready before random_init() which is called much later in boot when slab/ioremap/percpu are all ready.

cheers

#13 lore raw

Re: [PATCH v5] powerpc/powernv: wire up rng during setup_arch

In reply to Jason A. Donenfeld
Quoted 11 lines · Jason A. Donenfeld

The platform's RNG must be available before random_init() in order to be useful for initial seeding, which in turn means that it needs to be called from setup_arch(), rather than from an init call. Fortunately, each platform already has a setup_arch function pointer, which means we can wire it up that way. Complicating things, however, is that POWER8 systems need some per-cpu state and kmalloc, which isn't available at this stage. So we split things up into an early phase and a later opportunistic phase. This commit also removes some noisy log messages that don't add much.

[...]

Applied to powerpc/fixes.

[1/1] powerpc/powernv: wire up rng during setup_arch

      https://git.kernel.org/powerpc/c/f3eac426657d985b97c92fa5f7ae1d43f04721f3

cheers

#14 lore raw

PATCH v3 3/3 powerpc/pseries: wire up rng during setup_arch

In reply to Jason A. Donenfeld

The platform's RNG must be available before random_init() in order to be useful for initial seeding, which in turn means that it needs to be called from setup_arch(), rather than from an init call. Fortunately, each platform already has a setup_arch function pointer, which means it's easy to wire this up. This commit also removes some noisy log messages that don't add much.

Cc Michael Ellerman <[email protected]>
Cc Christophe Leroy <[email protected]>
Fixes a489043f4626 ("powerpc/pseries: Implement arch_get_random_long() based on H_RANDOM")
---
 arch/powerpc/platforms/pseries/pseries.h |  2 ++
 arch/powerpc/platforms/pseries/rng.c     | 11 +++--------
 arch/powerpc/platforms/pseries/setup.c   |  1 +
 3 files changed, 6 insertions(+), 8 deletions(-)
arch/powerpc/platforms/pseries/pseries.h +2 -0
index f5c916c839c9..1d75b7742ef0 100644
@@ -122,4 +122,6 @@ void pseries_lpar_read_hblkrm_characteristics(void);
 static inline void pseries_lpar_read_hblkrm_characteristics(void) { }
 #endif
 
+void pseries_rng_init(void);
+
 #endif /* _PSERIES_PSERIES_H */
arch/powerpc/platforms/pseries/rng.c +3 -8
index 6268545947b8..6ddfdeaace9e 100644
@@ -10,6 +10,7 @@
 #include <asm/archrandom.h>
 #include <asm/machdep.h>
 #include <asm/plpar_wrappers.h>
+#include "pseries.h"
 
 
 static int pseries_get_random_long(unsigned long *v)
@@ -24,19 +25,13 @@ static int pseries_get_random_long(unsigned long *v)
 	return 0;
 }
 
-static __init int rng_init(void)
+void __init pseries_rng_init(void)
 {
 	struct device_node *dn;
 
 	dn = of_find_compatible_node(NULL, NULL, "ibm,random");
 	if (!dn)
-		return -ENODEV;
-
-	pr_info("Registering arch random hook.\n");
-
+		return;
 	ppc_md.get_random_seed = pseries_get_random_long;
-
 	of_node_put(dn);
-	return 0;
 }
-machine_subsys_initcall(pseries, rng_init);
arch/powerpc/platforms/pseries/setup.c +1 -0
index afb074269b42..ee4f1db49515 100644
@@ -839,6 +839,7 @@ static void __init pSeries_setup_arch(void)
 	}
 
 	ppc_md.pcibios_root_bridge_prepare = pseries_root_bridge_prepare;
+	pseries_rng_init();
 }
 
 static void pseries_panic(char *str)
Signature · 1 line
2.35.1
Reviewed-by on v3 3/3
#15 lore raw

Re: [PATCH v3 3/3] powerpc/pseries: wire up rng during setup_arch

Le 11/06/2022 à 17:10, Jason A. Donenfeld a écrit :

Quoted 7 lines

The platform's RNG must be available before random_init() in order to be useful for initial seeding, which in turn means that it needs to be called from setup_arch(), rather than from an init call. Fortunately, each platform already has a setup_arch function pointer, which means it's easy to wire this up. This commit also removes some noisy log messages that don't add much.

Quoted 5 lines
Cc Michael Ellerman <[email protected]>
Cc Christophe Leroy <[email protected]>
Fixes a489043f4626 ("powerpc/pseries: Implement arch_get_random_long() based on H_RANDOM")
Quoted 63 lines
---
  arch/powerpc/platforms/pseries/pseries.h |  2 ++
  arch/powerpc/platforms/pseries/rng.c     | 11 +++--------
  arch/powerpc/platforms/pseries/setup.c   |  1 +
  3 files changed, 6 insertions(+), 8 deletions(-)
arch/powerpc/platforms/pseries/pseries.h +2 -0
index f5c916c839c9..1d75b7742ef0 100644
@@ -122,4 +122,6 @@ void pseries_lpar_read_hblkrm_characteristics(void);
  static inline void pseries_lpar_read_hblkrm_characteristics(void) { }
  #endif
 
+void pseries_rng_init(void);
+
  #endif /* _PSERIES_PSERIES_H */
arch/powerpc/platforms/pseries/rng.c +3 -8
index 6268545947b8..6ddfdeaace9e 100644
@@ -10,6 +10,7 @@
  #include <asm/archrandom.h>
  #include <asm/machdep.h>
  #include <asm/plpar_wrappers.h>
+#include "pseries.h"
 
 
  static int pseries_get_random_long(unsigned long *v)
@@ -24,19 +25,13 @@ static int pseries_get_random_long(unsigned long *v)
  	return 0;
  }
 
-static __init int rng_init(void)
+void __init pseries_rng_init(void)
  {
  	struct device_node *dn;
 
  	dn = of_find_compatible_node(NULL, NULL, "ibm,random");
  	if (!dn)
-		return -ENODEV;
-
-	pr_info("Registering arch random hook.\n");
-
+		return;
  	ppc_md.get_random_seed = pseries_get_random_long;
-
  	of_node_put(dn);
-	return 0;
  }
-machine_subsys_initcall(pseries, rng_init);
arch/powerpc/platforms/pseries/setup.c +1 -0
index afb074269b42..ee4f1db49515 100644
@@ -839,6 +839,7 @@ static void __init pSeries_setup_arch(void)
  	}
 
  	ppc_md.pcibios_root_bridge_prepare = pseries_root_bridge_prepare;
+	pseries_rng_init();
  }
 
  static void pseries_panic(char *str)
#16 lore raw
In reply to Jason A. Donenfeld
Quoted 10 lines · Jason A. Donenfeld

The platform's RNG must be available before random_init() in order to be useful for initial seeding, which in turn means that it needs to be called from setup_arch(), rather than from an init call. This series wires that up properly on the three platforms that currently initialize the RNG from the wrong place.

Cc Michael Ellerman <[email protected]>
Cc Christophe Leroy <[email protected]>

[...]

Patches 1 & 3 applied to powerpc/fixes.

[1/3] powerpc/microwatt: wire up rng during setup_arch

      https://git.kernel.org/powerpc/c/20a9689b3607456d92c6fb764501f6a95950b098
[3/3] powerpc/pseries: wire up rng during setup_arch
      https://git.kernel.org/powerpc/c/e561e472a3d441753bd012333b057f48fef1045b

cheers