m68k: virt: pass RNG seed via bootinfo block
PATCH 1/1 m68k: virt: pass RNG seed via bootinfo block
Other virt VMs can pass RNG seeds via the "rng-seed" device tree property or via UEFI, but m68k doesn't have either. Instead it has its own bootinfo protocol. So this commit adds support for receiving a RNG seed from it, which will be used at the earliest possible time in boot, just like device tree.
--- arch/m68k/include/uapi/asm/bootinfo-virt.h | 1 + arch/m68k/virt/config.c | 4 ++++ 2 files changed, 5 insertions(+)
arch/m68k/include/uapi/asm/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)
arch/m68k/virt/config.c +4 -0
@@ -2,6 +2,7 @@#include <linux/reboot.h> #include <linux/serial_core.h> +#include <linux/random.h> #include <clocksource/timer-goldfish.h> #include <asm/bootinfo.h>
@@ -92,6 +93,9 @@ int __init virt_parse_bootinfo(const struct bi_record *record) data +=4 ; virt_bi_data.virtio.irq =be32_to_cpup (data);break ; +case BI_VIRT_RNG_SEED : +add_bootloader_randomness (data +4 ,be32_to_cpup (data)); +break ;default : unknown =1 ;break ;
Signature · 1 line
2.35.1
Le 25/06/2022 à 17:38, Jason A. Donenfeld a écrit :
Quoted 37 lines
Other virt VMs can pass RNG seeds via the "rng-seed" device tree property or via UEFI, but m68k doesn't have either. Instead it has its own bootinfo protocol. So this commit adds support for receiving a RNG seed from it, which will be used at the earliest possible time in boot, just like device tree.
Signed-off-by Jason A. Donenfeld <[email protected]>--- arch/m68k/include/uapi/asm/bootinfo-virt.h | 1 + arch/m68k/virt/config.c | 4 ++++ 2 files changed, 5 insertions(+)arch/m68k/include/uapi/asm/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)arch/m68k/virt/config.c +1
-0@@ -2,6 +2,7 @@#include <linux/reboot.h> #include <linux/serial_core.h> +#include <linux/random.h> #include <clocksource/timer-goldfish.h> #include <asm/bootinfo.h>
arch/m68k/virt/config.c int __init virt_parse_bootinfo(const struct bi_record *record) · line 101
Quoted 9 lines
arch/m68k/virt/config.c +3
-0@@ -92,6 +93,9 @@ int __init virt_parse_bootinfo(const struct bi_record *record) data +=4 ; virt_bi_data.virtio.irq =be32_to_cpup (data);break ; +case BI_VIRT_RNG_SEED : +add_bootloader_randomness (data +4 ,be32_to_cpup (data)); +break ;default : unknown =1 ;break ;
Le 25/06/2022 à 17:38, Jason A. Donenfeld a écrit :
Quoted 37 lines
Other virt VMs can pass RNG seeds via the "rng-seed" device tree property or via UEFI, but m68k doesn't have either. Instead it has its own bootinfo protocol. So this commit adds support for receiving a RNG seed from it, which will be used at the earliest possible time in boot, just like device tree.
Signed-off-by Jason A. Donenfeld <[email protected]>--- arch/m68k/include/uapi/asm/bootinfo-virt.h | 1 + arch/m68k/virt/config.c | 4 ++++ 2 files changed, 5 insertions(+)arch/m68k/include/uapi/asm/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)arch/m68k/virt/config.c +1
-0@@ -2,6 +2,7 @@#include <linux/reboot.h> #include <linux/serial_core.h> +#include <linux/random.h> #include <clocksource/timer-goldfish.h> #include <asm/bootinfo.h>
arch/m68k/virt/config.c int __init virt_parse_bootinfo(const struct bi_record *record) · line 97
Quoted 5 lines
arch/m68k/virt/config.c +2
-0@@ -92,6 +93,9 @@ int __init virt_parse_bootinfo(const struct bi_record *record) data +=4 ; virt_bi_data.virtio.irq =be32_to_cpup (data);break ; +case BI_VIRT_RNG_SEED : +add_bootloader_randomness (data +4 ,be32_to_cpup (data));
In fact, why don't you use the record->size to get the size of the buffer?
It seems useless to encode twice the length of the buffer, the second time on a 32bit while the length cannot exceed a 16bit value.
Thanks,
Laurent
Quoted 47 lines · Laurent Vivier
Quoted 37 lines · Jason A. Donenfeld
Other virt VMs can pass RNG seeds via the "rng-seed" device tree property or via UEFI, but m68k doesn't have either. Instead it has its own bootinfo protocol. So this commit adds support for receiving a RNG seed from it, which will be used at the earliest possible time in boot, just like device tree.
Signed-off-by Jason A. Donenfeld <[email protected]>--- arch/m68k/include/uapi/asm/bootinfo-virt.h | 1 + arch/m68k/virt/config.c | 4 ++++ 2 files changed, 5 insertions(+)arch/m68k/include/uapi/asm/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)arch/m68k/virt/config.c +1
-0@@ -2,6 +2,7 @@#include <linux/reboot.h> #include <linux/serial_core.h> +#include <linux/random.h> #include <clocksource/timer-goldfish.h> #include <asm/bootinfo.h> arch/m68k/virt/config.c int __init virt_parse_bootinfo(const struct bi_record *record) · line 97
Quoted 5 lines
arch/m68k/virt/config.c +2
-0@@ -92,6 +93,9 @@ int __init virt_parse_bootinfo(const struct bi_record *record) data +=4 ; virt_bi_data.virtio.irq =be32_to_cpup (data);break ; +case BI_VIRT_RNG_SEED : +add_bootloader_randomness (data +4 ,be32_to_cpup (data));In fact, why don't you use the
record->sizeto get the size of the buffer?
Quoted 2 lines
It seems useless to encode twice the length of the buffer, the second time on a 32bit while the length cannot exceed a 16bit value.
Doesn't that make the length ambiguous because of required alignment? Would rather keep this general. As is, it's also much more like the others and more uniform to keep it that way. You were able to review it and see that it was right after glancing for a second. That seems superior to any imaginary gains we'd get by overloading the record size.
Jason
Le 25/06/2022 à 18:19, Jason A. Donenfeld a écrit :
Quoted 48 lines · Laurent Vivier
Quoted 47 lines · Jason A. Donenfeld
Quoted 37 lines
Other virt VMs can pass RNG seeds via the "rng-seed" device tree property or via UEFI, but m68k doesn't have either. Instead it has its own bootinfo protocol. So this commit adds support for receiving a RNG seed from it, which will be used at the earliest possible time in boot, just like device tree.
Signed-off-by Jason A. Donenfeld <[email protected]>--- arch/m68k/include/uapi/asm/bootinfo-virt.h | 1 + arch/m68k/virt/config.c | 4 ++++ 2 files changed, 5 insertions(+)arch/m68k/include/uapi/asm/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)arch/m68k/virt/config.c +1
-0@@ -2,6 +2,7 @@#include <linux/reboot.h> #include <linux/serial_core.h> +#include <linux/random.h> #include <clocksource/timer-goldfish.h> #include <asm/bootinfo.h> arch/m68k/virt/config.c int __init virt_parse_bootinfo(const struct bi_record *record) · line 97
Quoted 5 lines
arch/m68k/virt/config.c +2
-0@@ -92,6 +93,9 @@ int __init virt_parse_bootinfo(const struct bi_record *record) data +=4 ; virt_bi_data.virtio.irq =be32_to_cpup (data);break ; +case BI_VIRT_RNG_SEED : +add_bootloader_randomness (data +4 ,be32_to_cpup (data));In fact, why don't you use the
record->sizeto get the size of the buffer?
Quoted 4 lines
Quoted 2 lines
It seems useless to encode twice the length of the buffer, the second time on a 32bit while the length cannot exceed a 16bit value.
Doesn't that make the length ambiguous because of required alignment?
I agree, it's why I understand reviewing the QEMU part of your patch.
Quoted 5 lines
Would rather keep this general. As is, it's also much more like the others and more uniform to keep it that way. You were able to review it and see that it was right after glancing for a second. That seems superior to any imaginary gains we'd get by overloading the record size.
And what about using a 16bit field rather than a 32bit field as the encoded length cannot be greater than the record length?
Thanks,
Laurent
Quoted 57 lines · Laurent Vivier
Quoted 48 lines · Jason A. Donenfeld
Quoted 47 lines · Laurent Vivier
Quoted 37 lines · Jason A. Donenfeld
Other virt VMs can pass RNG seeds via the "rng-seed" device tree property or via UEFI, but m68k doesn't have either. Instead it has its own bootinfo protocol. So this commit adds support for receiving a RNG seed from it, which will be used at the earliest possible time in boot, just like device tree.
Signed-off-by Jason A. Donenfeld <[email protected]>--- arch/m68k/include/uapi/asm/bootinfo-virt.h | 1 + arch/m68k/virt/config.c | 4 ++++ 2 files changed, 5 insertions(+)arch/m68k/include/uapi/asm/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)arch/m68k/virt/config.c +1
-0@@ -2,6 +2,7 @@#include <linux/reboot.h> #include <linux/serial_core.h> +#include <linux/random.h> #include <clocksource/timer-goldfish.h> #include <asm/bootinfo.h> arch/m68k/virt/config.c int __init virt_parse_bootinfo(const struct bi_record *record) · line 97
Quoted 5 lines
arch/m68k/virt/config.c +2
-0@@ -92,6 +93,9 @@ int __init virt_parse_bootinfo(const struct bi_record *record) data +=4 ; virt_bi_data.virtio.irq =be32_to_cpup (data);break ; +case BI_VIRT_RNG_SEED : +add_bootloader_randomness (data +4 ,be32_to_cpup (data));In fact, why don't you use the
record->sizeto get the size of the buffer?Quoted 4 lines
Quoted 2 lines
It seems useless to encode twice the length of the buffer, the second time on a 32bit while the length cannot exceed a 16bit value.
Doesn't that make the length ambiguous because of required alignment?
I agree, it's why I understand reviewing the QEMU part of your patch.
Quoted 8 lines
Quoted 5 lines
Would rather keep this general. As is, it's also much more like the others and more uniform to keep it that way. You were able to review it and see that it was right after glancing for a second. That seems superior to any imaginary gains we'd get by overloading the record size.
And what about using a 16bit field rather than a 32bit field as the encoded length cannot be greater than the record length?
I guess but that's different from all other length fields, and means we can't expand past 65k if somebody wants to use this for something more interesting later. Again I wonder what stinginess here gets us. This is just a boot parameter... No need to go crazy optimizing it.
Jason
Le 25/06/2022 à 18:26, Jason A. Donenfeld a écrit :
Quoted 64 lines · Laurent Vivier
Quoted 63 lines · Jason A. Donenfeld
Quoted 48 lines · Laurent Vivier
Quoted 47 lines · Jason A. Donenfeld
Quoted 37 lines
Other virt VMs can pass RNG seeds via the "rng-seed" device tree property or via UEFI, but m68k doesn't have either. Instead it has its own bootinfo protocol. So this commit adds support for receiving a RNG seed from it, which will be used at the earliest possible time in boot, just like device tree.
Signed-off-by Jason A. Donenfeld <[email protected]>--- arch/m68k/include/uapi/asm/bootinfo-virt.h | 1 + arch/m68k/virt/config.c | 4 ++++ 2 files changed, 5 insertions(+)arch/m68k/include/uapi/asm/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)arch/m68k/virt/config.c +1
-0@@ -2,6 +2,7 @@#include <linux/reboot.h> #include <linux/serial_core.h> +#include <linux/random.h> #include <clocksource/timer-goldfish.h> #include <asm/bootinfo.h> arch/m68k/virt/config.c int __init virt_parse_bootinfo(const struct bi_record *record) · line 97
Quoted 5 lines
arch/m68k/virt/config.c +2
-0@@ -92,6 +93,9 @@ int __init virt_parse_bootinfo(const struct bi_record *record) data +=4 ; virt_bi_data.virtio.irq =be32_to_cpup (data);break ; +case BI_VIRT_RNG_SEED : +add_bootloader_randomness (data +4 ,be32_to_cpup (data));In fact, why don't you use the
record->sizeto get the size of the buffer?Quoted 4 lines
Quoted 2 lines
It seems useless to encode twice the length of the buffer, the second time on a 32bit while the length cannot exceed a 16bit value.
Doesn't that make the length ambiguous because of required alignment?
I agree, it's why I understand reviewing the QEMU part of your patch.
Quoted 5 lines
Would rather keep this general. As is, it's also much more like the others and more uniform to keep it that way. You were able to review it and see that it was right after glancing for a second. That seems superior to any imaginary gains we'd get by overloading the record size.
Quoted 7 lines
Quoted 2 lines
And what about using a 16bit field rather than a 32bit field as the encoded length cannot be greater than the record length?
I guess but that's different from all other length fields, and means we can't expand past 65k if somebody wants to use this for something more interesting later. Again I wonder what stinginess here gets us. This is just a boot parameter... No need to go crazy optimizing it.
I agree too.
Thanks,
Laurent
Geert Uytterhoeven
maintainerHi Jason,
Thanks for your patch!
Quoted 5 lines · Jason A. Donenfeld
Quoted 4 lines · Laurent Vivier
Quoted 3 lines · Jason A. Donenfeld
Quoted 2 lines · Laurent Vivier
Quoted 1 line · Jason A. Donenfeld
Other virt VMs can pass RNG seeds via the "rng-seed" device tree
FTR, "rng-seed" does not seem to be documented anywhere, not under Documentation/devicetree/bindings/, and not in the Devicetree Specification?
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
property or via UEFI, but m68k doesn't have either. Instead it has its own bootinfo protocol. So this commit adds support for receiving a RNG seed from it, which will be used at the earliest possible time in boot, just like device tree.
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
arch/m68k/include/uapi/asm/bootinfo-virt.h line 15
Quoted 8 lines
Signed-off-by Jason A. Donenfeld <[email protected]>arch/m68k/include/uapi/asm/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
Please add a comment documenting the record format.
Laurent: Would be nice if you could add this for the other BI_*, too.
Quoted 37 lines
Quoted 37 lines
Quoted 24 lines
Quoted 24 lines
Quoted 16 lines
arch/m68k/include/uapi/asm/bootinfo-virt.h +0
-0#define VIRT_BOOTI_VERSION MK_BI_VERSION(2, 0)arch/m68k/virt/config.c +1
-0@@ -2,6 +2,7 @@#include <linux/reboot.h> #include <linux/serial_core.h> +#include <linux/random.h> #include <clocksource/timer-goldfish.h> #include <asm/bootinfo.h> arch/m68k/virt/config.c int __init virt_parse_bootinfo(const struct bi_record *record) · line 97
Quoted 5 lines
arch/m68k/virt/config.c +2
-0@@ -92,6 +93,9 @@ int __init virt_parse_bootinfo(const struct bi_record *record) data +=4 ; virt_bi_data.virtio.irq =be32_to_cpup (data);break ; +case BI_VIRT_RNG_SEED : +add_bootloader_randomness (data +4 ,be32_to_cpup (data));In fact, why don't you use the
record->sizeto get the size of the buffer?Quoted 4 lines
Quoted 2 lines
It seems useless to encode twice the length of the buffer, the second time on a 32bit while the length cannot exceed a 16bit value.
Doesn't that make the length ambiguous because of required alignment?
I agree, it's why I understand reviewing the QEMU part of your patch.
Quoted 5 lines
Would rather keep this general. As is, it's also much more like the others and more uniform to keep it that way. You were able to review it and see that it was right after glancing for a second. That seems superior to any imaginary gains we'd get by overloading the record size.
Quoted 7 lines
Quoted 2 lines
And what about using a 16bit field rather than a 32bit field as the encoded length cannot be greater than the record length?
I guess but that's different from all other length fields, and means we can't expand past 65k if somebody wants to use this for something more interesting later. Again I wonder what stinginess here gets us. This is just a boot parameter... No need to go crazy optimizing it.
You cannot extend this past (64 KiB - sizeof(struct bi_record)) anyway, as the total record size is limited to 64 KiB, regardless of the additional buffer size you try to encode inside your own 32-bit size field.
So either just store the data inside the record, rely on bi_record.size, and live with random data that must be a number of even bytes (does it really hurt to drop the last byte, or add a dummy byte?), or store a pointer/size, like is done for e.g. BI_RAMDISK.
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
Hi Geert,
Quoted 6 lines · Geert Uytterhoeven
Hi Jason,
Thanks for your patch!
Quoted 1 line · Jason A. Donenfeld
On Sat, Jun 25, 2022 at 6:24 PM Laurent Vivier <[email protected]> wrote:
Quoted 8 lines
Quoted 4 lines
Quoted 4 lines · Jason A. Donenfeld
Quoted 3 lines · Laurent Vivier
Quoted 2 lines · Jason A. Donenfeld
Quoted 1 line
Other virt VMs can pass RNG seeds via the "rng-seed" device tree
FTR, "rng-seed" does not seem to be documented anywhere, not under
Documentation/devicetree/bindings/, and not in the Devicetree Specification?
Good point. It's quite old, this field, so odd it was missed. I'll send in a separate patch for that.
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
property or via UEFI, but m68k doesn't have either. Instead it has its own bootinfo protocol. So this commit adds support for receiving a RNG seed from it, which will be used at the earliest possible time in boot, just like device tree.
Quoted 10 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
arch/m68k/include/uapi/asm/bootinfo-virt.h line 15
Quoted 8 lines
Signed-off-by Jason A. Donenfeld <[email protected]>arch/m68k/include/uapi/asm/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 0x8006Please add a comment documenting the record format.
Ack.
Quoted 53 lines
Laurent: Would be nice if you could add this for the other BI_*, too.
Quoted 37 lines
Quoted 37 lines
Quoted 24 lines
Quoted 24 lines
Quoted 16 lines
arch/m68k/include/uapi/asm/bootinfo-virt.h +0
-0#define VIRT_BOOTI_VERSION MK_BI_VERSION(2, 0)arch/m68k/virt/config.c +1
-0@@ -2,6 +2,7 @@#include <linux/reboot.h> #include <linux/serial_core.h> +#include <linux/random.h> #include <clocksource/timer-goldfish.h> #include <asm/bootinfo.h> arch/m68k/virt/config.c int __init virt_parse_bootinfo(const struct bi_record *record) · line 97
Quoted 5 lines
arch/m68k/virt/config.c +2
-0@@ -92,6 +93,9 @@ int __init virt_parse_bootinfo(const struct bi_record *record) data +=4 ; virt_bi_data.virtio.irq =be32_to_cpup (data);break ; +case BI_VIRT_RNG_SEED : +add_bootloader_randomness (data +4 ,be32_to_cpup (data));In fact, why don't you use the
record->sizeto get the size of the buffer?Quoted 4 lines
Quoted 2 lines
It seems useless to encode twice the length of the buffer, the second time on a 32bit while the length cannot exceed a 16bit value.
Doesn't that make the length ambiguous because of required alignment?
I agree, it's why I understand reviewing the QEMU part of your patch.
Quoted 5 lines
Would rather keep this general. As is, it's also much more like the others and more uniform to keep it that way. You were able to review it and see that it was right after glancing for a second. That seems superior to any imaginary gains we'd get by overloading the record size.
Quoted 7 lines
Quoted 2 lines
And what about using a 16bit field rather than a 32bit field as the encoded length cannot be greater than the record length?
I guess but that's different from all other length fields, and means we can't expand past 65k if somebody wants to use this for something more interesting later. Again I wonder what stinginess here gets us. This is just a boot parameter... No need to go crazy optimizing it.
You cannot extend this past (64 KiB -
sizeof(struct bi_record)) anyway, as the total record size is limited to 64 KiB, regardless of the additional buffer size you try to encode inside your own 32-bit size field.
Quoted 4 lines
So either just store the data inside the record, rely on bi_record.size, and live with random data that must be a number of even bytes (does it really hurt to drop the last byte, or add a dummy byte?), or store a pointer/size, like is done for e.g.
BI_RAMDISK.
I modeled this on BOOTINFOSTR, which benefits from null termination. I'll just reduce the length field to 2 bytes. I really don't want to play padding games here, and anyway the length field needs to be separate for reasons that will become apparent in v2 (zeroing for kexec).
Jason
PATCH v2 1/1 m68k: virt: use RNG seed from bootinfo block
Other virt VMs can pass RNG seeds via the "rng-seed" device tree property or via UEFI, but m68k doesn't have either. Instead it has its own bootinfo protocol. So this commit adds support for receiving a RNG seed from it, which will be used at the earliest possible time in boot, just like device tree.
--- arch/m68k/include/uapi/asm/bootinfo-virt.h | 7 +++++++ arch/m68k/virt/config.c | 9 +++++++++ 2 files changed, 16 insertions(+)
arch/m68k/include/uapi/asm/bootinfo-virt.h +7 -0
@@ -13,6 +13,13 @@#define BI_VIRT_VIRTIO_BASE 0x8004#define BI_VIRT_CTRL_BASE 0x8005 +/* A random seed used to initialize the RNG. Record format: +* +* - length [ 2 bytes, 16-bit big endian ] +* - seed data [ `length` bytes ] +*/ +#define BI_VIRT_RNG_SEED 0x8006 +#define VIRT_BOOTI_VERSION MK_BI_VERSION(2, 0)#endif /* _UAPI_ASM_M68K_BOOTINFO_MAC_H */
arch/m68k/virt/config.c +9 -0
@@ -2,6 +2,7 @@#include <linux/reboot.h> #include <linux/serial_core.h> +#include <linux/random.h> #include <clocksource/timer-goldfish.h> #include <asm/bootinfo.h>
@@ -92,6 +93,14 @@ int __init virt_parse_bootinfo(const struct bi_record *record) data +=4 ; virt_bi_data.virtio.irq =be32_to_cpup (data);break ; +case BI_VIRT_RNG_SEED : { +u16 len =be16_to_cpup (data); +add_bootloader_randomness (data +2 , len); +/* Zero the data to preserve forward secrecy, and zero the +* length to prevent kexec from using it. */ +memzero_explicit ((void *)data, len +2 ); +break ; + }default : unknown =1 ;break ;
Signature · 1 line
2.35.1
Re: [PATCH v2] m68k: virt: use RNG seed from bootinfo block
Quoted 12 lines · Jason A. Donenfeld
Other virt VMs can pass RNG seeds via the "rng-seed" device tree property or via UEFI, but m68k doesn't have either. Instead it has its own bootinfo protocol. So this commit adds support for receiving a RNG seed from it, which will be used at the earliest possible time in boot, just like device tree.
Reviewed-by Laurent Vivier <[email protected]>Signed-off-by Jason A. Donenfeld <[email protected]>
arch/m68k/include/uapi/asm/bootinfo-virt.h line 19
Quoted 7 lines
arch/m68k/include/uapi/asm/bootinfo-virt.h +4
-0@@ -13,6 +13,13 @@#define BI_VIRT_VIRTIO_BASE 0x8004#define BI_VIRT_CTRL_BASE 0x8005 +/* A random seed used to initialize the RNG. Record format: +* +* - length [ 2 bytes, 16-bit big endian ] +* - seed data [ `length` bytes ]
", padded to preserve 2-byte alignment"
i.e. will queue in the m68k for-v5.20 branch with the above fixed. No need to resend.
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