nvme-tcp: small cleanup
cover nvme-tcp: small cleanup
Hi,
A small cleanup for host tcp, no functional change, below is the testlog.
-ck
Chaitanya Kulkarni (2):
nvme-tcp: don't initialize ret variable
nvme-tcp: don't fold the line
drivers/nvme/host/tcp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
root@dev nvme (nvme-5.18) # git am p/tcp-cleanup/*patch
Applying: nvme-tcp: don't initialize ret variable
Applying: nvme-tcp: don't fold the line
root@dev nvme (nvme-5.18) # ./compile_nvme.sh
+ umount /mnt/nvme0n1
+ clear_dmesg
./compile_nvme.sh: line 3: clear_dmesg: command not found
umount: /mnt/nvme0n1: no mount point specified.
+ ./delete.sh 1
+ NQN=testnqn
+ nvme disconnect -n testnqn
NQN:testnqn disconnected 0 controller(s)
real 0m0.007s
user 0m0.002s
sys 0m0.000s
+ for i in /sys/kernel/config/nvmet/subsystems/${NQN}/namespaces/*
+ echo 0
./delete.sh: line 9: /sys/kernel/config/nvmet/subsystems/testnqn/namespaces/*/enable: No such file or directory
+ rmdir '/sys/kernel/config/nvmet/subsystems/testnqn/namespaces/*'
rmdir: failed to remove '/sys/kernel/config/nvmet/subsystems/testnqn/namespaces/*': No such file or directory
+ rm -fr /sys/kernel/config/nvmet/ports/1/subsystems/testnqn
+ rmdir /sys/kernel/config/nvmet/ports/1
rmdir: failed to remove '/sys/kernel/config/nvmet/ports/1': No such file or directory
+ rmdir /sys/kernel/config/nvmet/subsystems/testnqn
rmdir: failed to remove '/sys/kernel/config/nvmet/subsystems/testnqn': No such file or directory
+ rmdir 'config/nullb/nullb*'
rmdir: failed to remove 'config/nullb/nullb*': No such file or directory
+ umount /mnt/nvme0n1
umount: /mnt/nvme0n1: no mount point specified.
+ umount /mnt/backend
umount: /mnt/backend: not mounted.
+ modprobe -r nvme_loop
+ modprobe -r nvme_fabrics
+ modprobe -r nvmet
+ modprobe -r nvme
+ modprobe -r null_blk
+ tree /sys/kernel/config/sys/kernel/config
0 directories, 0 files
+ modprobe -r nvme-fabrics
+ modprobe -r nvme_loop
+ modprobe -r nvmet
+ modprobe -r nvme
+ sleep 1
+ modprobe -r nvme-core
+ lsmod
+ grep nvme
+ sleep 1
+ git diff
+ sleep 1
++ nproc
+ make -j 48 M=drivers/nvme/ modules
CC [M] drivers/nvme/host/tcp.o
LD [M] drivers/nvme/host/nvme-tcp.o
MODPOST drivers/nvme/Module.symvers
CC [M] drivers/nvme/host/nvme-core.mod.o CC [M] drivers/nvme/host/nvme-fabrics.mod.o CC [M] drivers/nvme/host/nvme-fc.mod.o CC [M] drivers/nvme/host/nvme-rdma.mod.o CC [M] drivers/nvme/host/nvme-tcp.mod.o CC [M] drivers/nvme/host/nvme.mod.o CC [M] drivers/nvme/target/nvme-fcloop.mod.o CC [M] drivers/nvme/target/nvme-loop.mod.o CC [M] drivers/nvme/target/nvmet-fc.mod.o CC [M] drivers/nvme/target/nvmet-rdma.mod.o CC [M] drivers/nvme/target/nvmet-tcp.mod.o CC [M] drivers/nvme/target/nvmet.mod.o LD [M] drivers/nvme/host/nvme-fc.ko LD [M] drivers/nvme/host/nvme.ko LD [M] drivers/nvme/host/nvme-tcp.ko LD [M] drivers/nvme/host/nvme-rdma.ko LD [M] drivers/nvme/host/nvme-core.ko LD [M] drivers/nvme/target/nvmet-rdma.ko LD [M] drivers/nvme/target/nvme-loop.ko LD [M] drivers/nvme/target/nvmet-fc.ko LD [M] drivers/nvme/target/nvmet.ko LD [M] drivers/nvme/target/nvmet-tcp.ko LD [M] drivers/nvme/host/nvme-fabrics.ko LD [M] drivers/nvme/target/nvme-fcloop.ko
+ HOST=drivers/nvme/host
+ TARGET=drivers/nvme/target
++ uname -r
+ HOST_DEST=/lib/modules/5.17.0-rc2nvme+/kernel/drivers/nvme/host/
++ uname -r
+ TARGET_DEST=/lib/modules/5.17.0-rc2nvme+/kernel/drivers/nvme/target/
+ cp drivers/nvme/host/nvme-core.ko drivers/nvme/host/nvme-fabrics.ko drivers/nvme/host/nvme-fc.ko drivers/nvme/host/nvme.ko drivers/nvme/host/nvme-rdma.ko drivers/nvme/host/nvme-tcp.ko /lib/modules/5.17.0-rc2nvme+/kernel/drivers/nvme/host//
+ cp drivers/nvme/target/nvme-fcloop.ko drivers/nvme/target/nvme-loop.ko drivers/nvme/target/nvmet-fc.ko drivers/nvme/target/nvmet.ko drivers/nvme/target/nvmet-rdma.ko drivers/nvme/target/nvmet-tcp.ko /lib/modules/5.17.0-rc2nvme+/kernel/drivers/nvme/target//
+ ls -lrth /lib/modules/5.17.0-rc2nvme+/kernel/drivers/nvme/host/ /lib/modules/5.17.0-rc2nvme+/kernel/drivers/nvme/target///lib/modules/5.17.0-rc2nvme+/kernel/drivers/nvme/host/:
total 5.8M
-rw-r--r--. 1 root root 2.2M Feb 22 19:07 nvme-core.ko
-rw-r--r--. 1 root root 425K Feb 22 19:07 nvme-fabrics.ko
-rw-r--r--. 1 root root 922K Feb 22 19:07 nvme-fc.ko
-rw-r--r--. 1 root root 709K Feb 22 19:07 nvme.ko
-rw-r--r--. 1 root root 853K Feb 22 19:07 nvme-rdma.ko
-rw-r--r--. 1 root root 794K Feb 22 19:07 nvme-tcp.ko
/lib/modules/5.17.0-rc2nvme+/kernel/drivers/nvme/target//:
total 6.0M
-rw-r--r--. 1 root root 475K Feb 22 19:07 nvme-fcloop.ko -rw-r--r--. 1 root root 417K Feb 22 19:07 nvme-loop.ko
-rw-r--r--. 1 root root 734K Feb 22 19:07 nvmet-fc.ko
-rw-r--r--. 1 root root 3.0M Feb 22 19:07 nvmet.ko
-rw-r--r--. 1 root root 823K Feb 22 19:07 nvmet-rdma.ko -rw-r--r--. 1 root root 671K Feb 22 19:07 nvmet-tcp.ko
+ modprobe nvme
root@dev blktests (master) # nvme_trtype=tcp ./check nvme
nvme/002 (create many subsystems and test discovery) [not run]
nvme_trtype=tcp is not supported in this test
nvme/003 (test if we're sending keep-alives to a discovery controller) [passed]
runtime 10.116s ... 10.081s
nvme/004 (test nvme and nvmet UUID NS descriptors) [passed]
runtime 1.145s ... 1.142s
nvme/005 (reset local loopback target) [passed]
runtime 1.224s ... 1.237s
nvme/006 (create an NVMeOF target with a block device-backed ns) [passed]
runtime 0.088s ... 0.084s
nvme/007 (create an NVMeOF target with a file-backed ns) [passed]
runtime 0.042s ... 0.047s
nvme/008 (create an NVMeOF host with a block device-backed ns) [passed]
runtime 1.162s ... 1.164s
nvme/009 (create an NVMeOF host with a file-backed ns) [passed]
runtime 1.136s ... 1.123s
nvme/010 (run data verification fio job on NVMeOF block device-backed ns) [passed]
runtime 16.450s ... 16.367s
nvme/011 (run data verification fio job on NVMeOF file-backed ns) [passed]
runtime 14.517s ... 67.432s
nvme/012 (run mkfs and data verification fio job on NVMeOF block device-backed ns) [passed]
runtime ... 21.367s
nvme/013 (run mkfs and data verification fio job on NVMeOF file-backed ns) [passed]
runtime 75.162s ... 100.432s
nvme/014 (flush a NVMeOF block device-backed ns) [passed]
runtime 3.540s ... 3.966s
nvme/015 (unit test for NVMe flush for file backed ns) [passed]
runtime 3.509s ... 3.838snvme/016 (create/delete many NVMeOF block device-backed ns and test discovery) [not run]
nvme_trtype=tcp is not supported in this test
nvme/017 (create/delete many file-ns and test discovery) [not run]
nvme_trtype=tcp is not supported in this test
nvme/018 (unit test NVMe-oF out of range access on a file backend) [passed]
runtime 1.128s ... 1.154s
nvme/019 (test NVMe DSM Discard command on NVMeOF block-device ns) [passed]
runtime 1.153s ... 1.174s
nvme/020 (test NVMe DSM Discard command on NVMeOF file-backed ns) [passed]
runtime 1.127s ... 1.145s
nvme/021 (test NVMe list command on NVMeOF file-backed ns) [passed]
runtime 1.115s ... 1.141s
nvme/022 (test NVMe reset command on NVMeOF file-backed ns) [passed]
runtime 1.156s ... 1.170s
nvme/023 (test NVMe smart-log command on NVMeOF block-device ns) [passed]
runtime 1.146s ... 1.155s
nvme/024 (test NVMe smart-log command on NVMeOF file-backed ns) [passed]
runtime 1.106s ... 1.121s
nvme/025 (test NVMe effects-log command on NVMeOF file-backed ns) [passed]
runtime 1.108s ... 1.140s
nvme/026 (test NVMe ns-descs command on NVMeOF file-backed ns) [passed]
runtime 1.129s ... 1.127s
nvme/027 (test NVMe ns-rescan command on NVMeOF file-backed ns) [passed]
runtime 1.136s ... 1.156s
nvme/028 (test NVMe list-subsys command on NVMeOF file-backed ns) [passed]
runtime 1.120s ... 1.128s
nvme/029 (test userspace IO via nvme-cli read/write interface) [passed]
runtime 1.238s ... 1.237s
nvme/030 (ensure the discovery generation counter is updated appropriately) [passed]
runtime 0.128s ... 0.142s
nvme/031 (test deletion of NVMeOF controllers immediately after setup) [passed]
runtime 0.928s ... 0.909s
nvme/038 (test deletion of NVMeOF subsystem without enabling) [passed]
runtime 0.034s ... 0.036sSignature · 1 line
2.29.0
PATCH 1/2 nvme-tcp: don't initialize ret variable
No point in initializing ret variable to 0 in nvme_tcp_start_io_queue() since it gets overwritten by a call to nvme_tcp_start_queue().
--- drivers/nvme/host/tcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/host/tcp.c +1 -1
@@ -1674,7 +1674,7 @@ static void nvme_tcp_stop_io_queues(struct nvme_ctrl *ctrl)static int nvme_tcp_start_io_queues (struct nvme_ctrl *ctrl) { -int i, ret =0 ; +int i, ret;for (i =1 ; i < ctrl->queue_count; i++) { ret =nvme_tcp_start_queue (ctrl, i);
Signature · 1 line
2.29.0
Re: [PATCH 1/2] nvme-tcp: don't initialize ret variable
PATCH 2/2 nvme-tcp: don't fold the line
In reply to Chaitanya KulkarniThe call to nvme_tcp_alloc_queue() fits perfectly in one line without exceeding 80 char limit for the line.
--- drivers/nvme/host/tcp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/nvme/host/tcp.c +1 -2
@@ -1714,8 +1714,7 @@ static int __nvme_tcp_alloc_io_queues(struct nvme_ctrl *ctrl)int i, ret;for (i =1 ; i < ctrl->queue_count; i++) { - ret =nvme_tcp_alloc_queue (ctrl, i, - ctrl->sqsize +1 ); + ret =nvme_tcp_alloc_queue (ctrl, i, ctrl->sqsize +1 );if (ret) goto out_free_queues; }
Signature · 1 line
2.29.0
Re: [PATCH 2/2] nvme-tcp: don't fold the line
Quoted 5 lines · Chaitanya Kulkarni
Hi,
A small cleanup for host tcp, no functional change, below is the testlog.
Quoted 9 lines
-ck
Chaitanya Kulkarni (2):
nvme-tcp: don't initialize ret variable
nvme-tcp: don't fold the linedrivers/nvme/host/tcp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
gentle ping ?
-ck
Thanks,
applied to nvme-5.18.