nvme: some small fixes
cover nvme: some small fixes
Including sanity check and code cleanup.
Li Qiang (4):
nvme: use TYPE_NVME instead of constant string
nvme: ensure the num_queues is not zero
nvme: check msix_init_exclusive_bar return value
nvme: use pci_dev directly in nvme_realize
hw/block/nvme.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
Signature · 1 line
1.8.3.1
PATCH 1/4 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
@@ -1379,7 +1379,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
1.8.3.1
Re: [Qemu-devel] [PATCH 1/4] nvme: use TYPE_NVME instead of constant string
Quoted 4 lines · Li Qiang
Signed-off-by Li Qiang <[email protected]>--- hw/block/nvme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
PATCH 2/4 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 | 4 ++++ 1 file changed, 4 insertions(+)
hw/block/nvme.c +4 -0
@@ -1221,6 +1221,10 @@ 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" ); + }blkconf_blocksizes (&n->conf);if (!blkconf_apply_backend_options (&n->conf,blk_is_read_only (n->conf.blk), false, errp)) {
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [PATCH 2/4] nvme: ensure the num_queues is not zero
Quoted 34 lines · Li Qiang
When it is zero, it causes segv. Backtrack:
Thread 5 "qemu-system-x86" received signal SIGSEGV, Segmentation fault. [Switching to Thread0x7fffc6c17700(LWP 51808)]0x0000555555acbd90innvme_start_ctrl(n=0x6240000c8100) athw/block/nvme.c:820
warning: Source file is more recent than executable.
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 | 4 ++++ 1 file changed, 4 insertions(+)hw/block/nvme.c +0
-0
hw/block/nvme.c static void nvme_realize(PCIDevice *pci_dev, Error **errp) · line 1226
Quoted 6 lines
hw/block/nvme.c +3
-0@@ -1221,6 +1221,10 @@ 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" );
I think we should return here.
(Sorry for the late review...)
Max
Quoted 5 lines
hw/block/nvme.c +1
-0+ }blkconf_blocksizes (&n->conf);if (!blkconf_apply_backend_options (&n->conf,blk_is_read_only (n->conf.blk), false, errp)) {
Re: [Qemu-devel] [PATCH 2/4] nvme: ensure the num_queues is not zero
Quoted 61 lines · Max Reitz <[email protected]> 于2019年1月9日周三 下午10:38写道:
Quoted 4 lines · Li Qiang
When it is zero, it causes segv. Backtrack:
Thread 5 "qemu-system-x86" received signal SIGSEGV, Segmentation fault. [Switching to Thread0x7fffc6c17700(LWP 51808)]0x0000555555acbd90innvme_start_ctrl(n=0x6240000c8100) at
hw/block/nvme.c:820Quoted 4 lines
warning: Source file is more recent than executable.
820 if (unlikely(n->cq[0])) {
(gdb) bt
00x0000555555acbd90innvme_start_ctrl(n=0x6240000c8100) at
hw/block/nvme.c:820Quoted 1 line
1
0x0000555555accdbcinnvme_write_bar(n=0x6240000c8100, offset=20,data=4587521, size=4) at
hw/block/nvme.c:964Quoted 1 line
2
0x0000555555acdd2binnvme_mmio_write(opaque=0x6240000c8100,addr=20, data=4587521, size=4) at
hw/block/nvme.c:1158Quoted 1 line
3
0x00005555558973edinmemory_region_write_accessor(mr=0x6240000c89e0, addr=20, value=0x7fffc6c14428, size=4, shift=0, mask=4294967295, attrs=...) at
/home/liqiang02/qemu-upstream/qemu/memory.c:500Quoted 1 line
4
0x0000555555897600inaccess_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:566Quoted 1 line
5
0x000055555589a200inmemory_region_dispatch_write(mr=0x6240000c89e0, addr=20, data=4587521, size=4, attrs=...) at
/home/liqiang02/qemu-upstream/qemu/memory.c:1442Quoted 1 line
6
0x0000555555835151inflatview_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:3233Quoted 1 line
7
0x000055555583529binflatview_write(fv=0x6060000e6fc0,addr=4273930260, attrs=..., buf=0x7fffc8a18028 "\001", len=4) at
/home/liqiang02/qemu-upstream/qemu/exec.c:3272Quoted 1 line
8
0x00005555558355a1inaddress_space_write(as=0x55555683ade0<
address_space_memory>, addr=4273930260, attrs=..., buf=0x7fffc8a18028 "\001", len=4) at/home/liqiang02/qemu-upstream/qemu/exec.c:3362Quoted 1 line
9
0x00005555558355f2inaddress_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:3373Quoted 1 line
10
0x00005555558b66acinkvm_cpu_exec(cpu=0x631000014800) at
/home/liqiang02/qemu-upstream/qemu/accel/kvm/kvm-all.c:2031Quoted 1 line
11
0x000055555587c3acinqemu_kvm_cpu_thread_fn(arg=0x631000014800) at
/home/liqiang02/qemu-upstream/qemu/cpus.c:1277Quoted 1 line
12
0x0000555555e54ae6inqemu_thread_start(args=0x60300002c170) at
util/qemu-thread-posix.c:504Quoted 1 line
13
0x00007fffdadbd494instart_thread() from
/lib/x86_64-linux-gnu/libpthread.so.0hw/block/nvme.c static void nvme_realize(PCIDevice *pci_dev,
Quoted 13 lines
14
0x00007fffdaaffacfin clone () from/lib/x86_64-linux-gnu/libc.so.6(gdb) qSigned-off-by Li Qiang <[email protected]>--- hw/block/nvme.c | 4 ++++ 1 file changed, 4 insertions(+)hw/block/nvme.c +0
-0@@ -1221,6 +1221,10 @@ static void nvme_realize(PCIDevice *pci_dev,Error **errp)
Quoted 10 lines
hw/block/nvme.c static void nvme_realize(PCIDevice *pci_dev, Error **errp) · line 1226
Quoted 6 lines
hw/block/nvme.c +3
-0error_setg (errp,"serial property not set" );return ; } + +if (!n->num_queues) { +error_setg (errp,"num_queues can't be zero" );I think we should return here.
Ok, forget this. will make a revised version later.
Thanks,
Li Qiang
Quoted 13 lines
(Sorry for the late review...)
Max
hw/block/nvme.c static void nvme_realize(PCIDevice *pci_dev, Error **errp)
Quoted 3 lines
hw/block/nvme.c +1
-0+ }blkconf_blocksizes (&n->conf); if (!blkconf_apply_backend_options(&n->conf,
blk_is_read_only(n->conf.blk),Quoted 2 lines
hw/block/nvme.c +0
-0false, errp)) {
PATCH 3/4 nvme: check msix_init_exclusive_bar return value
In reply to Li QiangAs this function can fail.
--- hw/block/nvme.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
hw/block/nvme.c +4 -1
@@ -1250,7 +1250,10 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)pci_register_bar (&n->parent_obj,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 ); +if (msix_init_exclusive_bar (&n->parent_obj, n->num_queues,4 ,NULL )) { +error_setg (errp,"msix_init_exclusive_bar failed" ); +return ; + } 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 ));
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [PATCH 3/4] nvme: check msix_init_exclusive_bar return value
Quoted 12 lines · Li Qiang
As this function can fail.
Signed-off-by Li Qiang <[email protected]>--- hw/block/nvme.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)hw/block/nvme.c +0
-0
hw/block/nvme.c static void nvme_realize(PCIDevice *pci_dev, Error **errp) · line 1256
Quoted 8 lines
hw/block/nvme.c +4
-1@@ -1250,7 +1250,10 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)pci_register_bar (&n->parent_obj,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 ); +if (msix_init_exclusive_bar (&n->parent_obj, n->num_queues,4 ,NULL )) { +error_setg (errp,"msix_init_exclusive_bar failed" ); +return ; + }
Commit ee640c625e1 which last touched this function stated that creating this device won't fail if this function fails, so I suppose it's intential that the error isn't checked.
But if you think the error should be checked and device creation should be aborted if this function failed, then I suppose there'd be some cleaning up to instead of just returning.
Also, we should just pass errp to that function (as its last parameter, instead of NULL).
Max
Quoted 4 lines
hw/block/nvme.c +0
-0id->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 ));
Re: [Qemu-devel] [PATCH 3/4] nvme: check msix_init_exclusive_bar return value
Quoted 19 lines · Max Reitz <[email protected]> 于2019年1月9日周三 下午10:52写道:
hw/block/nvme.c static void nvme_realize(PCIDevice *pci_dev,
Quoted 12 lines · Li Qiang
As this function can fail.
Signed-off-by Li Qiang <[email protected]>--- hw/block/nvme.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)hw/block/nvme.c +0
-0@@ -1250,7 +1250,10 @@ static void nvme_realize(PCIDevice *pci_dev,Error **errp)
hw/block/nvme.c static void nvme_realize(PCIDevice *pci_dev, Error **errp)
Quoted 5 lines
hw/block/nvme.c +1
-1pci_register_bar (&n->parent_obj,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 ); + if (msix_init_exclusive_bar(&n->parent_obj, n->num_queues, 4,
Quoted 9 lines
NULL)) {
hw/block/nvme.c static void nvme_realize(PCIDevice *pci_dev, Error **errp) · line 1256
Quoted 3 lines
hw/block/nvme.c +3
-0+error_setg (errp,"msix_init_exclusive_bar failed" ); +return ; + }Commit
ee640c625e1which last touched this function stated that creating this device won't fail if this function fails, so I suppose it's intential that the error isn't checked.
OK, got. I will drop this patch later.
Thanks,
Li Qiang
Quoted 19 lines
But if you think the error should be checked and device creation should be aborted if this function failed, then I suppose there'd be some cleaning up to instead of just returning.
Also, we should just pass errp to that function (as its last parameter, instead of NULL).
Max
hw/block/nvme.c static void nvme_realize(PCIDevice *pci_dev, · line 1258
Quoted 3 lines
hw/block/nvme.c +0
-0id->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));Quoted 1 line
PATCH 4/4 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
@@ -1235,7 +1235,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 );
@@ -1247,10 +1247,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); -if (msix_init_exclusive_bar (&n->parent_obj, n->num_queues,4 ,NULL )) { +if (msix_init_exclusive_bar (pci_dev, n->num_queues,4 ,NULL )) {error_setg (errp,"msix_init_exclusive_bar failed" );return ; }
@@ -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
1.8.3.1
Re: [Qemu-devel] [PATCH 4/4] nvme: use pci_dev directly in nvme_realize
Quoted 6 lines · Li Qiang
There is no need to make another reference.
Signed-off-by Li Qiang <[email protected]>--- hw/block/nvme.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)