nvme small fix
v2 cover nvme small fix
This patchset contains small fix.
Change since v1:
1. drop the patch of checking return value of msix_init_exclusive_bar
2. return when nvme's num_queues configuration is 0
Li Qiang (3):
nvme: use TYPE_NVME instead of constant string
nvme: ensure the num_queues is not zero
nvme: use pci_dev directly in nvme_realize
hw/block/nvme.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/3 nvme: use TYPE_NVME instead of constant string
--- hw/block/nvme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/block/nvme.c +1 -1
@@ -1381,7 +1381,7 @@ static void nvme_instance_init(Object *obj) }static const TypeInfo nvme_info = { - .name ="nvme" , + .name =TYPE_NVME , .parent =TYPE_PCI_DEVICE , .instance_size =sizeof (NvmeCtrl), .class_init = nvme_class_init,
Signature · 1 line
2.17.1
PATCH v2 2/3 nvme: ensure the num_queues is not zero
In reply to Li QiangWhen it is zero, it causes segv. Backtrack:
Thread 5 "qemu-system-x86" received signal SIGSEGV, Segmentation fault. [Switching to Thread 0x7fffc6c17700 (LWP 51808)] 0x0000555555acbd90 in nvme_start_ctrl (n=0x6240000c8100) at hw/block/nvme.c:820
warning: Source file is more recent than executable.
820 if (unlikely(n->cq[0])) {
(gdb) bt
0 0x0000555555acbd90 in nvme_start_ctrl (n=0x6240000c8100) at hw/block/nvme.c:820 1 0x0000555555accdbc in nvme_write_bar (n=0x6240000c8100, offset=20, data=4587521, size=4) at hw/block/nvme.c:964 2 0x0000555555acdd2b in nvme_mmio_write (opaque=0x6240000c8100, addr=20, data=4587521, size=4) at hw/block/nvme.c:1158 3 0x00005555558973ed in memory_region_write_accessor (mr=0x6240000c89e0, addr=20, value=0x7fffc6c14428, size=4, shift=0, mask=4294967295, attrs=...) at /home/liqiang02/qemu-upstream/qemu/memory.c:500 4 0x0000555555897600 in access_with_adjusted_size (addr=20, value=0x7fffc6c14428, size=4, access_size_min=2, access_size_max=8, access_fn=0x555555897304 <memory_region_write_accessor>, mr=0x6240000c89e0, attrs=...) at /home/liqiang02/qemu-upstream/qemu/memory.c:566 5 0x000055555589a200 in memory_region_dispatch_write (mr=0x6240000c89e0, addr=20, data=4587521, size=4, attrs=...) at /home/liqiang02/qemu-upstream/qemu/memory.c:1442 6 0x0000555555835151 in flatview_write_continue (fv=0x6060000e6fc0, addr=4273930260, attrs=..., buf=0x7fffc8a18028 "\001", len=4, addr1=20, l=4, mr=0x6240000c89e0) at /home/liqiang02/qemu-upstream/qemu/exec.c:3233 7 0x000055555583529b in flatview_write (fv=0x6060000e6fc0, addr=4273930260, attrs=..., buf=0x7fffc8a18028 "\001", len=4) at /home/liqiang02/qemu-upstream/qemu/exec.c:3272 8 0x00005555558355a1 in address_space_write (as=0x55555683ade0 <address_space_memory>, addr=4273930260, attrs=..., buf=0x7fffc8a18028 "\001", len=4) at /home/liqiang02/qemu-upstream/qemu/exec.c:3362 9 0x00005555558355f2 in address_space_rw (as=0x55555683ade0 <address_space_memory>, addr=4273930260, attrs=..., buf=0x7fffc8a18028 "\001", len=4, is_write=true) at /home/liqiang02/qemu-upstream/qemu/exec.c:3373
10 0x00005555558b66ac in kvm_cpu_exec (cpu=0x631000014800) at /home/liqiang02/qemu-upstream/qemu/accel/kvm/kvm-all.c:2031 11 0x000055555587c3ac in qemu_kvm_cpu_thread_fn (arg=0x631000014800) at /home/liqiang02/qemu-upstream/qemu/cpus.c:1277 12 0x0000555555e54ae6 in qemu_thread_start (args=0x60300002c170) at util/qemu-thread-posix.c:504
13 0x00007fffdadbd494 in start_thread () from /lib/x86_64-linux-gnu/libpthread.so.0
14 0x00007fffdaaffacf in clone () from /lib/x86_64-linux-gnu/libc.so.6
(gdb) q
--- hw/block/nvme.c | 5 +++++ 1 file changed, 5 insertions(+)
hw/block/nvme.c +5 -0
@@ -1223,6 +1223,11 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)error_setg (errp,"serial property not set" );return ; } + +if (!n->num_queues) { +error_setg (errp,"num_queues can't be zero" ); +return ; + }blkconf_blocksizes (&n->conf);if (!blkconf_apply_backend_options (&n->conf,blk_is_read_only (n->conf.blk), false, errp)) {
Signature · 1 line
2.17.1
PATCH v2 3/3 nvme: use pci_dev directly in nvme_realize
In reply to Li QiangThere is no need to make another reference.
--- hw/block/nvme.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
hw/block/nvme.c +4 -4
@@ -1238,7 +1238,7 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) pci_conf[PCI_INTERRUPT_PIN ] =1 ;pci_config_set_prog_interface (pci_dev->config,0x2 );pci_config_set_class (pci_dev->config,PCI_CLASS_STORAGE_EXPRESS ); -pcie_endpoint_cap_init (&n->parent_obj,0x80 ); +pcie_endpoint_cap_init (pci_dev,0x80 ); n->num_namespaces =1 ; n->reg_size =pow2ceil (0x1004 +2 * (n->num_queues +1 ) *4 );
@@ -1250,10 +1250,10 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)memory_region_init_io (&n->iomem,OBJECT (n), &nvme_mmio_ops, n,"nvme" , n->reg_size); -pci_register_bar (&n->parent_obj,0 , +pci_register_bar (pci_dev,0 ,PCI_BASE_ADDRESS_SPACE_MEMORY |PCI_BASE_ADDRESS_MEM_TYPE_64 , &n->iomem); -msix_init_exclusive_bar (&n->parent_obj, n->num_queues,4 ,NULL ); +msix_init_exclusive_bar (pci_dev, n->num_queues,4 ,NULL ); id->vid =cpu_to_le16 (pci_get_word (pci_conf +PCI_VENDOR_ID )); id->ssvid =cpu_to_le16 (pci_get_word (pci_conf +PCI_SUBSYSTEM_VENDOR_ID ));
@@ -1308,7 +1308,7 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) n->cmbuf =g_malloc0 (NVME_CMBSZ_GETSIZE (n->bar.cmbsz));memory_region_init_io (&n->ctrl_mem,OBJECT (n), &nvme_cmb_ops, n,"nvme-cmb" ,NVME_CMBSZ_GETSIZE (n->bar.cmbsz)); -pci_register_bar (&n->parent_obj,NVME_CMBLOC_BIR (n->bar.cmbloc), +pci_register_bar (pci_dev,NVME_CMBLOC_BIR (n->bar.cmbloc),PCI_BASE_ADDRESS_SPACE_MEMORY |PCI_BASE_ADDRESS_MEM_TYPE_64 |PCI_BASE_ADDRESS_MEM_PREFETCH , &n->ctrl_mem);
Signature · 1 line
2.17.1
Re: [Qemu-devel] [PATCH v2 1/3] nvme: use TYPE_NVME instead of constant string
In reply to Li QiangQuoted 2 lines · Li Qiang
Signed-off-by Li Qiang <[email protected]>Reviewed-by Max Reitz <[email protected]>
Quoted 18 lines
--- hw/block/nvme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/block/nvme.c +1
-1@@ -1381,7 +1381,7 @@ static void nvme_instance_init(Object *obj) }static const TypeInfo nvme_info = { - .name ="nvme" , + .name =TYPE_NVME , .parent =TYPE_PCI_DEVICE , .instance_size =sizeof (NvmeCtrl), .class_init = nvme_class_init,
Re: [Qemu-devel] [PATCH v2 2/3] nvme: ensure the num_queues is not zero
In reply to Li QiangHi Li,
Quoted 2 lines · Li Qiang
When it is zero, it causes segv. Backtrack:
Thread 5 "qemu-system-x86" received signal SIGSEGV, Segmentation fault.
Can you add the relevant part of the command line you used here?
Quoted 3 lines
[Switching to Thread
0x7fffc6c17700(LWP 51808)]0x0000555555acbd90innvme_start_ctrl(n=0x6240000c8100) athw/block/nvme.c:820
warning: Source file is more recent than executable.
^ drop this line
Quoted 29 lines
820 if (
unlikely(n->cq[0])) {
(gdb) bt0 0x0000555555acbd90 in nvme_start_ctrl (n=0x6240000c8100) at hw/block/nvme.c:820 1 0x0000555555accdbc in nvme_write_bar (n=0x6240000c8100, offset=20, data=4587521, size=4) at hw/block/nvme.c:964 2 0x0000555555acdd2b in nvme_mmio_write (opaque=0x6240000c8100, addr=20, data=4587521, size=4) at hw/block/nvme.c:1158 3 0x00005555558973ed in memory_region_write_accessor (mr=0x6240000c89e0, addr=20, value=0x7fffc6c14428, size=4, shift=0, mask=4294967295, attrs=...) at /home/liqiang02/qemu-upstream/qemu/memory.c:500 4 0x0000555555897600 in access_with_adjusted_size (addr=20, value=0x7fffc6c14428, size=4, access_size_min=2, access_size_max=8, access_fn=0x555555897304 <memory_region_write_accessor>, mr=0x6240000c89e0, attrs=...) at /home/liqiang02/qemu-upstream/qemu/memory.c:566 5 0x000055555589a200 in memory_region_dispatch_write (mr=0x6240000c89e0, addr=20, data=4587521, size=4, attrs=...) at /home/liqiang02/qemu-upstream/qemu/memory.c:1442 6 0x0000555555835151 in flatview_write_continue (fv=0x6060000e6fc0, addr=4273930260, attrs=..., buf=0x7fffc8a18028 "\001", len=4, addr1=20, l=4, mr=0x6240000c89e0) at /home/liqiang02/qemu-upstream/qemu/exec.c:3233 7 0x000055555583529b in flatview_write (fv=0x6060000e6fc0, addr=4273930260, attrs=..., buf=0x7fffc8a18028 "\001", len=4) at /home/liqiang02/qemu-upstream/qemu/exec.c:3272 8 0x00005555558355a1 in address_space_write (as=0x55555683ade0 <address_space_memory>, addr=4273930260, attrs=..., buf=0x7fffc8a18028 "\001", len=4) at /home/liqiang02/qemu-upstream/qemu/exec.c:3362 9 0x00005555558355f2 in address_space_rw (as=0x55555683ade0 <address_space_memory>, addr=4273930260, attrs=..., buf=0x7fffc8a18028 "\001", len=4, is_write=true) at /home/liqiang02/qemu-upstream/qemu/exec.c:337310
0x00005555558b66acinkvm_cpu_exec(cpu=0x631000014800) at/home/liqiang02/qemu-upstream/qemu/accel/kvm/kvm-all.c:2031110x000055555587c3acinqemu_kvm_cpu_thread_fn(arg=0x631000014800) at/home/liqiang02/qemu-upstream/qemu/cpus.c:1277120x0000555555e54ae6inqemu_thread_start(args=0x60300002c170) atutil/qemu-thread-posix.c:504
130x00007fffdadbd494instart_thread() from/lib/x86_64-linux-gnu/libpthread.so.0
140x00007fffdaaffacfin clone () from/lib/x86_64-linux-gnu/libc.so.6
(gdb) qSigned-off-by Li Qiang <[email protected]>--- hw/block/nvme.c | 5 +++++ 1 file changed, 5 insertions(+)hw/block/nvme.c +0
-0
hw/block/nvme.c static void nvme_realize(PCIDevice *pci_dev, Error **errp) · line 1230
Quoted 8 lines
hw/block/nvme.c +5
-0@@ -1223,6 +1223,11 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)error_setg (errp,"serial property not set" );return ; } + +if (!n->num_queues) { +error_setg (errp,"num_queues can't be zero" ); +return ; + }
I'd add this as the first check, to avoid the blk_getlength() call.
hw/block/nvme.c static void nvme_realize(PCIDevice *pci_dev, Error **errp) · line 1233
Quoted 4 lines
hw/block/nvme.c +0
-0blkconf_blocksizes (&n->conf);if (!blkconf_apply_backend_options (&n->conf,blk_is_read_only (n->conf.blk), false, errp)) {
With command line comment:
Re: [Qemu-devel] [PATCH v2 3/3] nvme: use pci_dev directly in nvme_realize
In reply to Li QiangQuoted 4 lines · Li Qiang
There is no need to make another reference.
Signed-off-by Li Qiang <[email protected]>Reviewed-by Max Reitz <[email protected]>
Quoted 40 lines
--- hw/block/nvme.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)hw/block/nvme.c +4
-4@@ -1238,7 +1238,7 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) pci_conf[PCI_INTERRUPT_PIN ] =1 ;pci_config_set_prog_interface (pci_dev->config,0x2 );pci_config_set_class (pci_dev->config,PCI_CLASS_STORAGE_EXPRESS ); -pcie_endpoint_cap_init (&n->parent_obj,0x80 ); +pcie_endpoint_cap_init (pci_dev,0x80 ); n->num_namespaces =1 ; n->reg_size =pow2ceil (0x1004 +2 * (n->num_queues +1 ) *4 );@@ -1250,10 +1250,10 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)memory_region_init_io (&n->iomem,OBJECT (n), &nvme_mmio_ops, n,"nvme" , n->reg_size); -pci_register_bar (&n->parent_obj,0 , +pci_register_bar (pci_dev,0 ,PCI_BASE_ADDRESS_SPACE_MEMORY |PCI_BASE_ADDRESS_MEM_TYPE_64 , &n->iomem); -msix_init_exclusive_bar (&n->parent_obj, n->num_queues,4 ,NULL ); +msix_init_exclusive_bar (pci_dev, n->num_queues,4 ,NULL ); id->vid =cpu_to_le16 (pci_get_word (pci_conf +PCI_VENDOR_ID )); id->ssvid =cpu_to_le16 (pci_get_word (pci_conf +PCI_SUBSYSTEM_VENDOR_ID ));@@ -1308,7 +1308,7 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) n->cmbuf =g_malloc0 (NVME_CMBSZ_GETSIZE (n->bar.cmbsz));memory_region_init_io (&n->ctrl_mem,OBJECT (n), &nvme_cmb_ops, n,"nvme-cmb" ,NVME_CMBSZ_GETSIZE (n->bar.cmbsz)); -pci_register_bar (&n->parent_obj,NVME_CMBLOC_BIR (n->bar.cmbloc), +pci_register_bar (pci_dev,NVME_CMBLOC_BIR (n->bar.cmbloc),PCI_BASE_ADDRESS_SPACE_MEMORY |PCI_BASE_ADDRESS_MEM_TYPE_64 |PCI_BASE_ADDRESS_MEM_PREFETCH , &n->ctrl_mem);