hw/arm/virt: Support firmware configuration with -blockdev
cover hw/arm/virt: Support firmware configuration with -blockdev
László asked for feature parity with the PC machine types.
Markus Armbruster (2):
pflash_cfi01: New pflash_cfi01_legacy_drive() hw/arm/virt: Support firmware configuration with -blockdev
hw/arm/virt.c | 192 +++++++++++++++++++++++++-------------- hw/block/pflash_cfi01.c | 30 ++++++ hw/i386/pc_sysfw.c | 19 +--- include/hw/arm/virt.h | 2 + include/hw/block/flash.h | 1 + 5 files changed, 157 insertions(+), 87 deletions(-)
Signature · 1 line
2.17.2
PATCH 1/2 pflash_cfi01: New pflash_cfi01_legacy_drive()
Factored out of pc_system_firmware_init() so the next commit can reuse it in hw/arm/virt.c.
--- hw/block/pflash_cfi01.c | 30 ++++++++++++++++++++++++++++++ hw/i386/pc_sysfw.c | 19 ++----------------- include/hw/block/flash.h | 1 + 3 files changed, 33 insertions(+), 17 deletions(-)
hw/block/pflash_cfi01.c +30 -0
@@ -44,9 +44,12 @@#include "qapi/error.h" #include "qemu/timer.h" #include "qemu/bitops.h" +#include "qemu/error-report.h" #include "qemu/host-utils.h" #include "qemu/log.h" +#include "qemu/option.h" #include "hw/sysbus.h" +#include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "trace.h"
@@ -968,6 +971,33 @@ MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl)return &fl->mem; } +/* +* Handle -drive if=pflash for machines that use machine properties. +* Map unit#i (0 < i <= @ndev) to @dev[i]'s property "drive". +*/ +void pflash_cfi01_legacy_drive (PFlashCFI01 *dev[],int ndev) +{ +int i; +DriveInfo *dinfo; +Location loc; + +for (i =0 ; i < ndev; i++) { + dinfo =drive_get (IF_PFLASH ,0 , i); +if (!dinfo) { +continue ; + } +loc_push_none (&loc); +qemu_opts_loc_restore (dinfo->opts); +if (dev[i]->blk) { +error_report ("clashes with -machine" ); +exit (1 ); + } +qdev_prop_set_drive (DEVICE (dev[i]),"drive" , +blk_by_legacy_dinfo (dinfo), &error_fatal); +loc_pop (&loc); + } +} +static void postload_update_cb (void *opaque,int running,RunState state) {PFlashCFI01 *pfl = opaque;
hw/i386/pc_sysfw.c +2 -17
@@ -269,32 +269,17 @@ void pc_system_firmware_init(PCMachineState *pcms, {PCMachineClass *pcmc =PC_MACHINE_GET_CLASS (pcms);int i; -DriveInfo *pflash_drv;BlockBackend *pflash_blk[ARRAY_SIZE (pcms->flash)]; -Location loc;if (!pcmc->pci_enabled) {old_pc_system_rom_init (rom_memory, true);return ; } -/* Map legacy -drive if=pflash to machine properties */ +pflash_cfi01_legacy_drive (pcms->flash,ARRAY_SIZE (pcms->flash)); +for (i =0 ; i <ARRAY_SIZE (pcms->flash); i++) { pflash_blk[i] =pflash_cfi01_get_blk (pcms->flash[i]); - pflash_drv =drive_get (IF_PFLASH ,0 , i); -if (!pflash_drv) { -continue ; - } -loc_push_none (&loc); -qemu_opts_loc_restore (pflash_drv->opts); -if (pflash_blk[i]) { -error_report ("clashes with -machine" ); -exit (1 ); - } - pflash_blk[i] =blk_by_legacy_dinfo (pflash_drv); -qdev_prop_set_drive (DEVICE (pcms->flash[i]), -"drive" , pflash_blk[i], &error_fatal); -loc_pop (&loc); }/* Reject gaps */
include/hw/block/flash.h +1 -0
@@ -24,6 +24,7 @@ PFlashCFI01 *pflash_cfi01_register(hwaddr base, int be);BlockBackend *pflash_cfi01_get_blk (PFlashCFI01 *fl);MemoryRegion *pflash_cfi01_get_memory (PFlashCFI01 *fl); +void pflash_cfi01_legacy_drive (PFlashCFI01 *dev[],int ndev);/* pflash_cfi02.c */
Signature · 1 line
2.17.2
Re: [Qemu-arm] [Qemu-devel] [PATCH 1/2] pflash_cfi01: New pflash_cfi01_legacy_drive()
Quoted 28 lines · Markus Armbruster
Factored out of
pc_system_firmware_init()so the next commit can reuse it inhw/arm/virt.c.Signed-off-by Markus Armbruster <[email protected]>--- hw/block/pflash_cfi01.c | 30 ++++++++++++++++++++++++++++++ hw/i386/pc_sysfw.c | 19 ++----------------- include/hw/block/flash.h | 1 + 3 files changed, 33 insertions(+), 17 deletions(-)hw/block/pflash_cfi01.c +3
-0@@ -44,9 +44,12 @@#include "qapi/error.h" #include "qemu/timer.h" #include "qemu/bitops.h" +#include "qemu/error-report.h" #include "qemu/host-utils.h" #include "qemu/log.h" +#include "qemu/option.h" #include "hw/sysbus.h" +#include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "trace.h"
hw/block/pflash_cfi01.c MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl) · line 975
Quoted 5 lines
hw/block/pflash_cfi01.c +2
-0@@ -968,6 +971,33 @@ MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl)return &fl->mem; } +/* +* Handle -drive if=pflash for machines that use machine properties.
(1) Can we improve readability with quotes? "-drive if=pflash"
hw/block/pflash_cfi01.c MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl) · line 976
Quoted 1 line
hw/block/pflash_cfi01.c +1
-0+* Map unit#i (0 < i <= @ndev) to @dev[i]'s property "drive".
(2) I think you meant (0 <= i < @ndev)
hw/block/pflash_cfi01.c MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl) · line 980
Quoted 4 lines
hw/block/pflash_cfi01.c +4
-0+*/ +void pflash_cfi01_legacy_drive (PFlashCFI01 *dev[],int ndev) +{ +int i;
(3) For utter pedantry, "ndev" and "i" should have type "size_t" (in particular because we expect the caller to fill "ndev" with ARRAY_SIZE().
But, this would go beyond refactoring -- the original "int"s have served us just fine, and we're usually counting up (exclusively) to the huge number... two. :)
hw/block/pflash_cfi01.c MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl) · line 991
Quoted 11 lines
hw/block/pflash_cfi01.c +11
-0+DriveInfo *dinfo; +Location loc; + +for (i =0 ; i < ndev; i++) { + dinfo =drive_get (IF_PFLASH ,0 , i); +if (!dinfo) { +continue ; + } +loc_push_none (&loc); +qemu_opts_loc_restore (dinfo->opts); +if (dev[i]->blk) {
(4) Is this really identical to the code being removed? The above controlling expression amounts to:
pcms->flash[i]->blk
but the original boils down to
pflash_cfi01_get_blk(pcms->flash[i])
Hmm... looking at pflash_cfi01_get_blk(), they are the same. Is there a particular reason for not using the wrapper function any longer? As in:
pflash_cfi01_get_blk(dev[i])
Quoted 39 lines
hw/block/pflash_cfi01.c +9
-0+error_report ("clashes with -machine" ); +exit (1 ); + } +qdev_prop_set_drive (DEVICE (dev[i]),"drive" , +blk_by_legacy_dinfo (dinfo), &error_fatal); +loc_pop (&loc); + } +} +static void postload_update_cb (void *opaque,int running,RunState state) {PFlashCFI01 *pfl = opaque;hw/i386/pc_sysfw.c +2
-8@@ -269,32 +269,17 @@ void pc_system_firmware_init(PCMachineState *pcms, {PCMachineClass *pcmc =PC_MACHINE_GET_CLASS (pcms);int i; -DriveInfo *pflash_drv;BlockBackend *pflash_blk[ARRAY_SIZE (pcms->flash)]; -Location loc;if (!pcmc->pci_enabled) {old_pc_system_rom_init (rom_memory, true);return ; } -/* Map legacy -drive if=pflash to machine properties */ +pflash_cfi01_legacy_drive (pcms->flash,ARRAY_SIZE (pcms->flash)); +for (i =0 ; i <ARRAY_SIZE (pcms->flash); i++) { pflash_blk[i] =pflash_cfi01_get_blk (pcms->flash[i]); - pflash_drv =drive_get (IF_PFLASH ,0 , i); -if (!pflash_drv) { -continue ; - } -loc_push_none (&loc);
hw/i386/pc_sysfw.c void pc_system_firmware_init(PCMachineState *pcms, · line 283
Quoted 10 lines
hw/i386/pc_sysfw.c +0
-9-qemu_opts_loc_restore (pflash_drv->opts); -if (pflash_blk[i]) { -error_report ("clashes with -machine" ); -exit (1 ); - } - pflash_blk[i] =blk_by_legacy_dinfo (pflash_drv); -qdev_prop_set_drive (DEVICE (pcms->flash[i]), -"drive" , pflash_blk[i], &error_fatal); -loc_pop (&loc); }
(5) I think you deleted too much here. After this loop, post-patch, for all "i", we'll have
pflash_blk[i] = pflash_cfi01_get_blk(pcms->flash[i]);
But pre-patch, for all "i" where the "continue" didn't fire, we'd end up with:
pflash_blk[i] = blk_by_legacy_dinfo(pflash_drv);
IOW the original loop both verifies and *collects*, for the gap check that comes just below.
IIRC, this allows for mixing "-drive if=pflash,unit=N" with the machine properties, as long as you have neither conflicts, nor gaps.
Post-patch however, this kind of mixing would break, because we'd report gaps for the legacy ("-drive if=pflash") options.
In addition, it could break the "use ROM mode" branch below, which is based on pflash_blk[0].
I think we should extend pflash_cfi01_legacy_drive() to populate "pflash_blk[0..(ndev-1)]" on output (assuming pflash_blk is not NULL on input).
(Because, I'm assuming that qdev_prop_set_drive() -- which now occurs in the factored-out loop *before* the loop that we preserve here -- has no effect on pflash_cfi01_get_blk(pcms->flash[i]).)
Thanks,
Laszlo
Quoted 15 lines
hw/i386/pc_sysfw.c +0
-0/* Reject gaps */ include/hw/block/flash.h +1
-0@@ -24,6 +24,7 @@ PFlashCFI01 *pflash_cfi01_register(hwaddr base, int be);BlockBackend *pflash_cfi01_get_blk (PFlashCFI01 *fl);MemoryRegion *pflash_cfi01_get_memory (PFlashCFI01 *fl); +void pflash_cfi01_legacy_drive (PFlashCFI01 *dev[],int ndev);/* pflash_cfi02.c */
Re: [Qemu-arm] [Qemu-devel] [PATCH 1/2] pflash_cfi01: New pflash_cfi01_legacy_drive()
Quoted 152 lines · Laszlo Ersek
Quoted 28 lines · Markus Armbruster
Factored out of
pc_system_firmware_init()so the next commit can reuse it inhw/arm/virt.c.Signed-off-by Markus Armbruster <[email protected]>--- hw/block/pflash_cfi01.c | 30 ++++++++++++++++++++++++++++++ hw/i386/pc_sysfw.c | 19 ++----------------- include/hw/block/flash.h | 1 + 3 files changed, 33 insertions(+), 17 deletions(-)hw/block/pflash_cfi01.c +3
-0@@ -44,9 +44,12 @@#include "qapi/error.h" #include "qemu/timer.h" #include "qemu/bitops.h" +#include "qemu/error-report.h" #include "qemu/host-utils.h" #include "qemu/log.h" +#include "qemu/option.h" #include "hw/sysbus.h" +#include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "trace.h" hw/block/pflash_cfi01.c MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl) · line 975
Quoted 5 lines
hw/block/pflash_cfi01.c +2
-0@@ -968,6 +971,33 @@ MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl)return &fl->mem; } +/* +* Handle -drive if=pflash for machines that use machine properties. (1) Can we improve readability with quotes? "-drive if=pflash"
hw/block/pflash_cfi01.c MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl) · line 976
Quoted 1 line
hw/block/pflash_cfi01.c +1
-0+* Map unit#i (0 < i <= @ndev) to @dev[i]'s property "drive". (2) I think you meant (0 <= i < @ndev)
hw/block/pflash_cfi01.c MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl) · line 980
Quoted 4 lines
hw/block/pflash_cfi01.c +4
-0+*/ +void pflash_cfi01_legacy_drive (PFlashCFI01 *dev[],int ndev) +{ +int i;(3) For utter pedantry, "ndev" and "i" should have type "
size_t" (in particular because we expect the caller to fill "ndev" withARRAY_SIZE().But, this would go beyond refactoring -- the original "int"s have served us just fine, and we're usually counting up (exclusively) to the huge number... two. :)
hw/block/pflash_cfi01.c MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl) · line 991
Quoted 11 lines
hw/block/pflash_cfi01.c +11
-0+DriveInfo *dinfo; +Location loc; + +for (i =0 ; i < ndev; i++) { + dinfo =drive_get (IF_PFLASH ,0 , i); +if (!dinfo) { +continue ; + } +loc_push_none (&loc); +qemu_opts_loc_restore (dinfo->opts); +if (dev[i]->blk) {(4) Is this really identical to the code being removed? The above controlling expression amounts to:
pcms->flash[i]->blk
but the original boils down to
pflash_cfi01_get_blk(pcms->flash[i])Hmm... looking at
pflash_cfi01_get_blk(), they are the same. Is there a particular reason for not using the wrapper function any longer? As in:
pflash_cfi01_get_blk(dev[i])Quoted 39 lines
hw/block/pflash_cfi01.c +9
-0+error_report ("clashes with -machine" ); +exit (1 ); + } +qdev_prop_set_drive (DEVICE (dev[i]),"drive" , +blk_by_legacy_dinfo (dinfo), &error_fatal); +loc_pop (&loc); + } +} +static void postload_update_cb (void *opaque,int running,RunState state) {PFlashCFI01 *pfl = opaque;hw/i386/pc_sysfw.c +2
-8@@ -269,32 +269,17 @@ void pc_system_firmware_init(PCMachineState *pcms, {PCMachineClass *pcmc =PC_MACHINE_GET_CLASS (pcms);int i; -DriveInfo *pflash_drv;BlockBackend *pflash_blk[ARRAY_SIZE (pcms->flash)]; -Location loc;if (!pcmc->pci_enabled) {old_pc_system_rom_init (rom_memory, true);return ; } -/* Map legacy -drive if=pflash to machine properties */ +pflash_cfi01_legacy_drive (pcms->flash,ARRAY_SIZE (pcms->flash)); +for (i =0 ; i <ARRAY_SIZE (pcms->flash); i++) { pflash_blk[i] =pflash_cfi01_get_blk (pcms->flash[i]); - pflash_drv =drive_get (IF_PFLASH ,0 , i); -if (!pflash_drv) { -continue ; - } -loc_push_none (&loc);hw/i386/pc_sysfw.c void pc_system_firmware_init(PCMachineState *pcms, · line 283
Quoted 10 lines
hw/i386/pc_sysfw.c +0
-9-qemu_opts_loc_restore (pflash_drv->opts); -if (pflash_blk[i]) { -error_report ("clashes with -machine" ); -exit (1 ); - } - pflash_blk[i] =blk_by_legacy_dinfo (pflash_drv); -qdev_prop_set_drive (DEVICE (pcms->flash[i]), -"drive" , pflash_blk[i], &error_fatal); -loc_pop (&loc); }(5) I think you deleted too much here. After this loop, post-patch, for all "i", we'll have
pflash_blk[i] = pflash_cfi01_get_blk(pcms->flash[i]);But pre-patch, for all "i" where the "continue" didn't fire, we'd end up with:
pflash_blk[i] = blk_by_legacy_dinfo(pflash_drv);IOW the original loop both verifies and *collects*, for the gap check that comes just below.
IIRC, this allows for mixing "-drive if=pflash,unit=N" with the machine properties, as long as you have neither conflicts, nor gaps.
Post-patch however, this kind of mixing would break, because we'd report gaps for the legacy ("-drive if=pflash") options.
In addition, it could break the "use ROM mode" branch below, which is based on pflash_blk[0].
Quoted 7 lines
I think we should extend
pflash_cfi01_legacy_drive()to populate "pflash_blk[0..(ndev-1)]" on output (assumingpflash_blkis not NULL on input).(Because, I'm assuming that
qdev_prop_set_drive()-- which now occurs in the factored-out loop *before* the loop that we preserve here -- has no effect onpflash_cfi01_get_blk(pcms->flash[i]).)
Hmmm, that's likely precisely what I'm wrong about. I've now looked at DEFINE_PROP_DRIVE / qdev_prop_drive / set_drive / parse_drive... Does qdev_prop_set_drive() actually *turn* the legacy options into genuine machine type properties?... The removed comment does indicate that:
"Map legacy -drive if=pflash to machine properties"
So I guess the remaining loop is correct after all, but the new comment
"Handle -drive if=pflash for machines that use machine properties"
is less clear to me.
Thanks,
Laszlo
Quoted 20 lines
Thanks,
LaszloQuoted 15 lines
hw/i386/pc_sysfw.c +0
-0/* Reject gaps */ include/hw/block/flash.h +1
-0@@ -24,6 +24,7 @@ PFlashCFI01 *pflash_cfi01_register(hwaddr base, int be);BlockBackend *pflash_cfi01_get_blk (PFlashCFI01 *fl);MemoryRegion *pflash_cfi01_get_memory (PFlashCFI01 *fl); +void pflash_cfi01_legacy_drive (PFlashCFI01 *dev[],int ndev);/* pflash_cfi02.c */
Re: [Qemu-devel] [PATCH 1/2] pflash_cfi01: New pflash_cfi01_legacy_drive()
Quoted 166 lines · Laszlo Ersek
Quoted 152 lines · Laszlo Ersek
Quoted 28 lines · Markus Armbruster
Factored out of
pc_system_firmware_init()so the next commit can reuse it inhw/arm/virt.c.Signed-off-by Markus Armbruster <[email protected]>--- hw/block/pflash_cfi01.c | 30 ++++++++++++++++++++++++++++++ hw/i386/pc_sysfw.c | 19 ++----------------- include/hw/block/flash.h | 1 + 3 files changed, 33 insertions(+), 17 deletions(-)hw/block/pflash_cfi01.c +3
-0@@ -44,9 +44,12 @@#include "qapi/error.h" #include "qemu/timer.h" #include "qemu/bitops.h" +#include "qemu/error-report.h" #include "qemu/host-utils.h" #include "qemu/log.h" +#include "qemu/option.h" #include "hw/sysbus.h" +#include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "trace.h" hw/block/pflash_cfi01.c MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl) · line 975
Quoted 5 lines
hw/block/pflash_cfi01.c +2
-0@@ -968,6 +971,33 @@ MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl)return &fl->mem; } +/* +* Handle -drive if=pflash for machines that use machine properties. (1) Can we improve readability with quotes? "-drive if=pflash"
hw/block/pflash_cfi01.c MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl) · line 976
Quoted 1 line
hw/block/pflash_cfi01.c +1
-0+* Map unit#i (0 < i <= @ndev) to @dev[i]'s property "drive". (2) I think you meant (0 <= i < @ndev)
hw/block/pflash_cfi01.c MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl) · line 980
Quoted 4 lines
hw/block/pflash_cfi01.c +4
-0+*/ +void pflash_cfi01_legacy_drive (PFlashCFI01 *dev[],int ndev) +{ +int i;(3) For utter pedantry, "ndev" and "i" should have type "
size_t" (in particular because we expect the caller to fill "ndev" withARRAY_SIZE().But, this would go beyond refactoring -- the original "int"s have served us just fine, and we're usually counting up (exclusively) to the huge number... two. :)
hw/block/pflash_cfi01.c MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl) · line 991
Quoted 11 lines
hw/block/pflash_cfi01.c +11
-0+DriveInfo *dinfo; +Location loc; + +for (i =0 ; i < ndev; i++) { + dinfo =drive_get (IF_PFLASH ,0 , i); +if (!dinfo) { +continue ; + } +loc_push_none (&loc); +qemu_opts_loc_restore (dinfo->opts); +if (dev[i]->blk) {(4) Is this really identical to the code being removed? The above controlling expression amounts to:
pcms->flash[i]->blk
but the original boils down to
pflash_cfi01_get_blk(pcms->flash[i])Hmm... looking at
pflash_cfi01_get_blk(), they are the same. Is there a particular reason for not using the wrapper function any longer? As in:
pflash_cfi01_get_blk(dev[i])Quoted 39 lines
hw/block/pflash_cfi01.c +9
-0+error_report ("clashes with -machine" ); +exit (1 ); + } +qdev_prop_set_drive (DEVICE (dev[i]),"drive" , +blk_by_legacy_dinfo (dinfo), &error_fatal); +loc_pop (&loc); + } +} +static void postload_update_cb (void *opaque,int running,RunState state) {PFlashCFI01 *pfl = opaque;hw/i386/pc_sysfw.c +2
-8@@ -269,32 +269,17 @@ void pc_system_firmware_init(PCMachineState *pcms, {PCMachineClass *pcmc =PC_MACHINE_GET_CLASS (pcms);int i; -DriveInfo *pflash_drv;BlockBackend *pflash_blk[ARRAY_SIZE (pcms->flash)]; -Location loc;if (!pcmc->pci_enabled) {old_pc_system_rom_init (rom_memory, true);return ; } -/* Map legacy -drive if=pflash to machine properties */ +pflash_cfi01_legacy_drive (pcms->flash,ARRAY_SIZE (pcms->flash)); +for (i =0 ; i <ARRAY_SIZE (pcms->flash); i++) { pflash_blk[i] =pflash_cfi01_get_blk (pcms->flash[i]); - pflash_drv =drive_get (IF_PFLASH ,0 , i); -if (!pflash_drv) { -continue ; - } -loc_push_none (&loc);hw/i386/pc_sysfw.c void pc_system_firmware_init(PCMachineState *pcms, · line 283
Quoted 10 lines
hw/i386/pc_sysfw.c +0
-9-qemu_opts_loc_restore (pflash_drv->opts); -if (pflash_blk[i]) { -error_report ("clashes with -machine" ); -exit (1 ); - } - pflash_blk[i] =blk_by_legacy_dinfo (pflash_drv); -qdev_prop_set_drive (DEVICE (pcms->flash[i]), -"drive" , pflash_blk[i], &error_fatal); -loc_pop (&loc); }(5) I think you deleted too much here. After this loop, post-patch, for all "i", we'll have
pflash_blk[i] = pflash_cfi01_get_blk(pcms->flash[i]);But pre-patch, for all "i" where the "continue" didn't fire, we'd end up with:
pflash_blk[i] = blk_by_legacy_dinfo(pflash_drv);IOW the original loop both verifies and *collects*, for the gap check that comes just below.
IIRC, this allows for mixing "-drive if=pflash,unit=N" with the machine properties, as long as you have neither conflicts, nor gaps.
Post-patch however, this kind of mixing would break, because we'd report gaps for the legacy ("-drive if=pflash") options.
In addition, it could break the "use ROM mode" branch below, which is based on pflash_blk[0].
Quoted 7 lines
I think we should extend
pflash_cfi01_legacy_drive()to populate "pflash_blk[0..(ndev-1)]" on output (assumingpflash_blkis not NULL on input).(Because, I'm assuming that
qdev_prop_set_drive()-- which now occurs in the factored-out loop *before* the loop that we preserve here -- has no effect onpflash_cfi01_get_blk(pcms->flash[i]).)Hmmm, that's likely precisely what I'm wrong about. I've now looked at
DEFINE_PROP_DRIVE/qdev_prop_drive/set_drive/parse_drive... Doesqdev_prop_set_drive()actually *turn* the legacy options into genuine machine type properties?... The removed comment does indicate that:
Quoted 7 lines
"Map legacy -drive if=pflash to machine properties"
So I guess the remaining loop is correct after all, but the new comment
"Handle -drive if=pflash for machines that use machine properties"
is less clear to me.
OK, OK. I'm being dense. I guess the case is that
qdev_prop_set_drive(DEVICE(dev[i]), "drive",
blk_by_legacy_dinfo(dinfo), &error_fatal);in the new function basically *assigns* a non-NULL value to
dev[i]->blk
which was checked to be NULL just before.
... This is incredibly non-intuitive, especially given that the pre-patch code performed a *similar* assignment explicitly :(
In other words, we could have written the pre-patch (original) code like this:
hw/i386/pc_sysfw.c +3 -2
@@ -291,9 +291,10 @@ void pc_system_firmware_init(PCMachineState *pcms,error_report ("clashes with -machine" );exit (1 ); } - pflash_blk[i] =blk_by_legacy_dinfo (pflash_drv);qdev_prop_set_drive (DEVICE (pcms->flash[i]), -"drive" , pflash_blk[i], &error_fatal); +"drive" ,blk_by_legacy_dinfo (pflash_drv), + &error_fatal); + pflash_blk[i] =pflash_cfi01_get_blk (pcms->flash[i]);loc_pop (&loc); }
and the behavior would have been identical.
For the sake of QOM / blk dummies like me, can you please split this refactoring to a separate patch, before extracting the new function?
Thanks,
Laszlo
Quoted 18 lines
Quoted 17 lines
Quoted 16 lines
hw/i386/pc_sysfw.c +0
-0/* Reject gaps */ include/hw/block/flash.h +1
-0@@ -24,6 +24,7 @@ PFlashCFI01 *pflash_cfi01_register(hwaddr base, int be);BlockBackend *pflash_cfi01_get_blk (PFlashCFI01 *fl);MemoryRegion *pflash_cfi01_get_memory (PFlashCFI01 *fl); +void pflash_cfi01_legacy_drive (PFlashCFI01 *dev[],int ndev);/* pflash_cfi02.c */
Re: [Qemu-arm] [Qemu-devel] [PATCH 1/2] pflash_cfi01: New pflash_cfi01_legacy_drive()
Quoted 30 lines · Laszlo Ersek
Quoted 29 lines · Laszlo Ersek
Quoted 28 lines · Laszlo Ersek
Quoted 27 lines · Markus Armbruster
Factored out of
pc_system_firmware_init()so the next commit can reuse it inhw/arm/virt.c.Signed-off-by Markus Armbruster <[email protected]>--- hw/block/pflash_cfi01.c | 30 ++++++++++++++++++++++++++++++ hw/i386/pc_sysfw.c | 19 ++----------------- include/hw/block/flash.h | 1 + 3 files changed, 33 insertions(+), 17 deletions(-)hw/block/pflash_cfi01.c +3
-0@@ -44,9 +44,12 @@#include "qapi/error.h" #include "qemu/timer.h" #include "qemu/bitops.h" +#include "qemu/error-report.h" #include "qemu/host-utils.h" #include "qemu/log.h" +#include "qemu/option.h" #include "hw/sysbus.h" +#include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "trace.h"
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
hw/block/pflash_cfi01.c MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl) · line 975
Quoted 6 lines
hw/block/pflash_cfi01.c +2
-0@@ -968,6 +971,33 @@ MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl)return &fl->mem; } +/* +* Handle -drive if=pflash for machines that use machine properties. (1) Can we improve readability with quotes? "-drive if=pflash"
Sure.
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
hw/block/pflash_cfi01.c MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl) · line 976
Quoted 1 line
hw/block/pflash_cfi01.c +1
-0+* Map unit#i (0 < i <= @ndev) to @dev[i]'s property "drive". (2) I think you meant (0 <= i < @ndev)
You're right, of course.
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
hw/block/pflash_cfi01.c MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl) · line 980
Quoted 4 lines
hw/block/pflash_cfi01.c +4
-0+*/ +void pflash_cfi01_legacy_drive (PFlashCFI01 *dev[],int ndev) +{ +int i;(3) For utter pedantry, "ndev" and "i" should have type "
size_t" (in particular because we expect the caller to fill "ndev" withARRAY_SIZE().But, this would go beyond refactoring -- the original "int"s have served us just fine, and we're usually counting up (exclusively) to the huge number... two. :)
Exactly!
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
hw/block/pflash_cfi01.c MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl) · line 991
Quoted 11 lines
hw/block/pflash_cfi01.c +11
-0+DriveInfo *dinfo; +Location loc; + +for (i =0 ; i < ndev; i++) { + dinfo =drive_get (IF_PFLASH ,0 , i); +if (!dinfo) { +continue ; + } +loc_push_none (&loc); +qemu_opts_loc_restore (dinfo->opts); +if (dev[i]->blk) {(4) Is this really identical to the code being removed? The above controlling expression amounts to:
pcms->flash[i]->blk
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
but the original boils down to
pflash_cfi01_get_blk(pcms->flash[i])Hmm... looking at
pflash_cfi01_get_blk(), they are the same. Is there a particular reason for not using the wrapper function any longer? As in:
pflash_cfi01_get_blk(dev[i])
I don't see the benefit in abstracting from the member access.
If I could have ->blk outside pflash_cfi01.c without having to expose all of PFlashCFI01, and have it read-only, I would. But this is C, so I get to write yet another accessor function.
Quoted 86 lines
Quoted 86 lines
Quoted 73 lines
Quoted 39 lines
hw/block/pflash_cfi01.c +9
-0+error_report ("clashes with -machine" ); +exit (1 ); + } +qdev_prop_set_drive (DEVICE (dev[i]),"drive" , +blk_by_legacy_dinfo (dinfo), &error_fatal); +loc_pop (&loc); + } +} +static void postload_update_cb (void *opaque,int running,RunState state) {PFlashCFI01 *pfl = opaque;hw/i386/pc_sysfw.c +2
-8@@ -269,32 +269,17 @@ void pc_system_firmware_init(PCMachineState *pcms, {PCMachineClass *pcmc =PC_MACHINE_GET_CLASS (pcms);int i; -DriveInfo *pflash_drv;BlockBackend *pflash_blk[ARRAY_SIZE (pcms->flash)]; -Location loc;if (!pcmc->pci_enabled) {old_pc_system_rom_init (rom_memory, true);return ; } -/* Map legacy -drive if=pflash to machine properties */ +pflash_cfi01_legacy_drive (pcms->flash,ARRAY_SIZE (pcms->flash)); +for (i =0 ; i <ARRAY_SIZE (pcms->flash); i++) { pflash_blk[i] =pflash_cfi01_get_blk (pcms->flash[i]); - pflash_drv =drive_get (IF_PFLASH ,0 , i); -if (!pflash_drv) { -continue ; - } -loc_push_none (&loc);hw/i386/pc_sysfw.c void pc_system_firmware_init(PCMachineState *pcms, · line 283
Quoted 10 lines
hw/i386/pc_sysfw.c +0
-9-qemu_opts_loc_restore (pflash_drv->opts); -if (pflash_blk[i]) { -error_report ("clashes with -machine" ); -exit (1 ); - } - pflash_blk[i] =blk_by_legacy_dinfo (pflash_drv); -qdev_prop_set_drive (DEVICE (pcms->flash[i]), -"drive" , pflash_blk[i], &error_fatal); -loc_pop (&loc); }(5) I think you deleted too much here. After this loop, post-patch, for all "i", we'll have
pflash_blk[i] = pflash_cfi01_get_blk(pcms->flash[i]);But pre-patch, for all "i" where the "continue" didn't fire, we'd end up with:
pflash_blk[i] = blk_by_legacy_dinfo(pflash_drv);IOW the original loop both verifies and *collects*, for the gap check that comes just below.
IIRC, this allows for mixing "-drive if=pflash,unit=N" with the machine properties, as long as you have neither conflicts, nor gaps.
Post-patch however, this kind of mixing would break, because we'd report gaps for the legacy ("-drive if=pflash") options.
In addition, it could break the "use ROM mode" branch below, which is based on pflash_blk[0].
Quoted 7 lines
I think we should extend
pflash_cfi01_legacy_drive()to populate "pflash_blk[0..(ndev-1)]" on output (assumingpflash_blkis not NULL on input).(Because, I'm assuming that
qdev_prop_set_drive()-- which now occurs in the factored-out loop *before* the loop that we preserve here -- has no effect onpflash_cfi01_get_blk(pcms->flash[i]).)Hmmm, that's likely precisely what I'm wrong about. I've now looked at
DEFINE_PROP_DRIVE/qdev_prop_drive/set_drive/parse_drive... Doesqdev_prop_set_drive()actually *turn* the legacy options into genuine machine type properties?... The removed comment does indicate that:
Quoted 7 lines
Quoted 7 lines
"Map legacy -drive if=pflash to machine properties"
So I guess the remaining loop is correct after all, but the new comment
"Handle -drive if=pflash for machines that use machine properties"
is less clear to me.
In my defense, the complete new comment is
/*
* Handle -drive if=pflash for machines that use machine properties.
* Map unit#i (0 < i <= @ndev) to @dev[i]'s property "drive". */
Quoted 10 lines
OK, OK. I'm being dense. I guess the case is that
qdev_prop_set_drive(DEVICE(dev[i]), "drive", blk_by_legacy_dinfo(dinfo), &error_fatal);in the new function basically *assigns* a non-NULL value to
dev[i]->blk
which was checked to be NULL just before.
Correct!
Aside: the workings of qdev_prop_set_drive() used to be reasonably obvious until we rebased qdev onto QOM. Since then it involves a conversion to string, a detour through QOM infrastructure, which (among other things) converts the string right back. Progress!
Quoted 2 lines
... This is incredibly non-intuitive, especially given that the pre-patch code performed a *similar* assignment explicitly :(
So, here's my thinking process that led to this patch.
To make ARM virt work, I gave myself permission to copy code from x86 without thinking about code duplication. Once it worked, I checked what I actually copied. Just this loop:
/* Map legacy -drive if=pflash to machine properties */
for (i = 0; i < ARRAY_SIZE(pcms->flash); i++) {
pflash_blk[i] = pflash_cfi01_get_blk(pcms->flash[i]);
pflash_drv = drive_get(IF_PFLASH, 0, i);
if (!pflash_drv) {
continue;
}
loc_push_none(&loc);
qemu_opts_loc_restore(pflash_drv->opts);
if (pflash_blk[i]) {
error_report("clashes with -machine");
exit(1);
}
pflash_blk[i] = blk_by_legacy_dinfo(pflash_drv);
qdev_prop_set_drive(DEVICE(pcms->flash[i]),
"drive", pflash_blk[i], &error_fatal);
loc_pop(&loc);
}The easy de-dupe is to put it in a fuction like this (just for illustration, not even compile-tested):
void pflash_cfi01_legacy_drive(PFlashCFI01 *dev[], int ndev,
BlockBackend blk[])
{
int i;
DriveInfo *dinfo;
Location loc;
// the original loop with pcms->flash replaced by dev,
// pflash_blk by blk, pflash_cfi01_get_blk(dev[i]) by
// dev[i]->blk, and (for good measure) pflash_drv by
// dinfo:
for (i = 0; i < ndev; i++) {
blk[i] = dev[i]->blk;
dinfo = drive_get(IF_PFLASH, 0, i);
if (!dinfo) {
continue;
}
loc_push_none(&loc);
qemu_opts_loc_restore(dinfo->opts);
if (blk[i]) {
error_report("clashes with -machine");
exit(1);
}
blk[i] = blk_by_legacy_dinfo(dinfo);
qdev_prop_set_drive(DEVICE(dev[i]),
"drive", blk[i], &error_fatal);
loc_pop(&loc);
}
}Called like
pflash_cfi01_legacy_drive(pcms->flash, ARRAY_SIZE(pcms->flash),
pflash_blk);The last parameter is awkward. If you doubt me, try writing a contract. Further evidence: the ARM virt caller only ever uses blk[0].
The awkwardness is cause by the original loop doing two things: map legacy -drive to properties, and collect all the BlockBackends for use after the loop.
Better factor just the former out of the loop:
pflash_cfi01_legacy_drive(pcms->flash, ARRAY_SIZE(pcms->flash));
for (i = 0; i < ARRAY_SIZE(pcms->flash); i++) {
pflash_blk[i] = pflash_cfi01_get_blk(pcms->flash[i]);
}Now transform pflash_cfi01_legacy_drive(). First step: replace the last parameter by a local variable:
BlockBackend *blk[ndev];
Variable length array, no good. But since its only use is blk[i] in the loop, we can collapse it to just
BlockBackend *blk;
used like this:
for (i = 0; i < ndev; i++) {
blk = dev[i]->blk;
dinfo = drive_get(IF_PFLASH, 0, i);
if (!dinfo) {
continue;
}
loc_push_none(&loc);
qemu_opts_loc_restore(dinfo->opts);
if (blk) {
error_report("clashes with -machine");
exit(1);
}
blk = blk_by_legacy_dinfo(dinfo);
qdev_prop_set_drive(DEVICE(dev[i]),
"drive", blk, &error_fatal);
loc_pop(&loc);
}Note that each of the two assignments to blk is used just once. Meh. Eliminate the variable:
for (i = 0; i < ndev; i++) {
dinfo = drive_get(IF_PFLASH, 0, i);
if (!dinfo) {
continue;
}
loc_push_none(&loc);
qemu_opts_loc_restore(dinfo->opts);
if (dev[i]->blk) {
error_report("clashes with -machine");
exit(1);
}
qdev_prop_set_drive(DEVICE(dev[i]), "drive",
blk_by_legacy_dinfo(dinfo), &error_fatal);
loc_pop(&loc);
}And this is exactly what's in my patch.
Quoted 22 lines
In other words, we could have written the pre-patch (original) code like this:
hw/i386/pc_sysfw.c +3
-2@@ -291,9 +291,10 @@ void pc_system_firmware_init(PCMachineState *pcms,error_report ("clashes with -machine" );exit (1 ); } - pflash_blk[i] =blk_by_legacy_dinfo (pflash_drv);qdev_prop_set_drive (DEVICE (pcms->flash[i]), -"drive" , pflash_blk[i], &error_fatal); +"drive" ,blk_by_legacy_dinfo (pflash_drv), + &error_fatal); + pflash_blk[i] =pflash_cfi01_get_blk (pcms->flash[i]);loc_pop (&loc); }and the behavior would have been identical.
Quoted 2 lines
For the sake of QOM / blk dummies like me, can you please split this refactoring to a separate patch, before extracting the new function?
If you think a preparatory patch is called for, I'll create one.
I'd have difficulties coming up with a commit message for the one you proposed.
I append a patch I can describe. Would it work for you?
pc: Split pc_system_firmware_init()'s legacy -drive loop
The loop does two things: map legacy -drive to properties, and collect all the backends for use after the loop. The next patch will factor out the former for reuse in hw/arm/virt.c. To make that easier, do each thing in its own loop.
--- hw/i386/pc_sysfw.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
hw/i386/pc_sysfw.c +9 -5
@@ -269,6 +269,7 @@ void pc_system_firmware_init(PCMachineState *pcms, {PCMachineClass *pcmc =PC_MACHINE_GET_CLASS (pcms);int i; +BlockBackend *blk;DriveInfo *pflash_drv;BlockBackend *pflash_blk[ARRAY_SIZE (pcms->flash)];Location loc;
@@ -280,23 +281,26 @@ void pc_system_firmware_init(PCMachineState *pcms,/* Map legacy -drive if=pflash to machine properties */ for (i =0 ; i <ARRAY_SIZE (pcms->flash); i++) { - pflash_blk[i] =pflash_cfi01_get_blk (pcms->flash[i]); + blk =pflash_cfi01_get_blk (pcms->flash[i]); pflash_drv =drive_get (IF_PFLASH ,0 , i);if (!pflash_drv) {continue ; }loc_push_none (&loc);qemu_opts_loc_restore (pflash_drv->opts); -if (pflash_blk[i]) { +if (blk) {error_report ("clashes with -machine" );exit (1 ); } - pflash_blk[i] =blk_by_legacy_dinfo (pflash_drv); -qdev_prop_set_drive (DEVICE (pcms->flash[i]), -"drive" , pflash_blk[i], &error_fatal); +qdev_prop_set_drive (DEVICE (pcms->flash[i]),"drive" , +blk_by_legacy_dinfo (pflash_drv), &error_fatal);loc_pop (&loc); } +for (i =0 ; i <ARRAY_SIZE (pcms->flash); i++) { + pflash_blk[i] =blk_by_legacy_dinfo (pflash_drv); + } +/* Reject gaps */ for (i =1 ; i <ARRAY_SIZE (pcms->flash); i++) {if (pflash_blk[i] && !pflash_blk[i -1 ]) {
Signature · 1 line
2.17.2
Re: [Qemu-arm] [Qemu-devel] [PATCH 1/2] pflash_cfi01: New pflash_cfi01_legacy_drive()
Quoted 51 lines · Markus Armbruster
I append a patch I can describe. Would it work for you?
pc: Split pc_system_firmware_init()'s legacy -drive loop
The loop does two things: map legacy -drive to properties, and collect all the backends for use after the loop. The next patch will factor out the former for reuse in
hw/arm/virt.c. To make that easier, do each thing in its own loop.Signed-off-by Markus Armbruster <[email protected]>--- hw/i386/pc_sysfw.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)hw/i386/pc_sysfw.c +5
-5@@ -269,6 +269,7 @@ void pc_system_firmware_init(PCMachineState *pcms, {PCMachineClass *pcmc =PC_MACHINE_GET_CLASS (pcms);int i; +BlockBackend *blk;DriveInfo *pflash_drv;BlockBackend *pflash_blk[ARRAY_SIZE (pcms->flash)];Location loc;@@ -280,23 +281,26 @@ void pc_system_firmware_init(PCMachineState *pcms,/* Map legacy -drive if=pflash to machine properties */ for (i =0 ; i <ARRAY_SIZE (pcms->flash); i++) { - pflash_blk[i] =pflash_cfi01_get_blk (pcms->flash[i]); + blk =pflash_cfi01_get_blk (pcms->flash[i]); pflash_drv =drive_get (IF_PFLASH ,0 , i);if (!pflash_drv) {continue ; }loc_push_none (&loc);qemu_opts_loc_restore (pflash_drv->opts); -if (pflash_blk[i]) { +if (blk) {error_report ("clashes with -machine" );exit (1 ); } - pflash_blk[i] =blk_by_legacy_dinfo (pflash_drv); -qdev_prop_set_drive (DEVICE (pcms->flash[i]), -"drive" , pflash_blk[i], &error_fatal); +qdev_prop_set_drive (DEVICE (pcms->flash[i]),"drive" , +blk_by_legacy_dinfo (pflash_drv), &error_fatal);loc_pop (&loc);
hw/i386/pc_sysfw.c void pc_system_firmware_init(PCMachineState *pcms,
Quoted 10 lines
hw/i386/pc_sysfw.c +4
-1} +for (i =0 ; i <ARRAY_SIZE (pcms->flash); i++) { + pflash_blk[i] =blk_by_legacy_dinfo (pflash_drv); + } +/* Reject gaps */ for (i =1 ; i <ARRAY_SIZE (pcms->flash); i++) {if (pflash_blk[i] && !pflash_blk[i -1 ]) { -- 2.17.2
Works for me! Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Re: [Qemu-arm] [Qemu-devel] [PATCH 1/2] pflash_cfi01: New pflash_cfi01_legacy_drive()
In reply to Markus ArmbrusterQuoted 1 line · Markus Armbruster
Laszlo Ersek <[email protected]> writes:
[...]
Quoted 34 lines
Quoted 22 lines
In other words, we could have written the pre-patch (original) code like this:
hw/i386/pc_sysfw.c +3
-2@@ -291,9 +291,10 @@ void pc_system_firmware_init(PCMachineState *pcms,error_report ("clashes with -machine" );exit (1 ); } - pflash_blk[i] =blk_by_legacy_dinfo (pflash_drv);qdev_prop_set_drive (DEVICE (pcms->flash[i]), -"drive" , pflash_blk[i], &error_fatal); +"drive" ,blk_by_legacy_dinfo (pflash_drv), + &error_fatal); + pflash_blk[i] =pflash_cfi01_get_blk (pcms->flash[i]);loc_pop (&loc); }and the behavior would have been identical.
Quoted 2 lines
For the sake of QOM / blk dummies like me, can you please split this refactoring to a separate patch, before extracting the new function?
If you think a preparatory patch is called for, I'll create one.
I'd have difficulties coming up with a commit message for the one you proposed.
I append a patch I can describe. Would it work for you?
Quoted 6 lines
pc: Split pc_system_firmware_init()'s legacy -drive loop
The loop does two things: map legacy -drive to properties, and collect all the backends for use after the loop. The next patch will factor out the former for reuse in
hw/arm/virt.c. To make that easier, do each thing in its own loop.
Inserting here:
Note that the first loop updates pcms->flash[i]->blk for -drive if=pflash with qdev_prop_set_drive(). The second loop gets the (possibly updated) value from pflash_cfi01_get_blk().
Quoted 35 lines
Signed-off-by Markus Armbruster <[email protected]>--- hw/i386/pc_sysfw.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)hw/i386/pc_sysfw.c +3
-2@@ -269,6 +269,7 @@ void pc_system_firmware_init(PCMachineState *pcms, {PCMachineClass *pcmc =PC_MACHINE_GET_CLASS (pcms);int i; +BlockBackend *blk;DriveInfo *pflash_drv;BlockBackend *pflash_blk[ARRAY_SIZE (pcms->flash)];Location loc;@@ -280,23 +281,26 @@ void pc_system_firmware_init(PCMachineState *pcms,/* Map legacy -drive if=pflash to machine properties */ for (i =0 ; i <ARRAY_SIZE (pcms->flash); i++) { - pflash_blk[i] =pflash_cfi01_get_blk (pcms->flash[i]); + blk =pflash_cfi01_get_blk (pcms->flash[i]); pflash_drv =drive_get (IF_PFLASH ,0 , i);if (!pflash_drv) {continue ; }loc_push_none (&loc);qemu_opts_loc_restore (pflash_drv->opts); -if (pflash_blk[i]) { +if (blk) {error_report ("clashes with -machine" );exit (1 ); }
hw/i386/pc_sysfw.c void pc_system_firmware_init(PCMachineState *pcms, · line 301
Quoted 10 lines
hw/i386/pc_sysfw.c +4
-3- pflash_blk[i] =blk_by_legacy_dinfo (pflash_drv); -qdev_prop_set_drive (DEVICE (pcms->flash[i]), -"drive" , pflash_blk[i], &error_fatal); +qdev_prop_set_drive (DEVICE (pcms->flash[i]),"drive" , +blk_by_legacy_dinfo (pflash_drv), &error_fatal);loc_pop (&loc); } +for (i =0 ; i <ARRAY_SIZE (pcms->flash); i++) { + pflash_blk[i] =blk_by_legacy_dinfo (pflash_drv);
Uh, this should be pflash_cfi01_get_blk(pcms->flash[i]) instead.
Quoted 5 lines
hw/i386/pc_sysfw.c +2
-0+ } +/* Reject gaps */ for (i =1 ; i <ARRAY_SIZE (pcms->flash); i++) {if (pflash_blk[i] && !pflash_blk[i -1 ]) {
Laszlo Ersek
Reviewed-byRe: [Qemu-arm] [Qemu-devel] [PATCH 1/2] pflash_cfi01: New pflash_cfi01_legacy_drive()
In reply to Markus ArmbrusterQuoted 421 lines · Markus Armbruster
Quoted 30 lines · Laszlo Ersek
Quoted 29 lines · Laszlo Ersek
Quoted 28 lines · Laszlo Ersek
Quoted 27 lines · Markus Armbruster
Factored out of
pc_system_firmware_init()so the next commit can reuse it inhw/arm/virt.c.Signed-off-by Markus Armbruster <[email protected]>--- hw/block/pflash_cfi01.c | 30 ++++++++++++++++++++++++++++++ hw/i386/pc_sysfw.c | 19 ++----------------- include/hw/block/flash.h | 1 + 3 files changed, 33 insertions(+), 17 deletions(-)hw/block/pflash_cfi01.c +3
-0@@ -44,9 +44,12 @@#include "qapi/error.h" #include "qemu/timer.h" #include "qemu/bitops.h" +#include "qemu/error-report.h" #include "qemu/host-utils.h" #include "qemu/log.h" +#include "qemu/option.h" #include "hw/sysbus.h" +#include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "trace.h" Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
hw/block/pflash_cfi01.c MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl) · line 975
Quoted 6 lines
hw/block/pflash_cfi01.c +2
-0@@ -968,6 +971,33 @@ MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl)return &fl->mem; } +/* +* Handle -drive if=pflash for machines that use machine properties. (1) Can we improve readability with quotes? "-drive if=pflash"
Sure.
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
hw/block/pflash_cfi01.c MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl) · line 976
Quoted 1 line
hw/block/pflash_cfi01.c +1
-0+* Map unit#i (0 < i <= @ndev) to @dev[i]'s property "drive". (2) I think you meant (0 <= i < @ndev)
You're right, of course.
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
hw/block/pflash_cfi01.c MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl) · line 980
Quoted 4 lines
hw/block/pflash_cfi01.c +4
-0+*/ +void pflash_cfi01_legacy_drive (PFlashCFI01 *dev[],int ndev) +{ +int i;(3) For utter pedantry, "ndev" and "i" should have type "
size_t" (in particular because we expect the caller to fill "ndev" withARRAY_SIZE().But, this would go beyond refactoring -- the original "int"s have served us just fine, and we're usually counting up (exclusively) to the huge number... two. :)
Exactly!
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
hw/block/pflash_cfi01.c MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl) · line 991
Quoted 11 lines
hw/block/pflash_cfi01.c +11
-0+DriveInfo *dinfo; +Location loc; + +for (i =0 ; i < ndev; i++) { + dinfo =drive_get (IF_PFLASH ,0 , i); +if (!dinfo) { +continue ; + } +loc_push_none (&loc); +qemu_opts_loc_restore (dinfo->opts); +if (dev[i]->blk) {(4) Is this really identical to the code being removed? The above controlling expression amounts to:
pcms->flash[i]->blk
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
but the original boils down to
pflash_cfi01_get_blk(pcms->flash[i])Hmm... looking at
pflash_cfi01_get_blk(), they are the same. Is there a particular reason for not using the wrapper function any longer? As in:
pflash_cfi01_get_blk(dev[i])I don't see the benefit in abstracting from the member access.
If I could have ->blk outside
pflash_cfi01.cwithout having to expose all of PFlashCFI01, and have it read-only, I would. But this is C, so I get to write yet another accessor function.Quoted 86 lines
Quoted 86 lines
Quoted 73 lines
Quoted 39 lines
hw/block/pflash_cfi01.c +9
-0+error_report ("clashes with -machine" ); +exit (1 ); + } +qdev_prop_set_drive (DEVICE (dev[i]),"drive" , +blk_by_legacy_dinfo (dinfo), &error_fatal); +loc_pop (&loc); + } +} +static void postload_update_cb (void *opaque,int running,RunState state) {PFlashCFI01 *pfl = opaque;hw/i386/pc_sysfw.c +2
-8@@ -269,32 +269,17 @@ void pc_system_firmware_init(PCMachineState *pcms, {PCMachineClass *pcmc =PC_MACHINE_GET_CLASS (pcms);int i; -DriveInfo *pflash_drv;BlockBackend *pflash_blk[ARRAY_SIZE (pcms->flash)]; -Location loc;if (!pcmc->pci_enabled) {old_pc_system_rom_init (rom_memory, true);return ; } -/* Map legacy -drive if=pflash to machine properties */ +pflash_cfi01_legacy_drive (pcms->flash,ARRAY_SIZE (pcms->flash)); +for (i =0 ; i <ARRAY_SIZE (pcms->flash); i++) { pflash_blk[i] =pflash_cfi01_get_blk (pcms->flash[i]); - pflash_drv =drive_get (IF_PFLASH ,0 , i); -if (!pflash_drv) { -continue ; - } -loc_push_none (&loc);hw/i386/pc_sysfw.c void pc_system_firmware_init(PCMachineState *pcms, · line 283
Quoted 10 lines
hw/i386/pc_sysfw.c +0
-9-qemu_opts_loc_restore (pflash_drv->opts); -if (pflash_blk[i]) { -error_report ("clashes with -machine" ); -exit (1 ); - } - pflash_blk[i] =blk_by_legacy_dinfo (pflash_drv); -qdev_prop_set_drive (DEVICE (pcms->flash[i]), -"drive" , pflash_blk[i], &error_fatal); -loc_pop (&loc); }(5) I think you deleted too much here. After this loop, post-patch, for all "i", we'll have
pflash_blk[i] = pflash_cfi01_get_blk(pcms->flash[i]);But pre-patch, for all "i" where the "continue" didn't fire, we'd end up with:
pflash_blk[i] = blk_by_legacy_dinfo(pflash_drv);IOW the original loop both verifies and *collects*, for the gap check that comes just below.
IIRC, this allows for mixing "-drive if=pflash,unit=N" with the machine properties, as long as you have neither conflicts, nor gaps.
Post-patch however, this kind of mixing would break, because we'd report gaps for the legacy ("-drive if=pflash") options.
In addition, it could break the "use ROM mode" branch below, which is based on pflash_blk[0].
Quoted 7 lines
I think we should extend
pflash_cfi01_legacy_drive()to populate "pflash_blk[0..(ndev-1)]" on output (assumingpflash_blkis not NULL on input).(Because, I'm assuming that
qdev_prop_set_drive()-- which now occurs in the factored-out loop *before* the loop that we preserve here -- has no effect onpflash_cfi01_get_blk(pcms->flash[i]).)Hmmm, that's likely precisely what I'm wrong about. I've now looked at
DEFINE_PROP_DRIVE/qdev_prop_drive/set_drive/parse_drive... Doesqdev_prop_set_drive()actually *turn* the legacy options into genuine machine type properties?... The removed comment does indicate that:Quoted 7 lines
Quoted 7 lines
"Map legacy -drive if=pflash to machine properties"
So I guess the remaining loop is correct after all, but the new comment
"Handle -drive if=pflash for machines that use machine properties"
is less clear to me.
In my defense, the complete new comment is
/*
* Handle -drive if=pflash for machines that use machine properties.
* Map unit#i (0 < i <= @ndev) to @dev[i]'s property "drive". */Quoted 10 lines
OK, OK. I'm being dense. I guess the case is that
qdev_prop_set_drive(DEVICE(dev[i]), "drive", blk_by_legacy_dinfo(dinfo), &error_fatal);in the new function basically *assigns* a non-NULL value to
dev[i]->blk
which was checked to be NULL just before.
Correct!
Aside: the workings of
qdev_prop_set_drive()used to be reasonably obvious until we rebased qdev onto QOM. Since then it involves a conversion to string, a detour through QOM infrastructure, which (among other things) converts the string right back. Progress!Quoted 2 lines
... This is incredibly non-intuitive, especially given that the pre-patch code performed a *similar* assignment explicitly :(
So, here's my thinking process that led to this patch.
To make ARM virt work, I gave myself permission to copy code from x86 without thinking about code duplication. Once it worked, I checked what I actually copied. Just this loop:
/* Map legacy -drive if=pflash to machine properties */ for (i = 0; i < ARRAY_SIZE(pcms->flash); i++) { pflash_blk[i] = pflash_cfi01_get_blk(pcms->flash[i]); pflash_drv = drive_get(IF_PFLASH, 0, i); if (!pflash_drv) { continue; } loc_push_none(&loc); qemu_opts_loc_restore(pflash_drv->opts); if (pflash_blk[i]) { error_report("clashes with -machine"); exit(1); } pflash_blk[i] = blk_by_legacy_dinfo(pflash_drv); qdev_prop_set_drive(DEVICE(pcms->flash[i]), "drive", pflash_blk[i], &error_fatal); loc_pop(&loc); }The easy de-dupe is to put it in a fuction like this (just for illustration, not even compile-tested):
void pflash_cfi01_legacy_drive(PFlashCFI01 *dev[], int ndev, BlockBackend blk[]) { int i; DriveInfo *dinfo; Location loc; // the original loop with pcms->flash replaced by dev, // pflash_blk by blk, pflash_cfi01_get_blk(dev[i]) by // dev[i]->blk, and (for good measure) pflash_drv by // dinfo: for (i = 0; i < ndev; i++) { blk[i] = dev[i]->blk; dinfo = drive_get(IF_PFLASH, 0, i); if (!dinfo) { continue; } loc_push_none(&loc); qemu_opts_loc_restore(dinfo->opts); if (blk[i]) { error_report("clashes with -machine"); exit(1); } blk[i] = blk_by_legacy_dinfo(dinfo); qdev_prop_set_drive(DEVICE(dev[i]), "drive", blk[i], &error_fatal); loc_pop(&loc); } }Called like
pflash_cfi01_legacy_drive(pcms->flash, ARRAY_SIZE(pcms->flash), pflash_blk);The last parameter is awkward. If you doubt me, try writing a contract. Further evidence: the ARM virt caller only ever uses blk[0].
The awkwardness is cause by the original loop doing two things: map legacy -drive to properties, and collect all the BlockBackends for use after the loop.
Better factor just the former out of the loop:
pflash_cfi01_legacy_drive(pcms->flash, ARRAY_SIZE(pcms->flash)); for (i = 0; i < ARRAY_SIZE(pcms->flash); i++) { pflash_blk[i] = pflash_cfi01_get_blk(pcms->flash[i]); }Now transform
pflash_cfi01_legacy_drive(). First step: replace the last parameter by a local variable:BlockBackend *blk[ndev];Variable length array, no good. But since its only use is blk[i] in the loop, we can collapse it to just
BlockBackend *blk;used like this:
for (i = 0; i < ndev; i++) { blk = dev[i]->blk; dinfo = drive_get(IF_PFLASH, 0, i); if (!dinfo) { continue; } loc_push_none(&loc); qemu_opts_loc_restore(dinfo->opts); if (blk) { error_report("clashes with -machine"); exit(1); } blk = blk_by_legacy_dinfo(dinfo); qdev_prop_set_drive(DEVICE(dev[i]), "drive", blk, &error_fatal); loc_pop(&loc); }Note that each of the two assignments to blk is used just once. Meh. Eliminate the variable:
for (i = 0; i < ndev; i++) { dinfo = drive_get(IF_PFLASH, 0, i); if (!dinfo) { continue; } loc_push_none(&loc); qemu_opts_loc_restore(dinfo->opts); if (dev[i]->blk) { error_report("clashes with -machine"); exit(1); } qdev_prop_set_drive(DEVICE(dev[i]), "drive", blk_by_legacy_dinfo(dinfo), &error_fatal); loc_pop(&loc); }And this is exactly what's in my patch.
Quoted 22 lines
In other words, we could have written the pre-patch (original) code like this:
hw/i386/pc_sysfw.c +3
-2@@ -291,9 +291,10 @@ void pc_system_firmware_init(PCMachineState *pcms,error_report ("clashes with -machine" );exit (1 ); } - pflash_blk[i] =blk_by_legacy_dinfo (pflash_drv);qdev_prop_set_drive (DEVICE (pcms->flash[i]), -"drive" , pflash_blk[i], &error_fatal); +"drive" ,blk_by_legacy_dinfo (pflash_drv), + &error_fatal); + pflash_blk[i] =pflash_cfi01_get_blk (pcms->flash[i]);loc_pop (&loc); }and the behavior would have been identical.
Quoted 2 lines
For the sake of QOM / blk dummies like me, can you please split this refactoring to a separate patch, before extracting the new function?
If you think a preparatory patch is called for, I'll create one.
I'd have difficulties coming up with a commit message for the one you proposed.
I append a patch I can describe. Would it work for you?
pc: Split pc_system_firmware_init()'s legacy -drive loop
The loop does two things: map legacy -drive to properties, and collect all the backends for use after the loop. The next patch will factor out the former for reuse in
hw/arm/virt.c. To make that easier, do each thing in its own loop.Signed-off-by Markus Armbruster <[email protected]>--- hw/i386/pc_sysfw.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)hw/i386/pc_sysfw.c +3
-2@@ -269,6 +269,7 @@ void pc_system_firmware_init(PCMachineState *pcms, {PCMachineClass *pcmc =PC_MACHINE_GET_CLASS (pcms);int i; +BlockBackend *blk;DriveInfo *pflash_drv;BlockBackend *pflash_blk[ARRAY_SIZE (pcms->flash)];Location loc;@@ -280,23 +281,26 @@ void pc_system_firmware_init(PCMachineState *pcms,/* Map legacy -drive if=pflash to machine properties */ for (i =0 ; i <ARRAY_SIZE (pcms->flash); i++) { - pflash_blk[i] =pflash_cfi01_get_blk (pcms->flash[i]); + blk =pflash_cfi01_get_blk (pcms->flash[i]); pflash_drv =drive_get (IF_PFLASH ,0 , i);if (!pflash_drv) {continue ; }loc_push_none (&loc);qemu_opts_loc_restore (pflash_drv->opts); -if (pflash_blk[i]) { +if (blk) {error_report ("clashes with -machine" );exit (1 ); }
hw/i386/pc_sysfw.c void pc_system_firmware_init(PCMachineState *pcms, · line 301
Quoted 10 lines
hw/i386/pc_sysfw.c +4
-3- pflash_blk[i] =blk_by_legacy_dinfo (pflash_drv); -qdev_prop_set_drive (DEVICE (pcms->flash[i]), -"drive" , pflash_blk[i], &error_fatal); +qdev_prop_set_drive (DEVICE (pcms->flash[i]),"drive" , +blk_by_legacy_dinfo (pflash_drv), &error_fatal);loc_pop (&loc); } +for (i =0 ; i <ARRAY_SIZE (pcms->flash); i++) { + pflash_blk[i] =blk_by_legacy_dinfo (pflash_drv);
[*]
hw/i386/pc_sysfw.c void pc_system_firmware_init(PCMachineState *pcms, · line 306
Quoted 6 lines
hw/i386/pc_sysfw.c +2
-0+ } +/* Reject gaps */ for (i =1 ; i <ARRAY_SIZE (pcms->flash); i++) {if (pflash_blk[i] && !pflash_blk[i -1 ]) {
Yes, this is a huge boost to readability, as far as I'm concerned -- primarily because it kills the *second* "pflash_blk[i]" assignment in the original loop body. Please do include this patch, and append, at once:
... BTW: you are assigning "blk" once, and reading it once. You might as well drop "blk" and substitute "pflash_cfi01_get_blk(pcms->flash[i])".
[*] Yes, I'm seeing your update down-thread. :)
Thanks,
Laszlo
PATCH 2/2 hw/arm/virt: Support firmware configuration with -blockdev
In reply to Markus ArmbrusterThe ARM virt machines put firmware in flash memory. To configure it, you use -drive if=pflash,unit=0,... and optionally -drive if=pflash,unit=1,...
Why two -drive? This permits setting up one part of the flash memory read-only, and the other part read/write. It also makes upgrading firmware on the host easier. Below the hood, we get two separate flash devices, because we were too lazy to improve our flash device models to support sector protection.
The problem at hand is to do the same with -blockdev somehow, as one more step towards deprecating -drive.
We recently solved this problem for x86 PC machines, in commit ebc29e1beab. See the commit message for design rationale.
This commit solves it for ARM virt basically the same way: new machine properties pflash0, pflash1 forward to the onboard flash devices' properties. Requires creating the onboard devices in the .instance_init() method virt_instance_init(). The existing code to pick up drives defined with -drive if=pflash is replaced by code to desugar into the machine properties.
There are a few behavioral differences, though:
* The flash devices are always present (x86: only present if configured)
* Flash base addresses and sizes are fixed (x86: sizes depend on images, mapped back to back below a fixed address)
* -bios configures contents of first pflash (x86: -bios configures ROM contents)
* -bios is rejected when first pflash is also configured with -machine pflash0=... (x86: bios is silently ignored then)
* -machine pflash1=... does not require -machine pflash0=... (x86: it does).
The actual code is a bit simpler than for x86 mostly due to the first two differences.
--- hw/arm/virt.c | 192 +++++++++++++++++++++++++++--------------- include/hw/arm/virt.h | 2 + 2 files changed, 124 insertions(+), 70 deletions(-)
hw/arm/virt.c +122 -70
@@ -30,6 +30,7 @@#include "qemu/osdep.h" #include "qemu/units.h" +#include "qemu/option.h" #include "qapi/error.h" #include "hw/sysbus.h" #include "hw/arm/arm.h"
@@ -871,25 +872,19 @@ static void create_virtio_devices(const VirtMachineState *vms, qemu_irq *pic) } } -static void create_one_flash (const char *name,hwaddr flashbase, -hwaddr flashsize,const char *file, -MemoryRegion *sysmem) +#define VIRT_FLASH_SECTOR_SIZE (256 * KiB) + +static PFlashCFI01 *virt_pflash_create1 (VirtMachineState *vms, +const char *name, +const char *alias_prop_name) { -/* Create and map a single flash device. We use the same -* parameters as the flash devices on the Versatile Express board. +/* +* Create a single flash device. We use the same parameters as +* the flash devices on the Versatile Express board. */ -DriveInfo *dinfo =drive_get_next (IF_PFLASH );DeviceState *dev =qdev_create (NULL ,TYPE_PFLASH_CFI01 ); -SysBusDevice *sbd =SYS_BUS_DEVICE (dev); -const uint64_t sectorlength =256 *1024 ; -if (dinfo) { -qdev_prop_set_drive (dev,"drive" ,blk_by_legacy_dinfo (dinfo), - &error_abort); - } - -qdev_prop_set_uint32 (dev,"num-blocks" , flashsize / sectorlength); -qdev_prop_set_uint64 (dev,"sector-length" , sectorlength); +qdev_prop_set_uint64 (dev,"sector-length" ,VIRT_FLASH_SECTOR_SIZE );qdev_prop_set_uint8 (dev,"width" ,4 );qdev_prop_set_uint8 (dev,"device-width" ,2 );qdev_prop_set_bit (dev,"big-endian" , false);
@@ -898,41 +893,41 @@ static void create_one_flash(const char *name, hwaddr flashbase,qdev_prop_set_uint16 (dev,"id2" ,0x00 );qdev_prop_set_uint16 (dev,"id3" ,0x00 );qdev_prop_set_string (dev,"name" , name); +object_property_add_child (OBJECT (vms), name,OBJECT (dev), + &error_abort); +object_property_add_alias (OBJECT (vms), alias_prop_name, +OBJECT (dev),"drive" , &error_abort); +return PFLASH_CFI01 (dev); +} + +static void virt_flash_create (VirtMachineState *vms) +{ + vms->flash[0 ] =virt_pflash_create1 (vms,"virt.flash0" ,"pflash0" ); + vms->flash[1 ] =virt_pflash_create1 (vms,"virt.flash1" ,"pflash1" ); +} + +static void virt_flash_map1 (PFlashCFI01 *flash, +hwaddr base,hwaddr size, +MemoryRegion *sysmem) +{ +DeviceState *dev =DEVICE (flash); + +assert (size %VIRT_FLASH_SECTOR_SIZE ==0 ); +assert (size /VIRT_FLASH_SECTOR_SIZE <=UINT32_MAX ); +qdev_prop_set_uint32 (dev,"num-blocks" , size /VIRT_FLASH_SECTOR_SIZE );qdev_init_nofail (dev); -memory_region_add_subregion (sysmem, flashbase, -sysbus_mmio_get_region (SYS_BUS_DEVICE (dev),0 )); - -if (file) { -char *fn; -int image_size; - -if (drive_get (IF_PFLASH ,0 ,0 )) { -error_report ("The contents of the first flash device may be " -"specified with -bios or with -drive if=pflash... " -"but you cannot use both options at once" ); -exit (1 ); - } - fn =qemu_find_file (QEMU_FILE_TYPE_BIOS , file); -if (!fn) { -error_report ("Could not find ROM image '%s'" , file); -exit (1 ); - } - image_size =load_image_mr (fn,sysbus_mmio_get_region (sbd,0 )); -g_free (fn); -if (image_size <0 ) { -error_report ("Could not load ROM image '%s'" , file); -exit (1 ); - } - } +memory_region_add_subregion (sysmem, base, +sysbus_mmio_get_region (SYS_BUS_DEVICE (dev), +0 )); } -static void create_flash (const VirtMachineState *vms, -MemoryRegion *sysmem, -MemoryRegion *secure_sysmem) +static void virt_flash_map (VirtMachineState *vms, +MemoryRegion *sysmem, +MemoryRegion *secure_sysmem) { -/* Create two flash devices to fill the VIRT_FLASH space in the memmap. -* Any file passed via -bios goes in the first of these. +/* +* Map two flash devices to fill the VIRT_FLASH space in the memmap. * sysmem is the system memory space. secure_sysmem is the secure view * of the system, and the first flash device should be made visible only * there. The second flash device is visible to both secure and nonsecure.
@@ -941,13 +936,21 @@ static void create_flash(const VirtMachineState *vms,*/ hwaddr flashsize = vms->memmap[VIRT_FLASH ].size /2 ;hwaddr flashbase = vms->memmap[VIRT_FLASH ].base; + +virt_flash_map1 (vms->flash[0 ], flashbase, flashsize, + secure_sysmem); +virt_flash_map1 (vms->flash[1 ], flashbase + flashsize, flashsize, + sysmem); +} + +static void virt_flash_fdt (VirtMachineState *vms, +MemoryRegion *sysmem, +MemoryRegion *secure_sysmem) +{ +hwaddr flashsize = vms->memmap[VIRT_FLASH ].size /2 ; +hwaddr flashbase = vms->memmap[VIRT_FLASH ].base;char *nodename; -create_one_flash ("virt.flash0" , flashbase, flashsize, - bios_name, secure_sysmem); -create_one_flash ("virt.flash1" , flashbase + flashsize, flashsize, -NULL , sysmem); -if (sysmem == secure_sysmem) {/* Report both flash devices as a single node in the DT */ nodename =g_strdup_printf ("/flash@%" PRIx64, flashbase);
@@ -959,7 +962,8 @@ static void create_flash(const VirtMachineState *vms,qemu_fdt_setprop_cell (vms->fdt, nodename,"bank-width" ,4 );g_free (nodename); }else { -/* Report the devices as separate nodes so we can mark one as +/* +* Report the devices as separate nodes so we can mark one as * only visible to the secure world. */ nodename =g_strdup_printf ("/secflash@%" PRIx64, flashbase);
@@ -982,6 +986,48 @@ static void create_flash(const VirtMachineState *vms, } } +static bool virt_firmware_init (VirtMachineState *vms, +MemoryRegion *sysmem, +MemoryRegion *secure_sysmem) +{ +BlockBackend *pflash_blk0; + +pflash_cfi01_legacy_drive (vms->flash,ARRAY_SIZE (vms->flash)); +virt_flash_map (vms, sysmem, secure_sysmem); + + pflash_blk0 =pflash_cfi01_get_blk (vms->flash[0 ]); + +if (bios_name) { +char *fname; +MemoryRegion *mr; +int image_size; + +if (pflash_blk0) { +error_report ("The contents of the first flash device may be " +"specified with -bios or with -drive if=pflash... " +"but you cannot use both options at once" ); +exit (1 ); + } + +/* Fall back to -bios */ + + fname =qemu_find_file (QEMU_FILE_TYPE_BIOS , bios_name); +if (!fname) { +error_report ("Could not find ROM image '%s'" , bios_name); +exit (1 ); + } + mr =sysbus_mmio_get_region (SYS_BUS_DEVICE (vms->flash[0 ]),0 ); + image_size =load_image_mr (fname, mr); +g_free (fname); +if (image_size <0 ) { +error_report ("Could not load ROM image '%s'" , bios_name); +exit (1 ); + } + } + +return pflash_blk0 || bios_name; +} +static FWCfgState *create_fw_cfg (const VirtMachineState *vms,AddressSpace *as) {hwaddr base = vms->memmap[VIRT_FW_CFG ].base;
@@ -1421,7 +1467,7 @@ static void machvirt_init(MachineState *machine)MemoryRegion *secure_sysmem =NULL ;int n, virt_max_cpus;MemoryRegion *ram =g_new (MemoryRegion,1 ); -bool firmware_loaded = bios_name ||drive_get (IF_PFLASH ,0 ,0 ); +bool firmware_loaded;bool aarch64 = true;/*
@@ -1460,6 +1506,27 @@ static void machvirt_init(MachineState *machine)exit (1 ); } +if (vms->secure) { +if (kvm_enabled ()) { +error_report ("mach-virt: KVM does not support Security extensions" ); +exit (1 ); + } + +/* +* The Secure view of the world is the same as the NonSecure, +* but with a few extra devices. Create it as a container region +* containing the system memory at low priority; any secure-only +* devices go in at higher priority and take precedence. +*/ + secure_sysmem =g_new (MemoryRegion,1 ); +memory_region_init (secure_sysmem,OBJECT (machine),"secure-memory" , +UINT64_MAX ); +memory_region_add_subregion_overlap (secure_sysmem,0 , sysmem,-1 ); + } + + firmware_loaded =virt_firmware_init (vms, sysmem, + secure_sysmem ?: sysmem); +/* If we have an EL3 boot ROM then the assumption is that it will * implement PSCI itself, so disable QEMU's internal implementation * so it doesn't get in the way. Instead of starting secondary
@@ -1505,23 +1572,6 @@ static void machvirt_init(MachineState *machine)exit (1 ); } -if (vms->secure) { -if (kvm_enabled ()) { -error_report ("mach-virt: KVM does not support Security extensions" ); -exit (1 ); - } - -/* The Secure view of the world is the same as the NonSecure, -* but with a few extra devices. Create it as a container region -* containing the system memory at low priority; any secure-only -* devices go in at higher priority and take precedence. -*/ - secure_sysmem =g_new (MemoryRegion,1 ); -memory_region_init (secure_sysmem,OBJECT (machine),"secure-memory" , -UINT64_MAX ); -memory_region_add_subregion_overlap (secure_sysmem,0 , sysmem,-1 ); - } -create_fdt (vms); possible_cpus = mc->possible_cpu_arch_ids (machine);
@@ -1610,7 +1660,7 @@ static void machvirt_init(MachineState *machine) &machine->device_memory->mr); } -create_flash (vms, sysmem, secure_sysmem ? secure_sysmem : sysmem); +virt_flash_fdt (vms, sysmem, secure_sysmem);create_gic (vms, pic);
@@ -1956,6 +2006,8 @@ static void virt_instance_init(Object *obj) NULL); vms->irqmap = a15irqmap; + +virt_flash_create (vms); }static const TypeInfo virt_machine_info = {
include/hw/arm/virt.h +2 -0
@@ -35,6 +35,7 @@#include "qemu/notify.h" #include "hw/boards.h" #include "hw/arm/arm.h" +#include "hw/block/flash.h" #include "sysemu/kvm.h" #include "hw/intc/arm_gicv3_common.h"
@@ -113,6 +114,7 @@ typedef struct {Notifier machine_done;DeviceState *platform_bus_dev;FWCfgState *fw_cfg; +PFlashCFI01 *flash[2 ];bool secure;bool highmem;bool highmem_ecam;
Signature · 1 line
2.17.2
Quoted 28 lines · Markus Armbruster
The ARM virt machines put firmware in flash memory. To configure it, you use -drive if=pflash,unit=0,... and optionally -drive if=pflash,unit=1,...
Why two -drive? This permits setting up one part of the flash memory read-only, and the other part read/write. It also makes upgrading firmware on the host easier. Below the hood, we get two separate flash devices, because we were too lazy to improve our flash device models to support sector protection.
The problem at hand is to do the same with -blockdev somehow, as one more step towards deprecating -drive.
We recently solved this problem for x86 PC machines, in commit
ebc29e1beab. See the commit message for design rationale.This commit solves it for ARM virt basically the same way: new machine properties pflash0, pflash1 forward to the onboard flash devices' properties. Requires creating the onboard devices in the .instance_init() method
virt_instance_init(). The existing code to pick up drives defined with -drive if=pflash is replaced by code to desugar into the machine properties.There are a few behavioral differences, though:
* The flash devices are always present (x86: only present if configured)
Quoted 8 lines
* Flash base addresses and sizes are fixed (x86: sizes depend on images, mapped back to back below a fixed address)
* -bios configures contents of first pflash (x86: -bios configures ROM contents)
* -bios is rejected when first pflash is also configured with -machine pflash0=... (x86: bios is silently ignored then)
Can we start deprecating the -bios command line option?
Maybe on a per-architecture basis first.
Quoted 317 lines
* -machine pflash1=... does not require -machine pflash0=... (x86: it does).
The actual code is a bit simpler than for x86 mostly due to the first two differences.
Signed-off-by Markus Armbruster <[email protected]>--- hw/arm/virt.c | 192 +++++++++++++++++++++++++++--------------- include/hw/arm/virt.h | 2 + 2 files changed, 124 insertions(+), 70 deletions(-)hw/arm/virt.c +122
-70@@ -30,6 +30,7 @@#include "qemu/osdep.h" #include "qemu/units.h" +#include "qemu/option.h" #include "qapi/error.h" #include "hw/sysbus.h" #include "hw/arm/arm.h" @@ -871,25 +872,19 @@ static void create_virtio_devices(const VirtMachineState *vms, qemu_irq *pic) } } -static void create_one_flash (const char *name,hwaddr flashbase, -hwaddr flashsize,const char *file, -MemoryRegion *sysmem) +#define VIRT_FLASH_SECTOR_SIZE (256 * KiB) + +static PFlashCFI01 *virt_pflash_create1 (VirtMachineState *vms, +const char *name, +const char *alias_prop_name) { -/* Create and map a single flash device. We use the same -* parameters as the flash devices on the Versatile Express board. +/* +* Create a single flash device. We use the same parameters as +* the flash devices on the Versatile Express board. */ -DriveInfo *dinfo =drive_get_next (IF_PFLASH );DeviceState *dev =qdev_create (NULL ,TYPE_PFLASH_CFI01 ); -SysBusDevice *sbd =SYS_BUS_DEVICE (dev); -const uint64_t sectorlength =256 *1024 ; -if (dinfo) { -qdev_prop_set_drive (dev,"drive" ,blk_by_legacy_dinfo (dinfo), - &error_abort); - } - -qdev_prop_set_uint32 (dev,"num-blocks" , flashsize / sectorlength); -qdev_prop_set_uint64 (dev,"sector-length" , sectorlength); +qdev_prop_set_uint64 (dev,"sector-length" ,VIRT_FLASH_SECTOR_SIZE );qdev_prop_set_uint8 (dev,"width" ,4 );qdev_prop_set_uint8 (dev,"device-width" ,2 );qdev_prop_set_bit (dev,"big-endian" , false);@@ -898,41 +893,41 @@ static void create_one_flash(const char *name, hwaddr flashbase,qdev_prop_set_uint16 (dev,"id2" ,0x00 );qdev_prop_set_uint16 (dev,"id3" ,0x00 );qdev_prop_set_string (dev,"name" , name); +object_property_add_child (OBJECT (vms), name,OBJECT (dev), + &error_abort); +object_property_add_alias (OBJECT (vms), alias_prop_name, +OBJECT (dev),"drive" , &error_abort); +return PFLASH_CFI01 (dev); +} + +static void virt_flash_create (VirtMachineState *vms) +{ + vms->flash[0 ] =virt_pflash_create1 (vms,"virt.flash0" ,"pflash0" ); + vms->flash[1 ] =virt_pflash_create1 (vms,"virt.flash1" ,"pflash1" ); +} + +static void virt_flash_map1 (PFlashCFI01 *flash, +hwaddr base,hwaddr size, +MemoryRegion *sysmem) +{ +DeviceState *dev =DEVICE (flash); + +assert (size %VIRT_FLASH_SECTOR_SIZE ==0 ); +assert (size /VIRT_FLASH_SECTOR_SIZE <=UINT32_MAX ); +qdev_prop_set_uint32 (dev,"num-blocks" , size /VIRT_FLASH_SECTOR_SIZE );qdev_init_nofail (dev); -memory_region_add_subregion (sysmem, flashbase, -sysbus_mmio_get_region (SYS_BUS_DEVICE (dev),0 )); - -if (file) { -char *fn; -int image_size; - -if (drive_get (IF_PFLASH ,0 ,0 )) { -error_report ("The contents of the first flash device may be " -"specified with -bios or with -drive if=pflash... " -"but you cannot use both options at once" ); -exit (1 ); - } - fn =qemu_find_file (QEMU_FILE_TYPE_BIOS , file); -if (!fn) { -error_report ("Could not find ROM image '%s'" , file); -exit (1 ); - } - image_size =load_image_mr (fn,sysbus_mmio_get_region (sbd,0 )); -g_free (fn); -if (image_size <0 ) { -error_report ("Could not load ROM image '%s'" , file); -exit (1 ); - } - } +memory_region_add_subregion (sysmem, base, +sysbus_mmio_get_region (SYS_BUS_DEVICE (dev), +0 )); } -static void create_flash (const VirtMachineState *vms, -MemoryRegion *sysmem, -MemoryRegion *secure_sysmem) +static void virt_flash_map (VirtMachineState *vms, +MemoryRegion *sysmem, +MemoryRegion *secure_sysmem) { -/* Create two flash devices to fill the VIRT_FLASH space in the memmap. -* Any file passed via -bios goes in the first of these. +/* +* Map two flash devices to fill the VIRT_FLASH space in the memmap. * sysmem is the system memory space. secure_sysmem is the secure view * of the system, and the first flash device should be made visible only * there. The second flash device is visible to both secure and nonsecure. @@ -941,13 +936,21 @@ static void create_flash(const VirtMachineState *vms,*/ hwaddr flashsize = vms->memmap[VIRT_FLASH ].size /2 ;hwaddr flashbase = vms->memmap[VIRT_FLASH ].base; + +virt_flash_map1 (vms->flash[0 ], flashbase, flashsize, + secure_sysmem); +virt_flash_map1 (vms->flash[1 ], flashbase + flashsize, flashsize, + sysmem); +} + +static void virt_flash_fdt (VirtMachineState *vms, +MemoryRegion *sysmem, +MemoryRegion *secure_sysmem) +{ +hwaddr flashsize = vms->memmap[VIRT_FLASH ].size /2 ; +hwaddr flashbase = vms->memmap[VIRT_FLASH ].base;char *nodename; -create_one_flash ("virt.flash0" , flashbase, flashsize, - bios_name, secure_sysmem); -create_one_flash ("virt.flash1" , flashbase + flashsize, flashsize, -NULL , sysmem); -if (sysmem == secure_sysmem) {/* Report both flash devices as a single node in the DT */ nodename =g_strdup_printf ("/flash@%" PRIx64, flashbase);@@ -959,7 +962,8 @@ static void create_flash(const VirtMachineState *vms,qemu_fdt_setprop_cell (vms->fdt, nodename,"bank-width" ,4 );g_free (nodename); }else { -/* Report the devices as separate nodes so we can mark one as +/* +* Report the devices as separate nodes so we can mark one as * only visible to the secure world. */ nodename =g_strdup_printf ("/secflash@%" PRIx64, flashbase);@@ -982,6 +986,48 @@ static void create_flash(const VirtMachineState *vms, } } +static bool virt_firmware_init (VirtMachineState *vms, +MemoryRegion *sysmem, +MemoryRegion *secure_sysmem) +{ +BlockBackend *pflash_blk0; + +pflash_cfi01_legacy_drive (vms->flash,ARRAY_SIZE (vms->flash)); +virt_flash_map (vms, sysmem, secure_sysmem); + + pflash_blk0 =pflash_cfi01_get_blk (vms->flash[0 ]); + +if (bios_name) { +char *fname; +MemoryRegion *mr; +int image_size; + +if (pflash_blk0) { +error_report ("The contents of the first flash device may be " +"specified with -bios or with -drive if=pflash... " +"but you cannot use both options at once" ); +exit (1 ); + } + +/* Fall back to -bios */ + + fname =qemu_find_file (QEMU_FILE_TYPE_BIOS , bios_name); +if (!fname) { +error_report ("Could not find ROM image '%s'" , bios_name); +exit (1 ); + } + mr =sysbus_mmio_get_region (SYS_BUS_DEVICE (vms->flash[0 ]),0 ); + image_size =load_image_mr (fname, mr); +g_free (fname); +if (image_size <0 ) { +error_report ("Could not load ROM image '%s'" , bios_name); +exit (1 ); + } + } + +return pflash_blk0 || bios_name; +} +static FWCfgState *create_fw_cfg (const VirtMachineState *vms,AddressSpace *as) {hwaddr base = vms->memmap[VIRT_FW_CFG ].base;@@ -1421,7 +1467,7 @@ static void machvirt_init(MachineState *machine)MemoryRegion *secure_sysmem =NULL ;int n, virt_max_cpus;MemoryRegion *ram =g_new (MemoryRegion,1 ); -bool firmware_loaded = bios_name ||drive_get (IF_PFLASH ,0 ,0 ); +bool firmware_loaded;bool aarch64 = true;/* @@ -1460,6 +1506,27 @@ static void machvirt_init(MachineState *machine)exit (1 ); } +if (vms->secure) { +if (kvm_enabled ()) { +error_report ("mach-virt: KVM does not support Security extensions" ); +exit (1 ); + } + +/* +* The Secure view of the world is the same as the NonSecure, +* but with a few extra devices. Create it as a container region +* containing the system memory at low priority; any secure-only +* devices go in at higher priority and take precedence. +*/ + secure_sysmem =g_new (MemoryRegion,1 ); +memory_region_init (secure_sysmem,OBJECT (machine),"secure-memory" , +UINT64_MAX ); +memory_region_add_subregion_overlap (secure_sysmem,0 , sysmem,-1 ); + } + + firmware_loaded =virt_firmware_init (vms, sysmem, + secure_sysmem ?: sysmem); +/* If we have an EL3 boot ROM then the assumption is that it will * implement PSCI itself, so disable QEMU's internal implementation * so it doesn't get in the way. Instead of starting secondary @@ -1505,23 +1572,6 @@ static void machvirt_init(MachineState *machine)exit (1 ); } -if (vms->secure) { -if (kvm_enabled ()) { -error_report ("mach-virt: KVM does not support Security extensions" ); -exit (1 ); - } - -/* The Secure view of the world is the same as the NonSecure, -* but with a few extra devices. Create it as a container region -* containing the system memory at low priority; any secure-only -* devices go in at higher priority and take precedence. -*/ - secure_sysmem =g_new (MemoryRegion,1 ); -memory_region_init (secure_sysmem,OBJECT (machine),"secure-memory" , -UINT64_MAX ); -memory_region_add_subregion_overlap (secure_sysmem,0 , sysmem,-1 ); - } -create_fdt (vms); possible_cpus = mc->possible_cpu_arch_ids (machine);@@ -1610,7 +1660,7 @@ static void machvirt_init(MachineState *machine) &machine->device_memory->mr); } -create_flash (vms, sysmem, secure_sysmem ? secure_sysmem : sysmem); +virt_flash_fdt (vms, sysmem, secure_sysmem);create_gic (vms, pic);@@ -1956,6 +2006,8 @@ static void virt_instance_init(Object *obj) NULL); vms->irqmap = a15irqmap; + +virt_flash_create (vms); }static const TypeInfo virt_machine_info = {include/hw/arm/virt.h +2
-0@@ -35,6 +35,7 @@#include "qemu/notify.h" #include "hw/boards.h" #include "hw/arm/arm.h" +#include "hw/block/flash.h" #include "sysemu/kvm.h" #include "hw/intc/arm_gicv3_common.h" @@ -113,6 +114,7 @@ typedef struct {Notifier machine_done;DeviceState *platform_bus_dev;FWCfgState *fw_cfg; +PFlashCFI01 *flash[2 ];bool secure;bool highmem;bool highmem_ecam;
Quoted 35 lines · Philippe Mathieu-Daudé
Quoted 34 lines · Markus Armbruster
The ARM virt machines put firmware in flash memory. To configure it, you use -drive if=pflash,unit=0,... and optionally -drive if=pflash,unit=1,...
Why two -drive? This permits setting up one part of the flash memory read-only, and the other part read/write. It also makes upgrading firmware on the host easier. Below the hood, we get two separate flash devices, because we were too lazy to improve our flash device models to support sector protection.
The problem at hand is to do the same with -blockdev somehow, as one more step towards deprecating -drive.
We recently solved this problem for x86 PC machines, in commit
ebc29e1beab. See the commit message for design rationale.This commit solves it for ARM virt basically the same way: new machine properties pflash0, pflash1 forward to the onboard flash devices' properties. Requires creating the onboard devices in the .instance_init() method
virt_instance_init(). The existing code to pick up drives defined with -drive if=pflash is replaced by code to desugar into the machine properties.There are a few behavioral differences, though:
* The flash devices are always present (x86: only present if configured)
* Flash base addresses and sizes are fixed (x86: sizes depend on images, mapped back to back below a fixed address)
* -bios configures contents of first pflash (x86: -bios configures ROM contents)
Quoted 6 lines
Quoted 2 lines
* -bios is rejected when first pflash is also configured with -machine pflash0=... (x86: bios is silently ignored then)
Can we start deprecating the -bios command line option?
Maybe on a per-architecture basis first.
I have no idea.
Perhaps we want to keep it as syntactic sugar for convenience. Right now it's something else: an ugly special case.
Of course, the name -bios is a bit PC-centric. And even there it makes less sense than it used to.
[...]
Quoted 40 lines · Markus Armbruster
The ARM virt machines put firmware in flash memory. To configure it, you use -drive if=pflash,unit=0,... and optionally -drive if=pflash,unit=1,...
Why two -drive? This permits setting up one part of the flash memory read-only, and the other part read/write. It also makes upgrading firmware on the host easier. Below the hood, we get two separate flash devices, because we were too lazy to improve our flash device models to support sector protection.
The problem at hand is to do the same with -blockdev somehow, as one more step towards deprecating -drive.
We recently solved this problem for x86 PC machines, in commit
ebc29e1beab. See the commit message for design rationale.This commit solves it for ARM virt basically the same way: new machine properties pflash0, pflash1 forward to the onboard flash devices' properties. Requires creating the onboard devices in the .instance_init() method
virt_instance_init(). The existing code to pick up drives defined with -drive if=pflash is replaced by code to desugar into the machine properties.There are a few behavioral differences, though:
* The flash devices are always present (x86: only present if configured)
* Flash base addresses and sizes are fixed (x86: sizes depend on images, mapped back to back below a fixed address)
* -bios configures contents of first pflash (x86: -bios configures ROM contents)
* -bios is rejected when first pflash is also configured with -machine pflash0=... (x86: bios is silently ignored then)
* -machine pflash1=... does not require -machine pflash0=... (x86: it does).
Quoted 8 lines
The actual code is a bit simpler than for x86 mostly due to the first two differences.
Signed-off-by Markus Armbruster <[email protected]>--- hw/arm/virt.c | 192 +++++++++++++++++++++++++++--------------- include/hw/arm/virt.h | 2 + 2 files changed, 124 insertions(+), 70 deletions(-)
I tried to review this patch, but I can't follow it.
I'm not saying it's wrong; in fact it *looks* right to me, but I can't follow it. It does so many things at once that I can't keep them all in mind.
I started with:
virt_instance_init()
virt_flash_create()
virt_pflash_create1()
and then I got confused by the object_property_add_*() calls, which don't exist in the original code:
Quoted 48 lines
hw/arm/virt.c +10
-15@@ -30,6 +30,7 @@#include "qemu/osdep.h" #include "qemu/units.h" +#include "qemu/option.h" #include "qapi/error.h" #include "hw/sysbus.h" #include "hw/arm/arm.h" @@ -871,25 +872,19 @@ static void create_virtio_devices(const VirtMachineState *vms, qemu_irq *pic) } } -static void create_one_flash (const char *name,hwaddr flashbase, -hwaddr flashsize,const char *file, -MemoryRegion *sysmem) +#define VIRT_FLASH_SECTOR_SIZE (256 * KiB) + +static PFlashCFI01 *virt_pflash_create1 (VirtMachineState *vms, +const char *name, +const char *alias_prop_name) { -/* Create and map a single flash device. We use the same -* parameters as the flash devices on the Versatile Express board. +/* +* Create a single flash device. We use the same parameters as +* the flash devices on the Versatile Express board. */ -DriveInfo *dinfo =drive_get_next (IF_PFLASH );DeviceState *dev =qdev_create (NULL ,TYPE_PFLASH_CFI01 ); -SysBusDevice *sbd =SYS_BUS_DEVICE (dev); -const uint64_t sectorlength =256 *1024 ; -if (dinfo) { -qdev_prop_set_drive (dev,"drive" ,blk_by_legacy_dinfo (dinfo), - &error_abort); - } - -qdev_prop_set_uint32 (dev,"num-blocks" , flashsize / sectorlength); -qdev_prop_set_uint64 (dev,"sector-length" , sectorlength); +qdev_prop_set_uint64 (dev,"sector-length" ,VIRT_FLASH_SECTOR_SIZE );qdev_prop_set_uint8 (dev,"width" ,4 );qdev_prop_set_uint8 (dev,"device-width" ,2 );qdev_prop_set_bit (dev,"big-endian" , false);
hw/arm/virt.c static void create_one_flash(const char *name, hwaddr flashbase, · line 897
Quoted 5 lines
hw/arm/virt.c +2
-0@@ -898,41 +893,41 @@ static void create_one_flash(const char *name, hwaddr flashbase,qdev_prop_set_uint16 (dev,"id2" ,0x00 );qdev_prop_set_uint16 (dev,"id3" ,0x00 );qdev_prop_set_string (dev,"name" , name); +object_property_add_child (OBJECT (vms), name,OBJECT (dev), + &error_abort);
I guess this links the pflash device as a child under the VirtMachineState object -- but why wasn't that necessary before?
hw/arm/virt.c static void create_one_flash(const char *name, hwaddr flashbase, · line 899
Quoted 2 lines
hw/arm/virt.c +2
-0+object_property_add_alias (OBJECT (vms), alias_prop_name, +OBJECT (dev),"drive" , &error_abort);
What is this good for? Does this make the pflash0 / pflash1 properties of the machine refer to the "drive" property of the pflash device?
Can we have a comment about that, or is that obvious for people that are used to QOM code?
... So anyway, this is where I come to an almost complete halt. I understand one more bit (in isolation only):
Quoted 177 lines
hw/arm/virt.c +98
-37+return PFLASH_CFI01 (dev); +} + +static void virt_flash_create (VirtMachineState *vms) +{ + vms->flash[0 ] =virt_pflash_create1 (vms,"virt.flash0" ,"pflash0" ); + vms->flash[1 ] =virt_pflash_create1 (vms,"virt.flash1" ,"pflash1" ); +} + +static void virt_flash_map1 (PFlashCFI01 *flash, +hwaddr base,hwaddr size, +MemoryRegion *sysmem) +{ +DeviceState *dev =DEVICE (flash); + +assert (size %VIRT_FLASH_SECTOR_SIZE ==0 ); +assert (size /VIRT_FLASH_SECTOR_SIZE <=UINT32_MAX ); +qdev_prop_set_uint32 (dev,"num-blocks" , size /VIRT_FLASH_SECTOR_SIZE );qdev_init_nofail (dev); -memory_region_add_subregion (sysmem, flashbase, -sysbus_mmio_get_region (SYS_BUS_DEVICE (dev),0 )); - -if (file) { -char *fn; -int image_size; - -if (drive_get (IF_PFLASH ,0 ,0 )) { -error_report ("The contents of the first flash device may be " -"specified with -bios or with -drive if=pflash... " -"but you cannot use both options at once" ); -exit (1 ); - } - fn =qemu_find_file (QEMU_FILE_TYPE_BIOS , file); -if (!fn) { -error_report ("Could not find ROM image '%s'" , file); -exit (1 ); - } - image_size =load_image_mr (fn,sysbus_mmio_get_region (sbd,0 )); -g_free (fn); -if (image_size <0 ) { -error_report ("Could not load ROM image '%s'" , file); -exit (1 ); - } - } +memory_region_add_subregion (sysmem, base, +sysbus_mmio_get_region (SYS_BUS_DEVICE (dev), +0 )); } -static void create_flash (const VirtMachineState *vms, -MemoryRegion *sysmem, -MemoryRegion *secure_sysmem) +static void virt_flash_map (VirtMachineState *vms, +MemoryRegion *sysmem, +MemoryRegion *secure_sysmem) { -/* Create two flash devices to fill the VIRT_FLASH space in the memmap. -* Any file passed via -bios goes in the first of these. +/* +* Map two flash devices to fill the VIRT_FLASH space in the memmap. * sysmem is the system memory space. secure_sysmem is the secure view * of the system, and the first flash device should be made visible only * there. The second flash device is visible to both secure and nonsecure. @@ -941,13 +936,21 @@ static void create_flash(const VirtMachineState *vms,*/ hwaddr flashsize = vms->memmap[VIRT_FLASH ].size /2 ;hwaddr flashbase = vms->memmap[VIRT_FLASH ].base; + +virt_flash_map1 (vms->flash[0 ], flashbase, flashsize, + secure_sysmem); +virt_flash_map1 (vms->flash[1 ], flashbase + flashsize, flashsize, + sysmem); +} + +static void virt_flash_fdt (VirtMachineState *vms, +MemoryRegion *sysmem, +MemoryRegion *secure_sysmem) +{ +hwaddr flashsize = vms->memmap[VIRT_FLASH ].size /2 ; +hwaddr flashbase = vms->memmap[VIRT_FLASH ].base;char *nodename; -create_one_flash ("virt.flash0" , flashbase, flashsize, - bios_name, secure_sysmem); -create_one_flash ("virt.flash1" , flashbase + flashsize, flashsize, -NULL , sysmem); -if (sysmem == secure_sysmem) {/* Report both flash devices as a single node in the DT */ nodename =g_strdup_printf ("/flash@%" PRIx64, flashbase);@@ -959,7 +962,8 @@ static void create_flash(const VirtMachineState *vms,qemu_fdt_setprop_cell (vms->fdt, nodename,"bank-width" ,4 );g_free (nodename); }else { -/* Report the devices as separate nodes so we can mark one as +/* +* Report the devices as separate nodes so we can mark one as * only visible to the secure world. */ nodename =g_strdup_printf ("/secflash@%" PRIx64, flashbase);@@ -982,6 +986,48 @@ static void create_flash(const VirtMachineState *vms, } } +static bool virt_firmware_init (VirtMachineState *vms, +MemoryRegion *sysmem, +MemoryRegion *secure_sysmem) +{ +BlockBackend *pflash_blk0; + +pflash_cfi01_legacy_drive (vms->flash,ARRAY_SIZE (vms->flash)); +virt_flash_map (vms, sysmem, secure_sysmem); + + pflash_blk0 =pflash_cfi01_get_blk (vms->flash[0 ]); + +if (bios_name) { +char *fname; +MemoryRegion *mr; +int image_size; + +if (pflash_blk0) { +error_report ("The contents of the first flash device may be " +"specified with -bios or with -drive if=pflash... " +"but you cannot use both options at once" ); +exit (1 ); + } + +/* Fall back to -bios */ + + fname =qemu_find_file (QEMU_FILE_TYPE_BIOS , bios_name); +if (!fname) { +error_report ("Could not find ROM image '%s'" , bios_name); +exit (1 ); + } + mr =sysbus_mmio_get_region (SYS_BUS_DEVICE (vms->flash[0 ]),0 ); + image_size =load_image_mr (fname, mr); +g_free (fname); +if (image_size <0 ) { +error_report ("Could not load ROM image '%s'" , bios_name); +exit (1 ); + } + } + +return pflash_blk0 || bios_name; +} +static FWCfgState *create_fw_cfg (const VirtMachineState *vms,AddressSpace *as) {hwaddr base = vms->memmap[VIRT_FW_CFG ].base;@@ -1421,7 +1467,7 @@ static void machvirt_init(MachineState *machine)MemoryRegion *secure_sysmem =NULL ;int n, virt_max_cpus;MemoryRegion *ram =g_new (MemoryRegion,1 ); -bool firmware_loaded = bios_name ||drive_get (IF_PFLASH ,0 ,0 ); +bool firmware_loaded;bool aarch64 = true;/* @@ -1460,6 +1506,27 @@ static void machvirt_init(MachineState *machine)exit (1 ); } +if (vms->secure) { +if (kvm_enabled ()) { +error_report ("mach-virt: KVM does not support Security extensions" ); +exit (1 ); + } + +/* +* The Secure view of the world is the same as the NonSecure, +* but with a few extra devices. Create it as a container region +* containing the system memory at low priority; any secure-only +* devices go in at higher priority and take precedence. +*/ + secure_sysmem =g_new (MemoryRegion,1 ); + memory_region_init(secure_sysmem, OBJECT(machine), "secure-memory",
hw/arm/virt.c static void machvirt_init(MachineState *machine) · line 1532
Quoted 10 lines
hw/arm/virt.c +7
-0+ UINT64_MAX); +memory_region_add_subregion_overlap (secure_sysmem,0 , sysmem,-1 ); + } + + firmware_loaded =virt_firmware_init (vms, sysmem, + secure_sysmem ?: sysmem); +/* If we have an EL3 boot ROM then the assumption is that it will * implement PSCI itself, so disable QEMU's internal implementation * so it doesn't get in the way. Instead of starting secondary
Namely, at this point, I seem to understand that we have to hoist this "vms->secure" block here, because:
- below (not seen in the context), we have a condition on "firmware_loaded",
- "firmware_loaded" *now* depends on "secure_sysmem" (it used not to, before)
- and "secure_sysmem" depends on the "vms->secure" block that we're moving up here.
And that's where I grind to a halt, because I don't understand what the old functions are responsible for exactly, and how the responsibilities are now re-distributed, between the new functions.
I tried to look at this patch with full function context, and I also tried to look at the full file (pre vs. post) through a colorized side-by-side diff. To no use.
Now, I'm not saying this is a fault with the patch. It's entirely possible that the goal can only be achieved with such a "rewrite". I think it plausible that the patch cannot be done in multiple smaller patches, especially if we consider bisectability a requirement. (Maybe splitting the patch to smaller logical steps would be possible if we accepted halfway constructed and/or orphan objects, mid-series, that build and cause no issues at runtime. I don't know.)
So it's *my* fault -- it's like the code is sliced into small bits and then reshuffled to a new story, and I can't follow the bits' dance.
Can you add two high-level call trees, side-by-side, to the commit message, not just with function names but also with responsibilities?
I guess I won't ask for arrows from the left to the right :) I'll try to draw them myself.
To re-state: I'm not complaining about the patch, just saying that I've failed to understand it. I don't insist on understanding it (I'm fine if others understand it and approve it), but if I'm expected to ACK, I'll need more explanation. A lot more. :) Preferably captured within the series.
Thanks (and I apologize)
Laszlo
Quoted 63 lines
hw/arm/virt.c +3
-18@@ -1505,23 +1572,6 @@ static void machvirt_init(MachineState *machine)exit (1 ); } -if (vms->secure) { -if (kvm_enabled ()) { -error_report ("mach-virt: KVM does not support Security extensions" ); -exit (1 ); - } - -/* The Secure view of the world is the same as the NonSecure, -* but with a few extra devices. Create it as a container region -* containing the system memory at low priority; any secure-only -* devices go in at higher priority and take precedence. -*/ - secure_sysmem =g_new (MemoryRegion,1 ); -memory_region_init (secure_sysmem,OBJECT (machine),"secure-memory" , -UINT64_MAX ); -memory_region_add_subregion_overlap (secure_sysmem,0 , sysmem,-1 ); - } -create_fdt (vms); possible_cpus = mc->possible_cpu_arch_ids (machine);@@ -1610,7 +1660,7 @@ static void machvirt_init(MachineState *machine) &machine->device_memory->mr); } -create_flash (vms, sysmem, secure_sysmem ? secure_sysmem : sysmem); +virt_flash_fdt (vms, sysmem, secure_sysmem);create_gic (vms, pic);@@ -1956,6 +2006,8 @@ static void virt_instance_init(Object *obj) NULL); vms->irqmap = a15irqmap; + +virt_flash_create (vms); }static const TypeInfo virt_machine_info = {include/hw/arm/virt.h +2
-0@@ -35,6 +35,7 @@#include "qemu/notify.h" #include "hw/boards.h" #include "hw/arm/arm.h" +#include "hw/block/flash.h" #include "sysemu/kvm.h" #include "hw/intc/arm_gicv3_common.h" @@ -113,6 +114,7 @@ typedef struct {Notifier machine_done;DeviceState *platform_bus_dev;FWCfgState *fw_cfg; +PFlashCFI01 *flash[2 ];bool secure;bool highmem;bool highmem_ecam;
Quoted 50 lines · Laszlo Ersek
Quoted 40 lines · Markus Armbruster
The ARM virt machines put firmware in flash memory. To configure it, you use -drive if=pflash,unit=0,... and optionally -drive if=pflash,unit=1,...
Why two -drive? This permits setting up one part of the flash memory read-only, and the other part read/write. It also makes upgrading firmware on the host easier. Below the hood, we get two separate flash devices, because we were too lazy to improve our flash device models to support sector protection.
The problem at hand is to do the same with -blockdev somehow, as one more step towards deprecating -drive.
We recently solved this problem for x86 PC machines, in commit
ebc29e1beab. See the commit message for design rationale.This commit solves it for ARM virt basically the same way: new machine properties pflash0, pflash1 forward to the onboard flash devices' properties. Requires creating the onboard devices in the .instance_init() method
virt_instance_init(). The existing code to pick up drives defined with -drive if=pflash is replaced by code to desugar into the machine properties.There are a few behavioral differences, though:
* The flash devices are always present (x86: only present if configured)
* Flash base addresses and sizes are fixed (x86: sizes depend on images, mapped back to back below a fixed address)
* -bios configures contents of first pflash (x86: -bios configures ROM contents)
* -bios is rejected when first pflash is also configured with -machine pflash0=... (x86: bios is silently ignored then)
* -machine pflash1=... does not require -machine pflash0=... (x86: it does).
Quoted 8 lines
The actual code is a bit simpler than for x86 mostly due to the first two differences.
Signed-off-by Markus Armbruster <[email protected]>--- hw/arm/virt.c | 192 +++++++++++++++++++++++++++--------------- include/hw/arm/virt.h | 2 + 2 files changed, 124 insertions(+), 70 deletions(-)
Quoted 5 lines
I tried to review this patch, but I can't follow it.
I'm not saying it's wrong; in fact it *looks* right to me, but I can't follow it. It does so many things at once that I can't keep them all in mind.
Happens. I'll try to explain, and then we can talk about improving the patch.
Did you follow "See the commit message [of ebc29e1beab] for design rationale" reference?
Quoted 57 lines
I started with:
virt_instance_init()
virt_flash_create()
virt_pflash_create1()and then I got confused by the object_property_add_*() calls, which don't exist in the original code:
Quoted 48 lines
hw/arm/virt.c +10
-15@@ -30,6 +30,7 @@#include "qemu/osdep.h" #include "qemu/units.h" +#include "qemu/option.h" #include "qapi/error.h" #include "hw/sysbus.h" #include "hw/arm/arm.h" @@ -871,25 +872,19 @@ static void create_virtio_devices(const VirtMachineState *vms, qemu_irq *pic) } } -static void create_one_flash (const char *name,hwaddr flashbase, -hwaddr flashsize,const char *file, -MemoryRegion *sysmem) +#define VIRT_FLASH_SECTOR_SIZE (256 * KiB) + +static PFlashCFI01 *virt_pflash_create1 (VirtMachineState *vms, +const char *name, +const char *alias_prop_name) { -/* Create and map a single flash device. We use the same -* parameters as the flash devices on the Versatile Express board. +/* +* Create a single flash device. We use the same parameters as +* the flash devices on the Versatile Express board. */ -DriveInfo *dinfo =drive_get_next (IF_PFLASH );DeviceState *dev =qdev_create (NULL ,TYPE_PFLASH_CFI01 ); -SysBusDevice *sbd =SYS_BUS_DEVICE (dev); -const uint64_t sectorlength =256 *1024 ; -if (dinfo) { -qdev_prop_set_drive (dev,"drive" ,blk_by_legacy_dinfo (dinfo), - &error_abort); - } - -qdev_prop_set_uint32 (dev,"num-blocks" , flashsize / sectorlength); -qdev_prop_set_uint64 (dev,"sector-length" , sectorlength); +qdev_prop_set_uint64 (dev,"sector-length" ,VIRT_FLASH_SECTOR_SIZE );qdev_prop_set_uint8 (dev,"width" ,4 );qdev_prop_set_uint8 (dev,"device-width" ,2 );qdev_prop_set_bit (dev,"big-endian" , false);@@ -898,41 +893,41 @@ static void create_one_flash(const char *name, hwaddr flashbase,
Quoted 8 lines
hw/arm/virt.c static void create_one_flash(const char *name, hwaddr flashbase, · line 897
Quoted 5 lines
hw/arm/virt.c +2
-0qdev_prop_set_uint16 (dev,"id2" ,0x00 );qdev_prop_set_uint16 (dev,"id3" ,0x00 );qdev_prop_set_string (dev,"name" , name); +object_property_add_child (OBJECT (vms), name,OBJECT (dev), + &error_abort);I guess this links the pflash device as a child under the VirtMachineState object
Yes.
Quoted 1 line
-- but why wasn't that necessary before?
For better or worse, a qdev device without a parent gets adopted on realize by container object "/machine/unattached". See device_set_realized() under if (!obj->parent).
Example to illustrate, feel free to skip ahead to "End of example".
Here's the contents of "/machine/unattached" for a pretty minimal ARM virt machine (I use scripts/qmp/qom-fuse to mount the QOM tree to qom-fuse/ for easy examination):
$ ls qom-fuse/machine/unattached/
'device[0]' 'device[19]' 'device[28]' 'device[37]' 'device[7]'
'device[10]' 'device[1]' 'device[29]' 'device[38]' 'device[8]'
'device[11]' 'device[20]' 'device[2]' 'device[39]' 'device[9]'
'device[12]' 'device[21]' 'device[30]' 'device[3]' 'io[0]'
'device[13]' 'device[22]' 'device[31]' 'device[40]' 'mach-virt.ram[0]'
'device[14]' 'device[23]' 'device[32]' 'device[41]' 'platform bus[0]'
'device[15]' 'device[24]' 'device[33]' 'device[42]' sysbus
'device[16]' 'device[25]' 'device[34]' 'device[4]' 'system[0]'
'device[17]' 'device[26]' 'device[35]' 'device[5]' type
'device[18]' 'device[27]' 'device[36]' 'device[6]'The device* are the adopted qdevs. Let's look for pflash:
$ grep -a cfi qom-fuse/machine/unattached/device*/type
qom-fuse/machine/unattached/device[1]/type:cfi.pflash01
qom-fuse/machine/unattached/device[2]/type:cfi.pflash01Here are the children of /machine:
$ ls qom-fuse/machine/
accel fw_cfg kernel secure
append gic-version kernel-irqchip suppress-vmdesc
dt-compatible graphics kvm-shadow-mem type
dtb highmem mem-merge unattached
dump-guest-core igd-passthru memory-encryption usb
dumpdtb initrd peripheral virtualization
enforce-config-section iommu peripheral-anon
firmware its phandle-startThis was before this patch. Afterwards:
$ ls qom-fuse/machine/unattached/
'device[0]' 'device[19]' 'device[28]' 'device[37]' 'device[9]'
'device[10]' 'device[1]' 'device[29]' 'device[38]' 'io[0]'
'device[11]' 'device[20]' 'device[2]' 'device[39]' 'mach-virt.ram[0]'
'device[12]' 'device[21]' 'device[30]' 'device[3]' 'platform bus[0]'
'device[13]' 'device[22]' 'device[31]' 'device[40]' sysbus
'device[14]' 'device[23]' 'device[32]' 'device[4]' 'system[0]'
'device[15]' 'device[24]' 'device[33]' 'device[5]' type
'device[16]' 'device[25]' 'device[34]' 'device[6]'
'device[17]' 'device[26]' 'device[35]' 'device[7]'
'device[18]' 'device[27]' 'device[36]' 'device[8]'Two fewer device*.
$ ls qom-fuse/machine/
accel gic-version kvm-shadow-mem suppress-vmdesc
append graphics mem-merge type
dt-compatible highmem memory-encryption unattached
dtb igd-passthru peripheral usb
dump-guest-core initrd peripheral-anon virt.flash0
dumpdtb iommu pflash0 virt.flash1
enforce-config-section its pflash1 virtualization
firmware kernel phandle-start
fw_cfg kernel-irqchip secureNote new virt.flash0 and virt.flash1.
$ cat qom-fuse/machine/virt.flash*/type
cfi.pflash01
cfi.pflash01That's where the two went.
End of example.
Now I'm actually read to answer your question "why wasn't that necessary before?", or rather "why is it necessary now?"
It wasn't necessary before because orphans get adopted.
It might not even be necessary now, but I feel (strongly!) that an alias property should redirect to a child's property, not some random unrelated object's property (see right below).
Regardless, I feel onboard devices should be proper children of the machine anyway, not stuffed into its unattached/ grabbag.
Quoted 5 lines
hw/arm/virt.c static void create_one_flash(const char *name, hwaddr flashbase, · line 899
Quoted 2 lines
hw/arm/virt.c +2
-0+object_property_add_alias (OBJECT (vms), alias_prop_name, +OBJECT (dev),"drive" , &error_abort);What is this good for? Does this make the pflash0 / pflash1 properties of the machine refer to the "drive" property of the pflash device?
Correct!
With object.h and a crystal ball, you should be able to work that out for yourself:
/**
* object_property_add_alias:
* @obj: the object to add a property to
* @name: the name of the property
* @target_obj: the object to forward property access to
* @target_name: the name of the property on the forwarded object
* @errp: if an error occurs, a pointer to an area to store the error *
* Add an alias for a property on an object. This function will add a property
* of the same type as the forwarded property.
*
* The caller must ensure that <code>@target_obj</code> stays alive as long as
* this property exists. In the case of a child object or an alias on the same
* object this will be the case. For aliases to other objects the caller is
* responsible for taking a reference.
*/
Oh, no crystal ball? Then it's spelunking through object.c, I guess.
Quoted 2 lines
Can we have a comment about that, or is that obvious for people that are used to QOM code?
If there are any, please speak up, so we can appoint you QOM maintainer.
In my (weak) defense, I mentioned the property forwarding in my commit message ("new machine properties pflash0, pflash1 forward to the onboard flash devices' properties"), and I did point to commit ebc29e1beab for design rationale. It has this paragraph:
More seriously, the properties do not belong to the machine, they belong to the onboard flash devices. Adding them to the machine would then require bad magic to somehow transfer them to the flash devices. Fortunately, QOM provides the means to handle exactly this case: add alias properties to the machine that forward to the onboard devices' properties.
Quoted 194 lines
... So anyway, this is where I come to an almost complete halt. I understand one more bit (in isolation only):
Quoted 177 lines
hw/arm/virt.c +98
-37+return PFLASH_CFI01 (dev); +} + +static void virt_flash_create (VirtMachineState *vms) +{ + vms->flash[0 ] =virt_pflash_create1 (vms,"virt.flash0" ,"pflash0" ); + vms->flash[1 ] =virt_pflash_create1 (vms,"virt.flash1" ,"pflash1" ); +} + +static void virt_flash_map1 (PFlashCFI01 *flash, +hwaddr base,hwaddr size, +MemoryRegion *sysmem) +{ +DeviceState *dev =DEVICE (flash); + +assert (size %VIRT_FLASH_SECTOR_SIZE ==0 ); +assert (size /VIRT_FLASH_SECTOR_SIZE <=UINT32_MAX ); +qdev_prop_set_uint32 (dev,"num-blocks" , size /VIRT_FLASH_SECTOR_SIZE );qdev_init_nofail (dev); -memory_region_add_subregion (sysmem, flashbase, -sysbus_mmio_get_region (SYS_BUS_DEVICE (dev),0 )); - -if (file) { -char *fn; -int image_size; - -if (drive_get (IF_PFLASH ,0 ,0 )) { -error_report ("The contents of the first flash device may be " -"specified with -bios or with -drive if=pflash... " -"but you cannot use both options at once" ); -exit (1 ); - } - fn =qemu_find_file (QEMU_FILE_TYPE_BIOS , file); -if (!fn) { -error_report ("Could not find ROM image '%s'" , file); -exit (1 ); - } - image_size =load_image_mr (fn,sysbus_mmio_get_region (sbd,0 )); -g_free (fn); -if (image_size <0 ) { -error_report ("Could not load ROM image '%s'" , file); -exit (1 ); - } - } +memory_region_add_subregion (sysmem, base, +sysbus_mmio_get_region (SYS_BUS_DEVICE (dev), +0 )); } -static void create_flash (const VirtMachineState *vms, -MemoryRegion *sysmem, -MemoryRegion *secure_sysmem) +static void virt_flash_map (VirtMachineState *vms, +MemoryRegion *sysmem, +MemoryRegion *secure_sysmem) { -/* Create two flash devices to fill the VIRT_FLASH space in the memmap. -* Any file passed via -bios goes in the first of these. +/* +* Map two flash devices to fill the VIRT_FLASH space in the memmap. * sysmem is the system memory space. secure_sysmem is the secure view * of the system, and the first flash device should be made visible only * there. The second flash device is visible to both secure and nonsecure. @@ -941,13 +936,21 @@ static void create_flash(const VirtMachineState *vms,*/ hwaddr flashsize = vms->memmap[VIRT_FLASH ].size /2 ;hwaddr flashbase = vms->memmap[VIRT_FLASH ].base; + +virt_flash_map1 (vms->flash[0 ], flashbase, flashsize, + secure_sysmem); +virt_flash_map1 (vms->flash[1 ], flashbase + flashsize, flashsize, + sysmem); +} + +static void virt_flash_fdt (VirtMachineState *vms, +MemoryRegion *sysmem, +MemoryRegion *secure_sysmem) +{ +hwaddr flashsize = vms->memmap[VIRT_FLASH ].size /2 ; +hwaddr flashbase = vms->memmap[VIRT_FLASH ].base;char *nodename; -create_one_flash ("virt.flash0" , flashbase, flashsize, - bios_name, secure_sysmem); -create_one_flash ("virt.flash1" , flashbase + flashsize, flashsize, -NULL , sysmem); -if (sysmem == secure_sysmem) {/* Report both flash devices as a single node in the DT */ nodename =g_strdup_printf ("/flash@%" PRIx64, flashbase);@@ -959,7 +962,8 @@ static void create_flash(const VirtMachineState *vms,qemu_fdt_setprop_cell (vms->fdt, nodename,"bank-width" ,4 );g_free (nodename); }else { -/* Report the devices as separate nodes so we can mark one as +/* +* Report the devices as separate nodes so we can mark one as * only visible to the secure world. */ nodename =g_strdup_printf ("/secflash@%" PRIx64, flashbase);@@ -982,6 +986,48 @@ static void create_flash(const VirtMachineState *vms, } } +static bool virt_firmware_init (VirtMachineState *vms, +MemoryRegion *sysmem, +MemoryRegion *secure_sysmem) +{ +BlockBackend *pflash_blk0; + +pflash_cfi01_legacy_drive (vms->flash,ARRAY_SIZE (vms->flash)); +virt_flash_map (vms, sysmem, secure_sysmem); + + pflash_blk0 =pflash_cfi01_get_blk (vms->flash[0 ]); + +if (bios_name) { +char *fname; +MemoryRegion *mr; +int image_size; + +if (pflash_blk0) { +error_report ("The contents of the first flash device may be " +"specified with -bios or with -drive if=pflash... " +"but you cannot use both options at once" ); +exit (1 ); + } + +/* Fall back to -bios */ + + fname =qemu_find_file (QEMU_FILE_TYPE_BIOS , bios_name); +if (!fname) { +error_report ("Could not find ROM image '%s'" , bios_name); +exit (1 ); + } + mr =sysbus_mmio_get_region (SYS_BUS_DEVICE (vms->flash[0 ]),0 ); + image_size =load_image_mr (fname, mr); +g_free (fname); +if (image_size <0 ) { +error_report ("Could not load ROM image '%s'" , bios_name); +exit (1 ); + } + } + +return pflash_blk0 || bios_name; +} +static FWCfgState *create_fw_cfg (const VirtMachineState *vms,AddressSpace *as) {hwaddr base = vms->memmap[VIRT_FW_CFG ].base;@@ -1421,7 +1467,7 @@ static void machvirt_init(MachineState *machine)MemoryRegion *secure_sysmem =NULL ;int n, virt_max_cpus;MemoryRegion *ram =g_new (MemoryRegion,1 ); -bool firmware_loaded = bios_name ||drive_get (IF_PFLASH ,0 ,0 ); +bool firmware_loaded;bool aarch64 = true;/* @@ -1460,6 +1506,27 @@ static void machvirt_init(MachineState *machine)exit (1 ); } +if (vms->secure) { +if (kvm_enabled ()) { +error_report ("mach-virt: KVM does not support Security extensions" ); +exit (1 ); + } + +/* +* The Secure view of the world is the same as the NonSecure, +* but with a few extra devices. Create it as a container region +* containing the system memory at low priority; any secure-only +* devices go in at higher priority and take precedence. +*/ + secure_sysmem =g_new (MemoryRegion,1 ); + memory_region_init(secure_sysmem, OBJECT(machine), "secure-memory",hw/arm/virt.c static void machvirt_init(MachineState *machine) · line 1532
Quoted 10 lines
hw/arm/virt.c +7
-0+ UINT64_MAX); +memory_region_add_subregion_overlap (secure_sysmem,0 , sysmem,-1 ); + } + + firmware_loaded =virt_firmware_init (vms, sysmem, + secure_sysmem ?: sysmem); +/* If we have an EL3 boot ROM then the assumption is that it will * implement PSCI itself, so disable QEMU's internal implementation * so it doesn't get in the way. Instead of starting secondary Namely, at this point, I seem to understand that we have to hoist this "
vms->secure" block here, because:
Quoted 1 line
- below (not seen in the context), we have a condition on "
firmware_loaded",
Correct.
Quoted 2 lines
- "
firmware_loaded" *now* depends on "secure_sysmem" (it used not to, before)
Correct again.
Before the patch, we have
bool firmware_loaded = bios_name || drive_get(IF_PFLASH, 0, 0);
which really means "-bios or -drive if=pflash,unit=0 given". If true, create_flash() below will surely put firmware into the first flash chip.
Afterwards, predicting "will put firmware" is more complex. Instead of coding up a prediction of what create_flash()'s replacement virt_firmware_init() is going to do, I have virt_firmware_init() return what it did:
firmware_loaded = virt_firmware_init(vms, sysmem,
secure_sysmem ?: sysmem);
Naturally, I have to do this before firmware_loaded is used. So create_flash()'s replacement virt_firmware_init() moves up right before the first use of firmware_loaded. On its way, ...
Quoted 2 lines
- and "
secure_sysmem" depends on the "vms->secure" block that we're moving up here.
... it bumps into the computation of secure_sysmem, and pushes it up, too.
Quoted 8 lines
And that's where I grind to a halt, because I don't understand what the old functions are responsible for exactly, and how the responsibilities are now re-distributed, between the new functions.
I tried to look at this patch with full function context, and I also tried to look at the full file (pre vs. post) through a colorized side-by-side diff. To no use.
Quoted 7 lines
Now, I'm not saying this is a fault with the patch. It's entirely possible that the goal can only be achieved with such a "rewrite". I think it plausible that the patch cannot be done in multiple smaller patches, especially if we consider bisectability a requirement. (Maybe splitting the patch to smaller logical steps would be possible if we accepted halfway constructed and/or orphan objects, mid-series, that build and cause no issues at runtime. I don't know.)
Maybe it's possible, period.
Quoted 8 lines
So it's *my* fault -- it's like the code is sliced into small bits and then reshuffled to a new story, and I can't follow the bits' dance.
Can you add two high-level call trees, side-by-side, to the commit message, not just with function names but also with responsibilities?
I guess I won't ask for arrows from the left to the right :) I'll try to draw them myself.
Before the patch:
main()
machine_run_board_init()
machvirt_init() [method .init()]
create_flash()
create_one_flash() for flash[0]
create
configure
includes obeying -drive if=pflash,unit=0
realize
map
fall back to -bios
create_one_flash() for flash[1]
create
configure
includes obeying -drive if=pflash,unit=1
realize
map
update FDT
All the action is in create_flash().
Creating onboard devices in the machine's .init() method is common, but that doesn't make it right. By the time .init() runs, we're long done with setting properties. So anything we create that late cannot expose properties. The proper place to create onboard devices is .instance_init(). This is why I need to split up create_flash().
After the patch:
main()
current_machine = object_new()
...
virt_instance_init() [method .instance_init()]
virt_flash_create()
virt_flash_create1() for flash[0]
create
configure: set defaults
become child of machine
add machine prop pflash0 as alias for drive
virt_flash_create1() for flash[1]
create
configure: set defaults
become child of machine [NEW]
add machine prop pflash1 as alias for drive [NEW]
for all machine props: machine_set_property()
...
property_set_alias() for machine props pflash0, pflash1
...
set_drive() for cfi.pflash01 prop drive
this is how -machine pflash0=... etc set
machine_run_board_init(current_machine);
virt_firmware_init()
pflash_cfi01_legacy_drive()
legacy -drive if=pflash,unit=0 and =1 [NEW]
virt_flash_map()
virt_flash_map1() for flash[0]
configure: num-blocks
realize
map
virt_flash_map1() for flash[1]
configure: num-blocks
realize
map
fall back to -bios
virt_flash_fdt()
update FDT
Hope this helps!
Quoted 6 lines
To re-state: I'm not complaining about the patch, just saying that I've failed to understand it. I don't insist on understanding it (I'm fine if others understand it and approve it), but if I'm expected to ACK, I'll need more explanation. A lot more. :) Preferably captured within the series.
Thanks (and I apologize)
No problem.
Laszlo Ersek
Acked-byQuoted 58 lines · Markus Armbruster
Quoted 50 lines · Laszlo Ersek
Quoted 40 lines · Markus Armbruster
The ARM virt machines put firmware in flash memory. To configure it, you use -drive if=pflash,unit=0,... and optionally -drive if=pflash,unit=1,...
Why two -drive? This permits setting up one part of the flash memory read-only, and the other part read/write. It also makes upgrading firmware on the host easier. Below the hood, we get two separate flash devices, because we were too lazy to improve our flash device models to support sector protection.
The problem at hand is to do the same with -blockdev somehow, as one more step towards deprecating -drive.
We recently solved this problem for x86 PC machines, in commit
ebc29e1beab. See the commit message for design rationale.This commit solves it for ARM virt basically the same way: new machine properties pflash0, pflash1 forward to the onboard flash devices' properties. Requires creating the onboard devices in the .instance_init() method
virt_instance_init(). The existing code to pick up drives defined with -drive if=pflash is replaced by code to desugar into the machine properties.There are a few behavioral differences, though:
* The flash devices are always present (x86: only present if configured)
* Flash base addresses and sizes are fixed (x86: sizes depend on images, mapped back to back below a fixed address)
* -bios configures contents of first pflash (x86: -bios configures ROM contents)
* -bios is rejected when first pflash is also configured with -machine pflash0=... (x86: bios is silently ignored then)
* -machine pflash1=... does not require -machine pflash0=... (x86: it does).
Quoted 8 lines
The actual code is a bit simpler than for x86 mostly due to the first two differences.
Signed-off-by Markus Armbruster <[email protected]>--- hw/arm/virt.c | 192 +++++++++++++++++++++++++++--------------- include/hw/arm/virt.h | 2 + 2 files changed, 124 insertions(+), 70 deletions(-)Quoted 5 lines
I tried to review this patch, but I can't follow it.
I'm not saying it's wrong; in fact it *looks* right to me, but I can't follow it. It does so many things at once that I can't keep them all in mind.
Quoted 5 lines
Happens. I'll try to explain, and then we can talk about improving the patch.
Did you follow "See the commit message [of
ebc29e1beab] for design rationale" reference?
That commit carries my
"Acked-by: Laszlo Ersek <[email protected]>"
and it's not an R-b because:
- http://mid.mail-archive.com/[email protected]
"I don't know enough to understand a large part of the commit message. I can make some (superficial) comments on the code."
- http://mid.mail-archive.com/[email protected]
"Thanks for addressing my comments!"
So, the depth at which I understood commit ebc29e1beab isn't supporting me here :)
Quoted 75 lines
Quoted 58 lines
I started with:
virt_instance_init()
virt_flash_create()
virt_pflash_create1()and then I got confused by the object_property_add_*() calls, which don't exist in the original code:
Quoted 48 lines
hw/arm/virt.c +10
-15@@ -30,6 +30,7 @@#include "qemu/osdep.h" #include "qemu/units.h" +#include "qemu/option.h" #include "qapi/error.h" #include "hw/sysbus.h" #include "hw/arm/arm.h" @@ -871,25 +872,19 @@ static void create_virtio_devices(const VirtMachineState *vms, qemu_irq *pic) } } -static void create_one_flash (const char *name,hwaddr flashbase, -hwaddr flashsize,const char *file, -MemoryRegion *sysmem) +#define VIRT_FLASH_SECTOR_SIZE (256 * KiB) + +static PFlashCFI01 *virt_pflash_create1 (VirtMachineState *vms, +const char *name, +const char *alias_prop_name) { -/* Create and map a single flash device. We use the same -* parameters as the flash devices on the Versatile Express board. +/* +* Create a single flash device. We use the same parameters as +* the flash devices on the Versatile Express board. */ -DriveInfo *dinfo =drive_get_next (IF_PFLASH );DeviceState *dev =qdev_create (NULL ,TYPE_PFLASH_CFI01 ); -SysBusDevice *sbd =SYS_BUS_DEVICE (dev); -const uint64_t sectorlength =256 *1024 ; -if (dinfo) { -qdev_prop_set_drive (dev,"drive" ,blk_by_legacy_dinfo (dinfo), - &error_abort); - } - -qdev_prop_set_uint32 (dev,"num-blocks" , flashsize / sectorlength); -qdev_prop_set_uint64 (dev,"sector-length" , sectorlength); +qdev_prop_set_uint64 (dev,"sector-length" ,VIRT_FLASH_SECTOR_SIZE );qdev_prop_set_uint8 (dev,"width" ,4 );qdev_prop_set_uint8 (dev,"device-width" ,2 );qdev_prop_set_bit (dev,"big-endian" , false);@@ -898,41 +893,41 @@ static void create_one_flash(const char *name, hwaddr flashbase,Quoted 8 lines
hw/arm/virt.c static void create_one_flash(const char *name, hwaddr flashbase, · line 897
Quoted 5 lines
hw/arm/virt.c +2
-0qdev_prop_set_uint16 (dev,"id2" ,0x00 );qdev_prop_set_uint16 (dev,"id3" ,0x00 );qdev_prop_set_string (dev,"name" , name); +object_property_add_child (OBJECT (vms), name,OBJECT (dev), + &error_abort);I guess this links the pflash device as a child under the VirtMachineState object
Yes.
Quoted 1 line
-- but why wasn't that necessary before?
For better or worse, a qdev device without a parent gets adopted on realize by container object "/machine/unattached". See
device_set_realized()under if (!obj->parent).
Quoted 5 lines
Example to illustrate, feel free to skip ahead to "End of example".
Here's the contents of "/machine/unattached" for a pretty minimal ARM virt machine (I use
scripts/qmp/qom-fuseto mount the QOM tree to qom-fuse/ for easy examination):
(the fact that we have a genuine filesystem driver for navigating the QOM tree, for debugging purposes, is brilliant and frightening at the same time)
Quoted 58 lines
$ ls qom-fuse/machine/unattached/ 'device[0]' 'device[19]' 'device[28]' 'device[37]' 'device[7]' 'device[10]' 'device[1]' 'device[29]' 'device[38]' 'device[8]' 'device[11]' 'device[20]' 'device[2]' 'device[39]' 'device[9]' 'device[12]' 'device[21]' 'device[30]' 'device[3]' 'io[0]' 'device[13]' 'device[22]' 'device[31]' 'device[40]' 'mach-virt.ram[0]' 'device[14]' 'device[23]' 'device[32]' 'device[41]' 'platform bus[0]' 'device[15]' 'device[24]' 'device[33]' 'device[42]' sysbus 'device[16]' 'device[25]' 'device[34]' 'device[4]' 'system[0]' 'device[17]' 'device[26]' 'device[35]' 'device[5]' type 'device[18]' 'device[27]' 'device[36]' 'device[6]'The device* are the adopted qdevs. Let's look for pflash:
$ grep -a cfi qom-fuse/machine/unattached/device*/type qom-fuse/machine/unattached/device[1]/type:cfi.pflash01 qom-fuse/machine/unattached/device[2]/type:cfi.pflash01Here are the children of /machine:
$ ls qom-fuse/machine/ accel fw_cfg kernel secure append gic-version kernel-irqchip suppress-vmdesc dt-compatible graphics kvm-shadow-mem type dtb highmem mem-merge unattached dump-guest-core igd-passthru memory-encryption usb dumpdtb initrd peripheral virtualization enforce-config-section iommu peripheral-anon firmware its phandle-startThis was before this patch. Afterwards:
$ ls qom-fuse/machine/unattached/ 'device[0]' 'device[19]' 'device[28]' 'device[37]' 'device[9]' 'device[10]' 'device[1]' 'device[29]' 'device[38]' 'io[0]' 'device[11]' 'device[20]' 'device[2]' 'device[39]' 'mach-virt.ram[0]' 'device[12]' 'device[21]' 'device[30]' 'device[3]' 'platform bus[0]' 'device[13]' 'device[22]' 'device[31]' 'device[40]' sysbus 'device[14]' 'device[23]' 'device[32]' 'device[4]' 'system[0]' 'device[15]' 'device[24]' 'device[33]' 'device[5]' type 'device[16]' 'device[25]' 'device[34]' 'device[6]' 'device[17]' 'device[26]' 'device[35]' 'device[7]' 'device[18]' 'device[27]' 'device[36]' 'device[8]'Two fewer device*.
$ ls qom-fuse/machine/ accel gic-version kvm-shadow-mem suppress-vmdesc append graphics mem-merge type dt-compatible highmem memory-encryption unattached dtb igd-passthru peripheral usb dump-guest-core initrd peripheral-anon virt.flash0 dumpdtb iommu pflash0 virt.flash1 enforce-config-section its pflash1 virtualization firmware kernel phandle-start fw_cfg kernel-irqchip secure
Quoted 1 line
Note new virt.flash0 and virt.flash1.
Four more children for /machine though: "virt.flashX" and "pflashX".
(... returning here from the end: apparently machine properties are also children of /machine)
Quoted 12 lines
$ cat qom-fuse/machine/virt.flash*/type cfi.pflash01 cfi.pflash01That's where the two went.
End of example.
Now I'm actually read to answer your question "why wasn't that necessary before?", or rather "why is it necessary now?"
Quoted 8 lines
It wasn't necessary before because orphans get adopted.
It might not even be necessary now, but I feel (strongly!) that an alias property should redirect to a child's property, not some random unrelated object's property (see right below).
Regardless, I feel onboard devices should be proper children of the machine anyway, not stuffed into its unattached/ grabbag.
... Okay.
Quoted 40 lines
Quoted 5 lines
hw/arm/virt.c static void create_one_flash(const char *name, hwaddr flashbase, · line 899
Quoted 2 lines
hw/arm/virt.c +2
-0+object_property_add_alias (OBJECT (vms), alias_prop_name, +OBJECT (dev),"drive" , &error_abort);What is this good for? Does this make the pflash0 / pflash1 properties of the machine refer to the "drive" property of the pflash device?
Correct!
With
object.hand a crystal ball, you should be able to work that out for yourself:/**
*object_property_add_alias:
* @obj: the object to add a property to
* @name: the name of the property
* @target_obj: the object to forward property access to
* @target_name: the name of the property on the forwarded object
* @errp: if an error occurs, a pointer to an area to store the error *
* Add an alias for a property on an object. This function will add a property
* of the same type as the forwarded property.
*
* The caller must ensure that <code>@target_obj</code> stays alive as long as
* this property exists. In the case of a child object or an alias on the same
* object this will be the case. For aliases to other objects the caller is
* responsible for taking a reference.
*/Oh, no crystal ball? Then it's spelunking through
object.c, I guess.Quoted 2 lines
Can we have a comment about that, or is that obvious for people that are used to QOM code?
If there are any, please speak up, so we can appoint you QOM maintainer.
In my (weak) defense, I mentioned the property forwarding in my commit message ("new machine properties pflash0, pflash1 forward to the onboard flash devices' properties"), and I did point to commit
ebc29e1beabfor design rationale. It has this paragraph:
Quoted 6 lines
More seriously, the properties do not belong to the machine, they belong to the onboard flash devices. Adding them to the machine would then require bad magic to somehow transfer them to the flash devices. Fortunately, QOM provides the means to handle exactly this case: add alias properties to the machine that forward to the onboard devices' properties.
Yup, I certainly neither remembered nor re-read this. Sorry about that.
Quoted 202 lines
Quoted 195 lines
... So anyway, this is where I come to an almost complete halt. I understand one more bit (in isolation only):
Quoted 177 lines
hw/arm/virt.c +98
-37+return PFLASH_CFI01 (dev); +} + +static void virt_flash_create (VirtMachineState *vms) +{ + vms->flash[0 ] =virt_pflash_create1 (vms,"virt.flash0" ,"pflash0" ); + vms->flash[1 ] =virt_pflash_create1 (vms,"virt.flash1" ,"pflash1" ); +} + +static void virt_flash_map1 (PFlashCFI01 *flash, +hwaddr base,hwaddr size, +MemoryRegion *sysmem) +{ +DeviceState *dev =DEVICE (flash); + +assert (size %VIRT_FLASH_SECTOR_SIZE ==0 ); +assert (size /VIRT_FLASH_SECTOR_SIZE <=UINT32_MAX ); +qdev_prop_set_uint32 (dev,"num-blocks" , size /VIRT_FLASH_SECTOR_SIZE );qdev_init_nofail (dev); -memory_region_add_subregion (sysmem, flashbase, -sysbus_mmio_get_region (SYS_BUS_DEVICE (dev),0 )); - -if (file) { -char *fn; -int image_size; - -if (drive_get (IF_PFLASH ,0 ,0 )) { -error_report ("The contents of the first flash device may be " -"specified with -bios or with -drive if=pflash... " -"but you cannot use both options at once" ); -exit (1 ); - } - fn =qemu_find_file (QEMU_FILE_TYPE_BIOS , file); -if (!fn) { -error_report ("Could not find ROM image '%s'" , file); -exit (1 ); - } - image_size =load_image_mr (fn,sysbus_mmio_get_region (sbd,0 )); -g_free (fn); -if (image_size <0 ) { -error_report ("Could not load ROM image '%s'" , file); -exit (1 ); - } - } +memory_region_add_subregion (sysmem, base, +sysbus_mmio_get_region (SYS_BUS_DEVICE (dev), +0 )); } -static void create_flash (const VirtMachineState *vms, -MemoryRegion *sysmem, -MemoryRegion *secure_sysmem) +static void virt_flash_map (VirtMachineState *vms, +MemoryRegion *sysmem, +MemoryRegion *secure_sysmem) { -/* Create two flash devices to fill the VIRT_FLASH space in the memmap. -* Any file passed via -bios goes in the first of these. +/* +* Map two flash devices to fill the VIRT_FLASH space in the memmap. * sysmem is the system memory space. secure_sysmem is the secure view * of the system, and the first flash device should be made visible only * there. The second flash device is visible to both secure and nonsecure. @@ -941,13 +936,21 @@ static void create_flash(const VirtMachineState *vms,*/ hwaddr flashsize = vms->memmap[VIRT_FLASH ].size /2 ;hwaddr flashbase = vms->memmap[VIRT_FLASH ].base; + +virt_flash_map1 (vms->flash[0 ], flashbase, flashsize, + secure_sysmem); +virt_flash_map1 (vms->flash[1 ], flashbase + flashsize, flashsize, + sysmem); +} + +static void virt_flash_fdt (VirtMachineState *vms, +MemoryRegion *sysmem, +MemoryRegion *secure_sysmem) +{ +hwaddr flashsize = vms->memmap[VIRT_FLASH ].size /2 ; +hwaddr flashbase = vms->memmap[VIRT_FLASH ].base;char *nodename; -create_one_flash ("virt.flash0" , flashbase, flashsize, - bios_name, secure_sysmem); -create_one_flash ("virt.flash1" , flashbase + flashsize, flashsize, -NULL , sysmem); -if (sysmem == secure_sysmem) {/* Report both flash devices as a single node in the DT */ nodename =g_strdup_printf ("/flash@%" PRIx64, flashbase);@@ -959,7 +962,8 @@ static void create_flash(const VirtMachineState *vms,qemu_fdt_setprop_cell (vms->fdt, nodename,"bank-width" ,4 );g_free (nodename); }else { -/* Report the devices as separate nodes so we can mark one as +/* +* Report the devices as separate nodes so we can mark one as * only visible to the secure world. */ nodename =g_strdup_printf ("/secflash@%" PRIx64, flashbase);@@ -982,6 +986,48 @@ static void create_flash(const VirtMachineState *vms, } } +static bool virt_firmware_init (VirtMachineState *vms, +MemoryRegion *sysmem, +MemoryRegion *secure_sysmem) +{ +BlockBackend *pflash_blk0; + +pflash_cfi01_legacy_drive (vms->flash,ARRAY_SIZE (vms->flash)); +virt_flash_map (vms, sysmem, secure_sysmem); + + pflash_blk0 =pflash_cfi01_get_blk (vms->flash[0 ]); + +if (bios_name) { +char *fname; +MemoryRegion *mr; +int image_size; + +if (pflash_blk0) { +error_report ("The contents of the first flash device may be " +"specified with -bios or with -drive if=pflash... " +"but you cannot use both options at once" ); +exit (1 ); + } + +/* Fall back to -bios */ + + fname =qemu_find_file (QEMU_FILE_TYPE_BIOS , bios_name); +if (!fname) { +error_report ("Could not find ROM image '%s'" , bios_name); +exit (1 ); + } + mr =sysbus_mmio_get_region (SYS_BUS_DEVICE (vms->flash[0 ]),0 ); + image_size =load_image_mr (fname, mr); +g_free (fname); +if (image_size <0 ) { +error_report ("Could not load ROM image '%s'" , bios_name); +exit (1 ); + } + } + +return pflash_blk0 || bios_name; +} +static FWCfgState *create_fw_cfg (const VirtMachineState *vms,AddressSpace *as) {hwaddr base = vms->memmap[VIRT_FW_CFG ].base;@@ -1421,7 +1467,7 @@ static void machvirt_init(MachineState *machine)MemoryRegion *secure_sysmem =NULL ;int n, virt_max_cpus;MemoryRegion *ram =g_new (MemoryRegion,1 ); -bool firmware_loaded = bios_name ||drive_get (IF_PFLASH ,0 ,0 ); +bool firmware_loaded;bool aarch64 = true;/* @@ -1460,6 +1506,27 @@ static void machvirt_init(MachineState *machine)exit (1 ); } +if (vms->secure) { +if (kvm_enabled ()) { +error_report ("mach-virt: KVM does not support Security extensions" ); +exit (1 ); + } + +/* +* The Secure view of the world is the same as the NonSecure, +* but with a few extra devices. Create it as a container region +* containing the system memory at low priority; any secure-only +* devices go in at higher priority and take precedence. +*/ + secure_sysmem =g_new (MemoryRegion,1 ); + memory_region_init(secure_sysmem, OBJECT(machine), "secure-memory",hw/arm/virt.c static void machvirt_init(MachineState *machine) · line 1532
Quoted 10 lines
hw/arm/virt.c +7
-0+ UINT64_MAX); +memory_region_add_subregion_overlap (secure_sysmem,0 , sysmem,-1 ); + } + + firmware_loaded =virt_firmware_init (vms, sysmem, + secure_sysmem ?: sysmem); +/* If we have an EL3 boot ROM then the assumption is that it will * implement PSCI itself, so disable QEMU's internal implementation * so it doesn't get in the way. Instead of starting secondary Namely, at this point, I seem to understand that we have to hoist this "
vms->secure" block here, because:Quoted 1 line
- below (not seen in the context), we have a condition on "
firmware_loaded",Correct.
Quoted 2 lines
- "
firmware_loaded" *now* depends on "secure_sysmem" (it used not to, before)
Quoted 8 lines
Correct again.
Before the patch, we have
bool firmware_loaded = bios_name || drive_get(IF_PFLASH, 0, 0);which really means "-bios or -drive if=pflash,unit=0 given". If true,
create_flash()below will surely put firmware into the first flash chip.
OK, so here I almost challenged you, "that's not what create_flash() does" -- but then I looked more closely, and create_flash() does call create_one_flash() *once* with (file = bios_name), and then create_one_flash() does mess with IF_PFLASH, partly dependent on "file" being non-NULL...
I guess what's stunning me the most is how baroque this code is, relative to the x86 version, intermixed with FDT management and secure world and stuff. Obviously I have *contributed* to its complexity, because "firmware_loaded" comes from me, IIRC. :/ No wonder I don't understand your patch: I don't understand the pre-patch code.
Quoted 13 lines
Afterwards, predicting "will put firmware" is more complex. Instead of coding up a prediction of what create_flash()'s replacement
virt_firmware_init()is going to do, I havevirt_firmware_init()return what it did:
firmware_loaded= virt_firmware_init(vms, sysmem,
secure_sysmem?: sysmem);Naturally, I have to do this before
firmware_loadedis used. So create_flash()'s replacementvirt_firmware_init()moves up right before the first use offirmware_loaded. On its way, ...
Quoted 5 lines
Quoted 2 lines
- and "
secure_sysmem" depends on the "vms->secure" block that we're moving up here.... it bumps into the computation of
secure_sysmem, and pushes it up, too.
OK.
Quoted 21 lines
Quoted 8 lines
And that's where I grind to a halt, because I don't understand what the old functions are responsible for exactly, and how the responsibilities are now re-distributed, between the new functions.
I tried to look at this patch with full function context, and I also tried to look at the full file (pre vs. post) through a colorized side-by-side diff. To no use.
Quoted 7 lines
Now, I'm not saying this is a fault with the patch. It's entirely possible that the goal can only be achieved with such a "rewrite". I think it plausible that the patch cannot be done in multiple smaller patches, especially if we consider bisectability a requirement. (Maybe splitting the patch to smaller logical steps would be possible if we accepted halfway constructed and/or orphan objects, mid-series, that build and cause no issues at runtime. I don't know.)
Maybe it's possible, period.
Quoted 3 lines
So it's *my* fault -- it's like the code is sliced into small bits and then reshuffled to a new story, and I can't follow the bits' dance.
Quoted 7 lines
Quoted 5 lines
Can you add two high-level call trees, side-by-side, to the commit message, not just with function names but also with responsibilities?
I guess I won't ask for arrows from the left to the right :) I'll try to draw them myself.
Before the patch:
(ahh, fantastic. This is awesome. Thank you for it.
Whining a bit in parentheses: why oh why do we call heavy-weight functions like qdev_create() as part of local variable initialization? My eyes are by now used to edk2 code mostly, and there, local variable initialization is *forbidden*, you can't even assign constants)
Quoted 8 lines
main()
machine_run_board_init()
machvirt_init()[method .init()]
create_flash()
create_one_flash()for flash[0]
create
configure
includes obeying -drive if=pflash,unit=0
I guess that's the qdev_prop_set_drive() part
Quoted 2 lines
realize
map
... not even an empty line between the last qdev_prop_set_string() and qdev_init_nofail()...
Quoted 5 lines
fall back to -bios
create_one_flash()for flash[1]
create
configure
includes obeying -drive if=pflash,unit=1
nice, the "1" in flash[1] comes from create_flash(), i.e., the caller, but "unit=1" for qdev_prop_set_drive() comes from... drive_get_next() in the variable initializer? :)
... and then the bios-handling code at the bottom nonetheless uses drive_get(), with an explicit unit number? ;)
(I'm not mocking the code, I'm laughing at myself: for brazenly attempting to "skim" this code before)
Quoted 5 lines
realize
map
update FDTAll the action is in
create_flash().
Awesome. Thanks!
Quoted 5 lines
Creating onboard devices in the machine's .init() method is common, but that doesn't make it right. By the time .init() runs, we're long done with setting properties. So anything we create that late cannot expose properties.
Ahh, this is a recurring topic. I remember this from a recent downstream review.
Quoted 11 lines
The proper place to create onboard devices is
.instance_init(). This is why I need to split upcreate_flash().After the patch:
main()
current_machine=object_new()
...
virt_instance_init()[method .instance_init()]
virt_flash_create()
virt_flash_create1()for flash[0]
(typo: virt_pflash_create1)
Quoted 1 line
create
(easier to read now! at least qdev_create() stands reasonably isolated)
Quoted 3 lines
configure: set defaults
become child of machine
add machine prop pflash0 as alias for drive
beautiful (I've applied your patch and am reading the source in parallel to your road signs)
Quoted 5 lines
virt_flash_create1()for flash[1]
create
configure: set defaults
become child of machine [NEW]
add machine prop pflash1 as alias for drive [NEW]
the [NEW] markers apply to the same steps in the invocation with flash[0] too, don't they?
Quoted 1 line
for all machine props:
machine_set_property()
uhoh, I got lost a bit here, but according to the source, I think you meant "for all machine properties from the *command line*"
Quoted 5 lines
...
property_set_alias()for machine props pflash0, pflash1
...
set_drive()for cfi.pflash01 prop drive
this is how -machine pflash0=... etc set
and the magic happens
we've split off and moved to the front:
- creation (defaults only)
- configuration
we added, as new:
- parenting both chips to the machine, not the unattached dump
- aliases to both chips' drive properties, by corresponding machine properties
and normal machine property parsing from the cmldine ended up setting the drives. Yay!
we still need:
- configuration (non-defaults)
- realize (per flash)
- map (per flash)
- update FDT (single node for both chips, as long as there's no "secure" flash)
Quoted 4 lines
machine_run_board_init(current_machine);
virt_firmware_init()
pflash_cfi01_legacy_drive()
legacy -drive if=pflash,unit=0 and =1 [NEW]OK, so this is where we turn the old style options into those machine type properties that were *not* set on the cmdline, and hence not recognized by the "for all machine props: ..." logic, in main()
Quoted 5 lines
virt_flash_map()
virt_flash_map1() for flash[0]
configure: num-blocks
realize
mapdefinitely easier to read -- the function body is smaller (and I'm starting to get the hang of it too)
Quoted 5 lines
virt_flash_map1()for flash[1]
configure: num-blocks realize
map
fall back to -bios
This was really thick, but I chewed my way through it!
Quoted 4 lines
virt_flash_fdt()
update FDTHope this helps!
I've spent more two hours on reading your email, the source code, and writing my stupid little comments, and it's been a blast.
I'm sold on the patch. I still don't feel like I'm an authority on it, so I can't offer an R-b, but I'm happy to give
on one condition: I beg you to include the before-after call trees in the commit message. :)
... Today's not been in vain! :)
You rock,
Laszlo
Quoted 10 lines
Quoted 7 lines
To re-state: I'm not complaining about the patch, just saying that I've failed to understand it. I don't insist on understanding it (I'm fine if others understand it and approve it), but if I'm expected to ACK, I'll need more explanation. A lot more. :) Preferably captured within the series.
Thanks (and I apologize)
No problem.
Quoted 160 lines · Laszlo Ersek
Quoted 58 lines · Markus Armbruster
Quoted 50 lines · Laszlo Ersek
Quoted 40 lines · Markus Armbruster
The ARM virt machines put firmware in flash memory. To configure it, you use -drive if=pflash,unit=0,... and optionally -drive if=pflash,unit=1,...
Why two -drive? This permits setting up one part of the flash memory read-only, and the other part read/write. It also makes upgrading firmware on the host easier. Below the hood, we get two separate flash devices, because we were too lazy to improve our flash device models to support sector protection.
The problem at hand is to do the same with -blockdev somehow, as one more step towards deprecating -drive.
We recently solved this problem for x86 PC machines, in commit
ebc29e1beab. See the commit message for design rationale.This commit solves it for ARM virt basically the same way: new machine properties pflash0, pflash1 forward to the onboard flash devices' properties. Requires creating the onboard devices in the .instance_init() method
virt_instance_init(). The existing code to pick up drives defined with -drive if=pflash is replaced by code to desugar into the machine properties.There are a few behavioral differences, though:
* The flash devices are always present (x86: only present if configured)
* Flash base addresses and sizes are fixed (x86: sizes depend on images, mapped back to back below a fixed address)
* -bios configures contents of first pflash (x86: -bios configures ROM contents)
* -bios is rejected when first pflash is also configured with -machine pflash0=... (x86: bios is silently ignored then)
* -machine pflash1=... does not require -machine pflash0=... (x86: it does).
Quoted 8 lines
The actual code is a bit simpler than for x86 mostly due to the first two differences.
Signed-off-by Markus Armbruster <[email protected]>--- hw/arm/virt.c | 192 +++++++++++++++++++++++++++--------------- include/hw/arm/virt.h | 2 + 2 files changed, 124 insertions(+), 70 deletions(-)Quoted 5 lines
I tried to review this patch, but I can't follow it.
I'm not saying it's wrong; in fact it *looks* right to me, but I can't follow it. It does so many things at once that I can't keep them all in mind.
Quoted 5 lines
Happens. I'll try to explain, and then we can talk about improving the patch.
Did you follow "See the commit message [of
ebc29e1beab] for design rationale" reference?That commit carries my
"Acked-by: Laszlo Ersek <[email protected]>"
and it's not an R-b because:
- http://mid.mail-archive.com/[email protected]
"I don't know enough to understand a large part of the commit message. I can make some (superficial) comments on the code."
- http://mid.mail-archive.com/[email protected]
"Thanks for addressing my comments!"
So, the depth at which I understood commit
ebc29e1beabisn't supporting me here :)Quoted 77 lines
Quoted 58 lines
I started with:
virt_instance_init()
virt_flash_create()
virt_pflash_create1()and then I got confused by the object_property_add_*() calls, which don't exist in the original code:
Quoted 48 lines
hw/arm/virt.c +10
-15@@ -30,6 +30,7 @@#include "qemu/osdep.h" #include "qemu/units.h" +#include "qemu/option.h" #include "qapi/error.h" #include "hw/sysbus.h" #include "hw/arm/arm.h" @@ -871,25 +872,19 @@ static void create_virtio_devices(const VirtMachineState *vms, qemu_irq *pic) } } -static void create_one_flash (const char *name,hwaddr flashbase, -hwaddr flashsize,const char *file, -MemoryRegion *sysmem) +#define VIRT_FLASH_SECTOR_SIZE (256 * KiB) + +static PFlashCFI01 *virt_pflash_create1 (VirtMachineState *vms, +const char *name, +const char *alias_prop_name) { -/* Create and map a single flash device. We use the same -* parameters as the flash devices on the Versatile Express board. +/* +* Create a single flash device. We use the same parameters as +* the flash devices on the Versatile Express board. */ -DriveInfo *dinfo =drive_get_next (IF_PFLASH );DeviceState *dev =qdev_create (NULL ,TYPE_PFLASH_CFI01 ); -SysBusDevice *sbd =SYS_BUS_DEVICE (dev); -const uint64_t sectorlength =256 *1024 ; -if (dinfo) { -qdev_prop_set_drive (dev,"drive" ,blk_by_legacy_dinfo (dinfo), - &error_abort); - } - -qdev_prop_set_uint32 (dev,"num-blocks" , flashsize / sectorlength); -qdev_prop_set_uint64 (dev,"sector-length" , sectorlength); +qdev_prop_set_uint64 (dev,"sector-length" ,VIRT_FLASH_SECTOR_SIZE );qdev_prop_set_uint8 (dev,"width" ,4 );qdev_prop_set_uint8 (dev,"device-width" ,2 );qdev_prop_set_bit (dev,"big-endian" , false);@@ -898,41 +893,41 @@ static void create_one_flash(const char *name, hwaddr flashbase,Quoted 8 lines
hw/arm/virt.c static void create_one_flash(const char *name, hwaddr flashbase, · line 897
Quoted 5 lines
hw/arm/virt.c +2
-0qdev_prop_set_uint16 (dev,"id2" ,0x00 );qdev_prop_set_uint16 (dev,"id3" ,0x00 );qdev_prop_set_string (dev,"name" , name); +object_property_add_child (OBJECT (vms), name,OBJECT (dev), + &error_abort);I guess this links the pflash device as a child under the VirtMachineState object
Yes.
Quoted 1 line
-- but why wasn't that necessary before?
For better or worse, a qdev device without a parent gets adopted on realize by container object "/machine/unattached". See
device_set_realized()under if (!obj->parent).Example to illustrate, feel free to skip ahead to "End of example".
Quoted 7 lines
Quoted 3 lines
Here's the contents of "/machine/unattached" for a pretty minimal ARM virt machine (I use
scripts/qmp/qom-fuseto mount the QOM tree to qom-fuse/ for easy examination):(the fact that we have a genuine filesystem driver for navigating the QOM tree, for debugging purposes, is brilliant and frightening at the same time)
True!
Also brilliant: it's just 110 SLOC of Python :)
Quoted 58 lines
Quoted 58 lines
$ ls qom-fuse/machine/unattached/ 'device[0]' 'device[19]' 'device[28]' 'device[37]' 'device[7]' 'device[10]' 'device[1]' 'device[29]' 'device[38]' 'device[8]' 'device[11]' 'device[20]' 'device[2]' 'device[39]' 'device[9]' 'device[12]' 'device[21]' 'device[30]' 'device[3]' 'io[0]' 'device[13]' 'device[22]' 'device[31]' 'device[40]' 'mach-virt.ram[0]' 'device[14]' 'device[23]' 'device[32]' 'device[41]' 'platform bus[0]' 'device[15]' 'device[24]' 'device[33]' 'device[42]' sysbus 'device[16]' 'device[25]' 'device[34]' 'device[4]' 'system[0]' 'device[17]' 'device[26]' 'device[35]' 'device[5]' type 'device[18]' 'device[27]' 'device[36]' 'device[6]'The device* are the adopted qdevs. Let's look for pflash:
$ grep -a cfi qom-fuse/machine/unattached/device*/type qom-fuse/machine/unattached/device[1]/type:cfi.pflash01 qom-fuse/machine/unattached/device[2]/type:cfi.pflash01Here are the children of /machine:
$ ls qom-fuse/machine/ accel fw_cfg kernel secure append gic-version kernel-irqchip suppress-vmdesc dt-compatible graphics kvm-shadow-mem type dtb highmem mem-merge unattached dump-guest-core igd-passthru memory-encryption usb dumpdtb initrd peripheral virtualization enforce-config-section iommu peripheral-anon firmware its phandle-startThis was before this patch. Afterwards:
$ ls qom-fuse/machine/unattached/ 'device[0]' 'device[19]' 'device[28]' 'device[37]' 'device[9]' 'device[10]' 'device[1]' 'device[29]' 'device[38]' 'io[0]' 'device[11]' 'device[20]' 'device[2]' 'device[39]' 'mach-virt.ram[0]' 'device[12]' 'device[21]' 'device[30]' 'device[3]' 'platform bus[0]' 'device[13]' 'device[22]' 'device[31]' 'device[40]' sysbus 'device[14]' 'device[23]' 'device[32]' 'device[4]' 'system[0]' 'device[15]' 'device[24]' 'device[33]' 'device[5]' type 'device[16]' 'device[25]' 'device[34]' 'device[6]' 'device[17]' 'device[26]' 'device[35]' 'device[7]' 'device[18]' 'device[27]' 'device[36]' 'device[8]'Two fewer device*.
$ ls qom-fuse/machine/ accel gic-version kvm-shadow-mem suppress-vmdesc append graphics mem-merge type dt-compatible highmem memory-encryption unattached dtb igd-passthru peripheral usb dump-guest-core initrd peripheral-anon virt.flash0 dumpdtb iommu pflash0 virt.flash1 enforce-config-section its pflash1 virtualization firmware kernel phandle-start fw_cfg kernel-irqchip secure
Quoted 6 lines
Quoted 1 line
Note new virt.flash0 and virt.flash1.
Four more children for /machine though: "virt.flashX" and "pflashX".
(... returning here from the end: apparently machine properties are also children of /machine)
Yes, the QOM tree has properties as leaves. I don't know (and I'm not sure I want to know) what happens when you create a property with a name that clashes with one QOM uses for itself, such as "type".
Quoted 14 lines
Quoted 14 lines
$ cat qom-fuse/machine/virt.flash*/type cfi.pflash01 cfi.pflash01That's where the two went.
End of example.
Now I'm actually read to answer your question "why wasn't that necessary before?", or rather "why is it necessary now?"
It wasn't necessary before because orphans get adopted.
Quoted 8 lines
Quoted 6 lines
It might not even be necessary now, but I feel (strongly!) that an alias property should redirect to a child's property, not some random unrelated object's property (see right below).
Regardless, I feel onboard devices should be proper children of the machine anyway, not stuffed into its unattached/ grabbag.
... Okay.
I figure the auto-adoption by /machine/unattached was done to avoid updating code to do the right thing.
We're much better at starting grand projects than at finishing them.
Quoted 257 lines
Quoted 40 lines
Quoted 5 lines
hw/arm/virt.c static void create_one_flash(const char *name, hwaddr flashbase, · line 899
Quoted 2 lines
hw/arm/virt.c +2
-0+object_property_add_alias (OBJECT (vms), alias_prop_name, +OBJECT (dev),"drive" , &error_abort);What is this good for? Does this make the pflash0 / pflash1 properties of the machine refer to the "drive" property of the pflash device?
Correct!
With
object.hand a crystal ball, you should be able to work that out for yourself:/**
*object_property_add_alias:
* @obj: the object to add a property to
* @name: the name of the property
* @target_obj: the object to forward property access to
* @target_name: the name of the property on the forwarded object
* @errp: if an error occurs, a pointer to an area to store the error *
* Add an alias for a property on an object. This function will add a property
* of the same type as the forwarded property.
*
* The caller must ensure that <code>@target_obj</code> stays alive as long as
* this property exists. In the case of a child object or an alias on the same
* object this will be the case. For aliases to other objects the caller is
* responsible for taking a reference.
*/Oh, no crystal ball? Then it's spelunking through
object.c, I guess.Quoted 2 lines
Can we have a comment about that, or is that obvious for people that are used to QOM code?
If there are any, please speak up, so we can appoint you QOM maintainer.
In my (weak) defense, I mentioned the property forwarding in my commit message ("new machine properties pflash0, pflash1 forward to the onboard flash devices' properties"), and I did point to commit
ebc29e1beabfor design rationale. It has this paragraph:Quoted 6 lines
More seriously, the properties do not belong to the machine, they belong to the onboard flash devices. Adding them to the machine would then require bad magic to somehow transfer them to the flash devices. Fortunately, QOM provides the means to handle exactly this case: add alias properties to the machine that forward to the onboard devices' properties.
Yup, I certainly neither remembered nor re-read this. Sorry about that.
Quoted 208 lines
Quoted 195 lines
... So anyway, this is where I come to an almost complete halt. I understand one more bit (in isolation only):
Quoted 177 lines
hw/arm/virt.c +98
-37+return PFLASH_CFI01 (dev); +} + +static void virt_flash_create (VirtMachineState *vms) +{ + vms->flash[0 ] =virt_pflash_create1 (vms,"virt.flash0" ,"pflash0" ); + vms->flash[1 ] =virt_pflash_create1 (vms,"virt.flash1" ,"pflash1" ); +} + +static void virt_flash_map1 (PFlashCFI01 *flash, +hwaddr base,hwaddr size, +MemoryRegion *sysmem) +{ +DeviceState *dev =DEVICE (flash); + +assert (size %VIRT_FLASH_SECTOR_SIZE ==0 ); +assert (size /VIRT_FLASH_SECTOR_SIZE <=UINT32_MAX ); +qdev_prop_set_uint32 (dev,"num-blocks" , size /VIRT_FLASH_SECTOR_SIZE );qdev_init_nofail (dev); -memory_region_add_subregion (sysmem, flashbase, -sysbus_mmio_get_region (SYS_BUS_DEVICE (dev),0 )); - -if (file) { -char *fn; -int image_size; - -if (drive_get (IF_PFLASH ,0 ,0 )) { -error_report ("The contents of the first flash device may be " -"specified with -bios or with -drive if=pflash... " -"but you cannot use both options at once" ); -exit (1 ); - } - fn =qemu_find_file (QEMU_FILE_TYPE_BIOS , file); -if (!fn) { -error_report ("Could not find ROM image '%s'" , file); -exit (1 ); - } - image_size =load_image_mr (fn,sysbus_mmio_get_region (sbd,0 )); -g_free (fn); -if (image_size <0 ) { -error_report ("Could not load ROM image '%s'" , file); -exit (1 ); - } - } +memory_region_add_subregion (sysmem, base, +sysbus_mmio_get_region (SYS_BUS_DEVICE (dev), +0 )); } -static void create_flash (const VirtMachineState *vms, -MemoryRegion *sysmem, -MemoryRegion *secure_sysmem) +static void virt_flash_map (VirtMachineState *vms, +MemoryRegion *sysmem, +MemoryRegion *secure_sysmem) { -/* Create two flash devices to fill the VIRT_FLASH space in the memmap. -* Any file passed via -bios goes in the first of these. +/* +* Map two flash devices to fill the VIRT_FLASH space in the memmap. * sysmem is the system memory space. secure_sysmem is the secure view * of the system, and the first flash device should be made visible only * there. The second flash device is visible to both secure and nonsecure. @@ -941,13 +936,21 @@ static void create_flash(const VirtMachineState *vms,*/ hwaddr flashsize = vms->memmap[VIRT_FLASH ].size /2 ;hwaddr flashbase = vms->memmap[VIRT_FLASH ].base; + +virt_flash_map1 (vms->flash[0 ], flashbase, flashsize, + secure_sysmem); +virt_flash_map1 (vms->flash[1 ], flashbase + flashsize, flashsize, + sysmem); +} + +static void virt_flash_fdt (VirtMachineState *vms, +MemoryRegion *sysmem, +MemoryRegion *secure_sysmem) +{ +hwaddr flashsize = vms->memmap[VIRT_FLASH ].size /2 ; +hwaddr flashbase = vms->memmap[VIRT_FLASH ].base;char *nodename; -create_one_flash ("virt.flash0" , flashbase, flashsize, - bios_name, secure_sysmem); -create_one_flash ("virt.flash1" , flashbase + flashsize, flashsize, -NULL , sysmem); -if (sysmem == secure_sysmem) {/* Report both flash devices as a single node in the DT */ nodename =g_strdup_printf ("/flash@%" PRIx64, flashbase);@@ -959,7 +962,8 @@ static void create_flash(const VirtMachineState *vms,qemu_fdt_setprop_cell (vms->fdt, nodename,"bank-width" ,4 );g_free (nodename); }else { -/* Report the devices as separate nodes so we can mark one as +/* +* Report the devices as separate nodes so we can mark one as * only visible to the secure world. */ nodename =g_strdup_printf ("/secflash@%" PRIx64, flashbase);@@ -982,6 +986,48 @@ static void create_flash(const VirtMachineState *vms, } } +static bool virt_firmware_init (VirtMachineState *vms, +MemoryRegion *sysmem, +MemoryRegion *secure_sysmem) +{ +BlockBackend *pflash_blk0; + +pflash_cfi01_legacy_drive (vms->flash,ARRAY_SIZE (vms->flash)); +virt_flash_map (vms, sysmem, secure_sysmem); + + pflash_blk0 =pflash_cfi01_get_blk (vms->flash[0 ]); + +if (bios_name) { +char *fname; +MemoryRegion *mr; +int image_size; + +if (pflash_blk0) { +error_report ("The contents of the first flash device may be " +"specified with -bios or with -drive if=pflash... " +"but you cannot use both options at once" ); +exit (1 ); + } + +/* Fall back to -bios */ + + fname =qemu_find_file (QEMU_FILE_TYPE_BIOS , bios_name); +if (!fname) { +error_report ("Could not find ROM image '%s'" , bios_name); +exit (1 ); + } + mr =sysbus_mmio_get_region (SYS_BUS_DEVICE (vms->flash[0 ]),0 ); + image_size =load_image_mr (fname, mr); +g_free (fname); +if (image_size <0 ) { +error_report ("Could not load ROM image '%s'" , bios_name); +exit (1 ); + } + } + +return pflash_blk0 || bios_name; +} +static FWCfgState *create_fw_cfg (const VirtMachineState *vms,AddressSpace *as) {hwaddr base = vms->memmap[VIRT_FW_CFG ].base;@@ -1421,7 +1467,7 @@ static void machvirt_init(MachineState *machine)MemoryRegion *secure_sysmem =NULL ;int n, virt_max_cpus;MemoryRegion *ram =g_new (MemoryRegion,1 ); -bool firmware_loaded = bios_name ||drive_get (IF_PFLASH ,0 ,0 ); +bool firmware_loaded;bool aarch64 = true;/* @@ -1460,6 +1506,27 @@ static void machvirt_init(MachineState *machine)exit (1 ); } +if (vms->secure) { +if (kvm_enabled ()) { +error_report ("mach-virt: KVM does not support Security extensions" ); +exit (1 ); + } + +/* +* The Secure view of the world is the same as the NonSecure, +* but with a few extra devices. Create it as a container region +* containing the system memory at low priority; any secure-only +* devices go in at higher priority and take precedence. +*/ + secure_sysmem =g_new (MemoryRegion,1 ); + memory_region_init(secure_sysmem, OBJECT(machine), "secure-memory",hw/arm/virt.c static void machvirt_init(MachineState *machine) · line 1532
Quoted 10 lines
hw/arm/virt.c +7
-0+ UINT64_MAX); +memory_region_add_subregion_overlap (secure_sysmem,0 , sysmem,-1 ); + } + + firmware_loaded =virt_firmware_init (vms, sysmem, + secure_sysmem ?: sysmem); +/* If we have an EL3 boot ROM then the assumption is that it will * implement PSCI itself, so disable QEMU's internal implementation * so it doesn't get in the way. Instead of starting secondary Namely, at this point, I seem to understand that we have to hoist this "
vms->secure" block here, because:Quoted 1 line
- below (not seen in the context), we have a condition on "
firmware_loaded",Correct.
Quoted 2 lines
- "
firmware_loaded" *now* depends on "secure_sysmem" (it used not to, before)Correct again.
Before the patch, we have
bool firmware_loaded = bios_name || drive_get(IF_PFLASH, 0, 0);
Quoted 8 lines
Quoted 2 lines
which really means "-bios or -drive if=pflash,unit=0 given". If true,
create_flash()below will surely put firmware into the first flash chip.OK, so here I almost challenged you, "that's not what
create_flash()does" -- but then I looked more closely, andcreate_flash()does callcreate_one_flash()*once* with (file =bios_name), and thencreate_one_flash()does mess withIF_PFLASH, partly dependent on "file" being non-NULL...
Correct.
Quoted 2 lines
I guess what's stunning me the most is how baroque this code is, relative to the x86 version,
I wouldn't call it more baroque, just differently baroque. The x86 version was at least as difficult to update, mostly due to an even more special -bios (ROM vs. flash), and the funky flash chip sizing.
Quoted 53 lines
intermixed with FDT management and secure
world and stuff. Obviously I have *contributed* to its complexity, because "firmware_loaded" comes from me, IIRC. :/ No wonder I don't understand your patch: I don't understand the pre-patch code.Quoted 13 lines
Afterwards, predicting "will put firmware" is more complex. Instead of coding up a prediction of what create_flash()'s replacement
virt_firmware_init()is going to do, I havevirt_firmware_init()return what it did:
firmware_loaded= virt_firmware_init(vms, sysmem,
secure_sysmem?: sysmem);Naturally, I have to do this before
firmware_loadedis used. So create_flash()'s replacementvirt_firmware_init()moves up right before the first use offirmware_loaded. On its way, ...Quoted 5 lines
Quoted 2 lines
- and "
secure_sysmem" depends on the "vms->secure" block that we're moving up here.... it bumps into the computation of
secure_sysmem, and pushes it up, too.OK.
Quoted 27 lines
Quoted 8 lines
And that's where I grind to a halt, because I don't understand what the old functions are responsible for exactly, and how the responsibilities are now re-distributed, between the new functions.
I tried to look at this patch with full function context, and I also tried to look at the full file (pre vs. post) through a colorized side-by-side diff. To no use.
Quoted 7 lines
Now, I'm not saying this is a fault with the patch. It's entirely possible that the goal can only be achieved with such a "rewrite". I think it plausible that the patch cannot be done in multiple smaller patches, especially if we consider bisectability a requirement. (Maybe splitting the patch to smaller logical steps would be possible if we accepted halfway constructed and/or orphan objects, mid-series, that build and cause no issues at runtime. I don't know.)
Maybe it's possible, period.
Quoted 8 lines
So it's *my* fault -- it's like the code is sliced into small bits and then reshuffled to a new story, and I can't follow the bits' dance.
Can you add two high-level call trees, side-by-side, to the commit message, not just with function names but also with responsibilities?
I guess I won't ask for arrows from the left to the right :) I'll try to draw them myself.
Quoted 8 lines
Quoted 1 line
Before the patch:
(ahh, fantastic. This is awesome. Thank you for it.
Whining a bit in parentheses: why oh why do we call heavy-weight functions like
qdev_create()as part of local variable initialization? My eyes are by now used to edk2 code mostly, and there, local variable initialization is *forbidden*, you can't even assign constants)
Uh, where did you throw out the bathwater? I think we're short one baby.
Quoted 10 lines
Quoted 8 lines
main()
machine_run_board_init()
machvirt_init()[method .init()]
create_flash()
create_one_flash()for flash[0]
create
configure
includes obeying -drive if=pflash,unit=0I guess that's the
qdev_prop_set_drive()part
Exactly.
Quoted 5 lines
Quoted 2 lines
realize
map... not even an empty line between the last
qdev_prop_set_string()andqdev_init_nofail()...
An empty line would eat more than 4% of my vt220!
Quoted 9 lines
Quoted 5 lines
fall back to -bios
create_one_flash()for flash[1]
create
configure
includes obeying -drive if=pflash,unit=1nice, the "1" in flash[1] comes from
create_flash(), i.e., the caller, but "unit=1" forqdev_prop_set_drive()comes from...drive_get_next()in the variable initializer? :)
In my opinion, drive_get_next() should be taken out and shot.
Quoted 28 lines
... and then the bios-handling code at the bottom nonetheless uses
drive_get(), with an explicit unit number? ;)(I'm not mocking the code, I'm laughing at myself: for brazenly attempting to "skim" this code before)
Quoted 5 lines
realize
map
update FDTAll the action is in
create_flash().Awesome. Thanks!
Quoted 5 lines
Creating onboard devices in the machine's .init() method is common, but that doesn't make it right. By the time .init() runs, we're long done with setting properties. So anything we create that late cannot expose properties.
Ahh, this is a recurring topic. I remember this from a recent downstream review.
Quoted 5 lines
The proper place to create onboard devices is
.instance_init(). This is why I need to split upcreate_flash().After the patch:
Quoted 8 lines
Quoted 6 lines
main()
current_machine=object_new()
...
virt_instance_init()[method .instance_init()]
virt_flash_create()
virt_flash_create1()for flash[0](typo:
virt_pflash_create1)
Yes. Maybe I should ditch that 'p'.
Quoted 11 lines
Quoted 1 line
create
(easier to read now! at least
qdev_create()stands reasonably isolated)Quoted 3 lines
configure: set defaults
become child of machine
add machine prop pflash0 as alias for drivebeautiful (I've applied your patch and am reading the source in parallel to your road signs)
Quoted 8 lines
Quoted 5 lines
virt_flash_create1()for flash[1]
create
configure: set defaults
become child of machine [NEW]
add machine prop pflash1 as alias for drive [NEW]the [NEW] markers apply to the same steps in the invocation with flash[0] too, don't they?
Yes (editing accident).
Quoted 4 lines
Quoted 1 line
for all machine props:
machine_set_property()uhoh, I got lost a bit here, but according to the source, I think you meant "for all machine properties from the *command line*"
Yes. These two lines in main():
machine_opts = qemu_get_machine_opts();
qemu_opt_foreach(machine_opts, machine_set_property, current_machine,
&error_fatal);Quoted 12 lines
Quoted 5 lines
...
property_set_alias()for machine props pflash0, pflash1
...
set_drive()for cfi.pflash01 prop drive
this is how -machine pflash0=... etc setand the magic happens
we've split off and moved to the front:
- creation (defaults only)
- configuration
Quoted 7 lines
we added, as new:
- parenting both chips to the machine, not the unattached dump
- aliases to both chips' drive properties, by corresponding machine propertiesand normal machine property parsing from the cmldine ended up setting the drives. Yay!
Exactly!
Quoted 7 lines
we still need:
- configuration (non-defaults)
- realize (per flash)
- map (per flash)
- update FDT (single node for both chips, as long as there's no "secure" flash)
Quoted 8 lines
Quoted 4 lines
machine_run_board_init(current_machine); virt_firmware_init() pflash_cfi01_legacy_drive() legacy -drive if=pflash,unit=0 and =1 [NEW]OK, so this is where we turn the old style options into those machine type properties that were *not* set on the cmdline, and hence not recognized by the "for all machine props: ..." logic, in
main()
Yes.
Quoted 25 lines
Quoted 5 lines
virt_flash_map() virt_flash_map1() for flash[0] configure: num-blocks realize mapdefinitely easier to read -- the function body is smaller (and I'm starting to get the hang of it too)
Quoted 5 lines
virt_flash_map1()for flash[1]
configure: num-blocks realize
map
fall back to -biosThis was really thick, but I chewed my way through it!
Quoted 4 lines
virt_flash_fdt()
update FDTHope this helps!
I've spent more two hours on reading your email, the source code, and writing my stupid little comments, and it's been a blast.
Quoted 7 lines
I'm sold on the patch. I still don't feel like I'm an authority on it, so I can't offer an R-b, but I'm happy to give
Acked-by Laszlo Ersek <[email protected]>on one condition: I beg you to include the before-after call trees in the commit message. :)
Can do; long commit messages are my specialty ;)
Quoted 3 lines
... Today's not been in vain! :)
You rock,
/me bows
Thank you!
To write all this, I had to re-read my code, and realized I dislike my pflash_cfi01_legacy_drive(). I think I can make it a bit neater for v2.
[...]