Skip to contentSkip to conversation

m68k: virt: pass RNG seed via bootinfo block

PATCH Superseded Jason A. Donenfeld 3 participants 4 messages Jun 25, 2022 – Jul 6, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 m68k: virt: pass RNG seed via bootinfo block

This commit wires up bootinfo's RNG seed attribute so that Linux VMs can have their RNG seeded from the earliest possible time in boot, just like the "rng-seed" device tree property on those platforms. The link contains the corresponding Linux patch.

---
This requires this trivial cleanup commit first:

    https://lore.kernel.org/qemu-devel/[email protected]/
 hw/m68k/bootinfo.h                               | 16 ++++++++++++++++
 hw/m68k/virt.c                                   |  7 +++++++
 .../standard-headers/asm-m68k/bootinfo-virt.h    |  1 +
 3 files changed, 24 insertions(+)
hw/m68k/bootinfo.h +16 -0
index ff4e155a3c..2f31c13b6e 100644
@@ -56,4 +56,20 @@
         stb_phys(as, base++, 0); \
         base = (base + 1) & ~1; \
     } while (0)
+
+#define BOOTINFODATA(as, base, id, data, len) \
+    do { \
+        int i; \
+        stw_phys(as, base, id); \
+        base += 2; \
+        stw_phys(as, base, \
+                 (sizeof(struct bi_record) + len + 5) & ~1); \
+        base += 2; \
+        stl_phys(as, base, len); \
+        base += 4; \
+        for (i = 0; i < len; ++i) { \
+            stb_phys(as, base++, data[i]); \
+        } \
+        base = (base + 1) & ~1; \
+    } while (0)
 #endif
hw/m68k/virt.c +7 -0
index e215aa3d42..0aa383fa6b 100644
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
+#include "qemu/guest-random.h"
 #include "sysemu/sysemu.h"
 #include "cpu.h"
 #include "hw/boards.h"
@@ -120,6 +121,7 @@ static void virt_init(MachineState *machine)
     hwaddr io_base;
     int i;
     ResetInfo *reset_info;
+    uint8_t rng_seed[32];
 
     if (ram_size > 3399672 * KiB) {
         /*
@@ -245,6 +247,11 @@ static void virt_init(MachineState *machine)
                         kernel_cmdline);
         }
 
+	/* Pass seed to RNG. */
+	qemu_guest_getrandom_nofail(rng_seed, sizeof(rng_seed));
+	BOOTINFODATA(cs->as, parameters_base, BI_VIRT_RNG_SEED,
+		     rng_seed, sizeof(rng_seed));
+
         /* load initrd */
         if (initrd_filename) {
             initrd_size = get_image_size(initrd_filename);
include/standard-headers/asm-m68k/bootinfo-virt.h +1 -0
index 81be1e0924..1b1ffd4705 100644
@@ -12,6 +12,7 @@
 #define BI_VIRT_GF_TTY_BASE	0x8003
 #define BI_VIRT_VIRTIO_BASE	0x8004
 #define BI_VIRT_CTRL_BASE	0x8005
+#define BI_VIRT_RNG_SEED	0x8006
 
 #define VIRT_BOOTI_VERSION	MK_BI_VERSION(2, 0)
 
Signature · 1 line
2.35.1
Reviewed-by on v1 1/1
#1 lore raw

Le 25/06/2022 à 17:44, Jason A. Donenfeld a écrit :

Quoted 10 lines

This commit wires up bootinfo's RNG seed attribute so that Linux VMs can have their RNG seeded from the earliest possible time in boot, just like the "rng-seed" device tree property on those platforms. The link contains the corresponding Linux patch.

---
This requires this trivial cleanup commit first:

     https://lore.kernel.org/qemu-devel/[email protected]/

For patchew, the syntax is:

Based-on: <[email protected]>

Quoted 68 lines
  hw/m68k/bootinfo.h                               | 16 ++++++++++++++++
  hw/m68k/virt.c                                   |  7 +++++++
  .../standard-headers/asm-m68k/bootinfo-virt.h    |  1 +
  3 files changed, 24 insertions(+)
hw/m68k/bootinfo.h +16 -0
index ff4e155a3c..2f31c13b6e 100644
@@ -56,4 +56,20 @@
          stb_phys(as, base++, 0); \
          base = (base + 1) & ~1; \
      } while (0)
+
+#define BOOTINFODATA(as, base, id, data, len) \
+    do { \
+        int i; \
+        stw_phys(as, base, id); \
+        base += 2; \
+        stw_phys(as, base, \
+                 (sizeof(struct bi_record) + len + 5) & ~1); \
+        base += 2; \
+        stl_phys(as, base, len); \
+        base += 4; \
+        for (i = 0; i < len; ++i) { \
+            stb_phys(as, base++, data[i]); \
+        } \
+        base = (base + 1) & ~1; \
+    } while (0)
  #endif
hw/m68k/virt.c +7 -0
index e215aa3d42..0aa383fa6b 100644
@@ -9,6 +9,7 @@
 
  #include "qemu/osdep.h"
  #include "qemu/units.h"
+#include "qemu/guest-random.h"
  #include "sysemu/sysemu.h"
  #include "cpu.h"
  #include "hw/boards.h"
@@ -120,6 +121,7 @@ static void virt_init(MachineState *machine)
      hwaddr io_base;
      int i;
      ResetInfo *reset_info;
+    uint8_t rng_seed[32];
 
      if (ram_size > 3399672 * KiB) {
          /*
@@ -245,6 +247,11 @@ static void virt_init(MachineState *machine)
                          kernel_cmdline);
          }
 
+	/* Pass seed to RNG. */
+	qemu_guest_getrandom_nofail(rng_seed, sizeof(rng_seed));
+	BOOTINFODATA(cs->as, parameters_base, BI_VIRT_RNG_SEED,
+		     rng_seed, sizeof(rng_seed));
+
          /* load initrd */
          if (initrd_filename) {
              initrd_size = get_image_size(initrd_filename);
include/standard-headers/asm-m68k/bootinfo-virt.h +0 -0
index 81be1e0924..1b1ffd4705 100644

include/standard-headers/asm-m68k/bootinfo-virt.h line 18

Quoted 7 lines
include/standard-headers/asm-m68k/bootinfo-virt.h +1 -0
@@ -12,6 +12,7 @@
  #define BI_VIRT_GF_TTY_BASE	0x8003
  #define BI_VIRT_VIRTIO_BASE	0x8004
  #define BI_VIRT_CTRL_BASE	0x8005
+#define BI_VIRT_RNG_SEED	0x8006
 
  #define VIRT_BOOTI_VERSION	MK_BI_VERSION(2, 0)
 
#2 lore raw

PATCH v2 1/1 m68k: virt: pass RNG seed via bootinfo block

This commit wires up bootinfo's RNG seed attribute so that Linux VMs can have their RNG seeded from the earliest possible time in boot, just like the "rng-seed" device tree property on those platforms. The link contains the corresponding Linux patch.

Based-on: <[email protected]>

---
 hw/m68k/bootinfo.h                               | 16 ++++++++++++++++
 hw/m68k/virt.c                                   |  7 +++++++
 .../standard-headers/asm-m68k/bootinfo-virt.h    |  1 +
 3 files changed, 24 insertions(+)
hw/m68k/bootinfo.h +16 -0
index ff4e155a3c..bd8b212fd3 100644
@@ -56,4 +56,20 @@
         stb_phys(as, base++, 0); \
         base = (base + 1) & ~1; \
     } while (0)
+
+#define BOOTINFODATA(as, base, id, data, len) \
+    do { \
+        int i; \
+        stw_phys(as, base, id); \
+        base += 2; \
+        stw_phys(as, base, \
+                 (sizeof(struct bi_record) + len + 3) & ~1); \
+        base += 2; \
+        stw_phys(as, base, len); \
+        base += 2; \
+        for (i = 0; i < len; ++i) { \
+            stb_phys(as, base++, data[i]); \
+        } \
+        base = (base + 1) & ~1; \
+    } while (0)
 #endif
hw/m68k/virt.c +7 -0
index e215aa3d42..0aa383fa6b 100644
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
+#include "qemu/guest-random.h"
 #include "sysemu/sysemu.h"
 #include "cpu.h"
 #include "hw/boards.h"
@@ -120,6 +121,7 @@ static void virt_init(MachineState *machine)
     hwaddr io_base;
     int i;
     ResetInfo *reset_info;
+    uint8_t rng_seed[32];
 
     if (ram_size > 3399672 * KiB) {
         /*
@@ -245,6 +247,11 @@ static void virt_init(MachineState *machine)
                         kernel_cmdline);
         }
 
+	/* Pass seed to RNG. */
+	qemu_guest_getrandom_nofail(rng_seed, sizeof(rng_seed));
+	BOOTINFODATA(cs->as, parameters_base, BI_VIRT_RNG_SEED,
+		     rng_seed, sizeof(rng_seed));
+
         /* load initrd */
         if (initrd_filename) {
             initrd_size = get_image_size(initrd_filename);
include/standard-headers/asm-m68k/bootinfo-virt.h +1 -0
index 81be1e0924..1b1ffd4705 100644
@@ -12,6 +12,7 @@
 #define BI_VIRT_GF_TTY_BASE	0x8003
 #define BI_VIRT_VIRTIO_BASE	0x8004
 #define BI_VIRT_CTRL_BASE	0x8005
+#define BI_VIRT_RNG_SEED	0x8006
 
 #define VIRT_BOOTI_VERSION	MK_BI_VERSION(2, 0)
 
Signature · 1 line
2.35.1
Reviewed-by on v2 1/1
#3 lore raw
Quoted 9 lines · Jason A. Donenfeld

This commit wires up bootinfo's RNG seed attribute so that Linux VMs can have their RNG seeded from the earliest possible time in boot, just like the "rng-seed" device tree property on those platforms. The link contains the corresponding Linux patch.

Based-on: <[email protected]>

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds