July 2018 - SeaBIOS - mail.coreboot.org

[PATCH] virtio-blk/scsi: enable multi-queues support when starting device

by Changpeng Liu

QEMU will not start all the queues since commit fb20fbb76 "vhost: avoid to start/stop virtqueue which is not read", because seabios only use one queue when starting, this will not work for some vhost slave targets which expect the exact number of queues defined in virtio-pci configuration space, while here, we also enable those queues in the BIOS phase. Signed-off-by: Changpeng Liu <changpeng.liu(a)intel.com> --- src/hw/virtio-blk.c | 26 +++++++++++++++++++------- src/hw/virtio-ring.h | 1 + src/hw/virtio-scsi.c | 28 +++++++++++++++++++--------- 3 files changed, 39 insertions(+), 16 deletions(-) diff --git a/src/hw/virtio-blk.c b/src/hw/virtio-blk.c index 88d7e54..79638ec 100644 --- a/src/hw/virtio-blk.c +++ b/src/hw/virtio-blk.c @@ -25,7 +25,7 @@ struct virtiodrive_s { struct drive_s drive; - struct vring_virtqueue *vq; + struct vring_virtqueue *vq[MAX_NUM_QUEUES]; struct vp_device vp; }; @@ -34,7 +34,7 @@ virtio_blk_op(struct disk_op_s *op, int write) { struct virtiodrive_s *vdrive = container_of(op->drive_fl, struct virtiodrive_s, drive); - struct vring_virtqueue *vq = vdrive->vq; + struct vring_virtqueue *vq = vdrive->vq[0]; struct virtio_blk_outhdr hdr = { .type = write ? VIRTIO_BLK_T_OUT : VIRTIO_BLK_T_IN, .ioprio = 0, @@ -96,6 +96,7 @@ virtio_blk_process_op(struct disk_op_s *op) static void init_virtio_blk(void *data) { + u32 i, num_queues = 1; struct pci_device *pci = data; u8 status = VIRTIO_CONFIG_S_ACKNOWLEDGE | VIRTIO_CONFIG_S_DRIVER; dprintf(1, "found virtio-blk at %pP\n", pci); @@ -109,10 +110,6 @@ init_virtio_blk(void *data) vdrive->drive.cntl_id = pci->bdf; vp_init_simple(&vdrive->vp, pci); - if (vp_find_vq(&vdrive->vp, 0, &vdrive->vq) < 0 ) { - dprintf(1, "fail to find vq for virtio-blk %pP\n", pci); - goto fail; - } if (vdrive->vp.use_modern) { struct vp_device *vp = &vdrive->vp; @@ -156,6 +153,11 @@ init_virtio_blk(void *data) vp_read(&vp->device, struct virtio_blk_config, heads); vdrive->drive.pchs.sector = vp_read(&vp->device, struct virtio_blk_config, sectors); + + num_queues = vp_read(&vp->common, virtio_pci_common_cfg, num_queues); + if (num_queues < 1 || num_queues > MAX_NUM_QUEUES) { + num_queues = 1; + } } else { struct virtio_blk_config cfg; vp_get_legacy(&vdrive->vp, 0, &cfg, sizeof(cfg)); @@ -178,6 +180,13 @@ init_virtio_blk(void *data) vdrive->drive.pchs.sector = cfg.sectors; } + for (i = 0; i < num_queues; i++) { + if (vp_find_vq(&vdrive->vp, i, &vdrive->vq[i]) < 0 ) { + dprintf(1, "fail to find vq %u for virtio-blk %pP\n", i, pci); + goto fail_vq; + } + } + char *desc = znprintf(MAXDESCSIZE, "Virtio disk PCI:%pP", pci); boot_add_hd(&vdrive->drive, desc, bootprio_find_pci_device(pci)); @@ -185,9 +194,12 @@ init_virtio_blk(void *data) vp_set_status(&vdrive->vp, status); return; +fail_vq: + for (i = 0; i < num_queues; i++) { + free(vdrive->vq[i]); + } fail: vp_reset(&vdrive->vp); - free(vdrive->vq); free(vdrive); } diff --git a/src/hw/virtio-ring.h b/src/hw/virtio-ring.h index 8604a01..3c8a2d1 100644 --- a/src/hw/virtio-ring.h +++ b/src/hw/virtio-ring.h @@ -21,6 +21,7 @@ #define VIRTIO_F_IOMMU_PLATFORM 33 #define MAX_QUEUE_NUM (128) +#define MAX_NUM_QUEUES (128) #define VRING_DESC_F_NEXT 1 #define VRING_DESC_F_WRITE 2 diff --git a/src/hw/virtio-scsi.c b/src/hw/virtio-scsi.c index a87cad8..d08643f 100644 --- a/src/hw/virtio-scsi.c +++ b/src/hw/virtio-scsi.c @@ -148,9 +148,10 @@ virtio_scsi_scan_target(struct pci_device *pci, struct vp_device *vp, static void init_virtio_scsi(void *data) { + u32 i, num_queues = 3; struct pci_device *pci = data; dprintf(1, "found virtio-scsi at %pP\n", pci); - struct vring_virtqueue *vq = NULL; + struct vring_virtqueue *vq[MAX_NUM_QUEUES]; struct vp_device *vp = malloc_high(sizeof(*vp)); if (!vp) { warn_noalloc(); @@ -175,29 +176,38 @@ init_virtio_scsi(void *data) dprintf(1, "device didn't accept features: %pP\n", pci); goto fail; } + + num_queues = vp_read(&vp->common, virtio_pci_common_cfg, num_queues); + if (num_queues < 3 || num_queues > MAX_NUM_QUEUES) { + num_queues = 3; + } } - if (vp_find_vq(vp, 2, &vq) < 0 ) { - dprintf(1, "fail to find vq for virtio-scsi %pP\n", pci); - goto fail; + for (i = 0; i < num_queues; i++) { + if (vp_find_vq(vp, i, &vq[i]) < 0 ) { + dprintf(1, "fail to find vq %u for virtio-scsi %pP\n", i, pci); + goto fail; + } } status |= VIRTIO_CONFIG_S_DRIVER_OK; vp_set_status(vp, status); - int i, tot; + int tot; for (tot = 0, i = 0; i < 256; i++) - tot += virtio_scsi_scan_target(pci, vp, vq, i); + tot += virtio_scsi_scan_target(pci, vp, vq[2], i); if (!tot) - goto fail; + goto fail_vq; return; - +fail_vq: + for (i = 0; i < num_queues; i++) { + free(vq[i]); + } fail: vp_reset(vp); free(vp); - free(vq); } void -- 1.9.3

1 year, 6 months

1
0
0 0

[PATCH 1/2] nvme: add option to toggle probing only boot devices

by Julian Stecklina

Some systems have a large number of NVMe controllers. Probing all of them requires an excessive amount of memory and with out-of-order probing this also means that the important ones will not be probed, because SeaBIOS runs out of memory. Add an option to skip probing of NVMe devices, if there is no boot priority for them. Signed-off-by: Julian Stecklina <jsteckli(a)amazon.de> --- src/Kconfig | 8 ++++++++ src/hw/nvme.c | 14 +++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/Kconfig b/src/Kconfig index 55a87cb..ef8f458 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -233,6 +233,14 @@ menu "Hardware support" default y help Support for NVMe disk code. + config NVME_PROBE_BOOTDEVICES_ONLY + depends on NVME + bool "Only probe NVMe controllers with boot priority" + default n + help + Only enables NVMe controllers that have a boot priority + configured. This saves memory on systems with many non-bootable + NVMe devices. config PS2PORT depends on KEYBOARD || MOUSE diff --git a/src/hw/nvme.c b/src/hw/nvme.c index e6d739d..5525f68 100644 --- a/src/hw/nvme.c +++ b/src/hw/nvme.c @@ -625,6 +625,16 @@ nvme_controller_setup(void *opaque) dprintf(2, "Failed to enable NVMe controller.\n"); } + +static int should_setup_controller(struct pci_device *pci) +{ +#ifdef NVME_PROBE_BOOTDEVICES_ONLY + return bootprio_find_pci_device(pci) >= 0; +#else + return 1; +#endif +} + // Locate and init NVMe controllers static void nvme_scan(void) @@ -640,7 +650,9 @@ nvme_scan(void) continue; } - run_thread(nvme_controller_setup, pci); + if (should_setup_controller(pci)) { + run_thread(nvme_controller_setup, pci); + } } } -- 2.7.4

1 year, 6 months

4
7
0 0

[PATCH 0/7] seabios: 1.11.2 update

by Gerd Hoffmann

Hi folks, So, here is the current state of the seabios update for the upcoming qemu 3.0 release. This time it is a bit more than just the usual "update submodule and binaries". seabios 1.11.2 is not released yet. The plan is to cherry-pick the changes needed to support the new qemu 3.0 display devices (bochs-display and ramfb) into the 1.11-stable branch for the 1.11.2 release. Current state is here: https://git.kraxel.org/cgit/seabios/log/?h=1.11-stable-testing Changes in this patch series: - seabios submodule update (to the testing branch). - new vgabios configs for bochs-display and ramfb. - update the bios config to enables ide dma (for qnx). - drop (old) vgabios submodule and build rules. - seabios binary update. - make bochs-display and ramfb load the new vgabios roms. Git branch for this series is here: https://git.kraxel.org/cgit/qemu/log/?h=seabios-1.11.2 cheers, Gerd Gerd Hoffmann (7): seabios: update submodule to 1.11.2-testing seabios: add vga configs for bochs-display and ramfb seabios: enable ide dma vgabios: remove submodule and build rules. seabios: update binaries bochs-display: enable vgabios ramfb: enable vgabios hw/display/bochs-display.c | 1 + hw/display/ramfb.c | 1 + .gitmodules | 3 --- pc-bios/bios-256k.bin | Bin 262144 -> 262144 bytes pc-bios/bios.bin | Bin 131072 -> 131072 bytes pc-bios/vgabios-cirrus.bin | Bin 38400 -> 38400 bytes pc-bios/vgabios-qxl.bin | Bin 38912 -> 38912 bytes pc-bios/vgabios-stdvga.bin | Bin 38912 -> 38912 bytes pc-bios/vgabios-virtio.bin | Bin 38912 -> 38912 bytes pc-bios/vgabios-vmware.bin | Bin 38912 -> 38912 bytes pc-bios/vgabios.bin | Bin 38400 -> 38400 bytes roms/Makefile | 20 +++----------------- roms/config.seabios-128k | 1 + roms/config.seabios-256k | 1 + roms/config.vga-bochs-display | 3 +++ roms/config.vga-ramfb | 3 +++ roms/seabios | 2 +- roms/vgabios | 1 - 18 files changed, 14 insertions(+), 22 deletions(-) create mode 100644 roms/config.vga-bochs-display create mode 100644 roms/config.vga-ramfb delete mode 160000 roms/vgabios -- 2.9.3

1 year, 7 months

1
7
0 0

seabios issue

by Roger Lawhorn

Hello, Recently my qemu with gpu passthrough setup quit working. I think it is seabios related. i have turned on debugging for seabios. Here is the output from seabios from a successful windows 10 boot using an emulated vga adapter: https://pastebin.com/f3DCqTbc Here is the output when using my nvidia gtx 880m 8gb gaming card: https://pastebin.com/GpWKZadh when seabios runs the option rom for nvidia it just halts. i have never debuged seabios before so i dont know what would normally show up at this point. i.e. is this normal or is something wrong. during the vga boot all 8 cpus go to 100% for a short time then drop. during the failed boot with nvidia 1 cpu goes to 100% and stays there forever. i have let it run all night at times. i am seeking to figure out if i have a seabios issue. i am running linux mint 18.3 and the repo copy of seabios is 1.8.2. i have booted this 100's of times and never had an issue before. thanks

1 year, 7 months

2
2
0 0

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS July 2018