Skip to contentSkip to conversation

nvme/{common/nvme, 051, 052}: introduce def_nsid

PATCH Superseded Guixin Liu 4 participants 7 messages Oct 29, 2024 – Oct 30, 2024 NVMe

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Guixin Liu

author
#0 lore raw

PATCH 1/1 nvme/{common/nvme, 051, 052}: introduce def_nsid

Use def_nsid instead of hard code, the default of def_nsid is 1.

---
 common/nvme    | 3 ++-
 tests/nvme/051 | 2 +-
 tests/nvme/052 | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)
common/nvme +2 -1
index c1aa8d6..6371efe 100644
@@ -16,6 +16,7 @@ def_hostid="0f01fb42-9f7f-4856-b0b3-51e60b8de349"
 def_hostnqn="nqn.2014-08.org.nvmexpress:uuid:${def_hostid}"
 export def_subsysnqn="blktests-subsystem-1"
 export def_subsys_uuid="91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+export def_nsid="1"
 _check_conflict_and_set_default NVMET_TRTYPES nvme_trtype "loop"
 _check_conflict_and_set_default NVME_IMG_SIZE nvme_img_size 1G
 _check_conflict_and_set_default NVME_NUM_ITER nvme_num_iter 1000
@@ -537,7 +538,7 @@ _create_nvmet_subsystem() {
 	mkdir -p "${cfs_path}"
 	echo 0 > "${cfs_path}/attr_allow_any_host"
 	_create_nvmet_ns --subsysnqn "${nvmet_subsystem}" \
-			 --nsid "1" \
+			 --nsid "${def_nsid}" \
 			 --blkdev "${blkdev}" \
 			 --uuid "${uuid}" \
 			 ${resv_enable}
tests/nvme/051 +1 -1
index 624b42f..4757b80 100755
@@ -33,7 +33,7 @@ test() {
 	_setup_nvmet
 
 	_nvmet_target_setup
-	ns="${NVMET_CFS}subsystems/${def_subsysnqn}/namespaces/1"
+	ns="${NVMET_CFS}subsystems/${def_subsysnqn}/namespaces/${def_nsid}"
 
 	# fire off two enable/disable loops concurrently and wait
 	# for them to complete...
tests/nvme/052 +3 -3
index 1dcda23..781a9f0 100755
@@ -57,10 +57,10 @@ test() {
 
 	_nvme_connect_subsys
 
-	# start iteration from ns-id 2 because ns-id 1 is created
-	# by default when nvme target is setup. Also ns-id 1 is
+	# start iteration from def_nsid+1 because def_nsid is created
+	# by default when nvme target is setup. Also def_nsid is
 	# deleted when nvme target is cleaned up.
-	for ((i = 2; i <= iterations; i++)); do {
+	for ((i = $((${def_nsid})) + 1; i <= iterations; i++)); do {
 		truncate -s "${NVME_IMG_SIZE}" "$(_nvme_def_file_path).$i"
 		uuid="$(uuidgen -r)"
 
Signature · 1 line
2.43.0
#3 lore raw
In reply to Guixin Liu
Quoted 1 line · Guixin Liu

Use def_nsid instead of hard code, the default of def_nsid is 1.

Hi Guixin, thnaks for the patch.

May I know the motivation to introduce def_nsid? Does it aim to improve code readability? Or does it aim to allow testing various def_nsid values?

I guessed that the latter one is the motivation, and tried it. After applying the patch, I edited common/nvme to have differnet value: export def_nsid="2". With this change, nvme/004 failed. I guess your patch missed a change in _remove_nvmet_subsystem(). With this change, nvme/004 passed.

@@ -589,7 +589,7 @@ _remove_nvmet_subsystem() {
        local nvmet_subsystem="$1"
        local subsys_path="${NVMET_CFS}/subsystems/${nvmet_subsystem}"

- _remove_nvmet_ns "${nvmet_subsystem}" "1"
+ _remove_nvmet_ns "${nvmet_subsystem}" "$def_nsid"

        rm -f "${subsys_path}"/allowed_hosts/*
        rmdir "${subsys_path}"

}

Quoted 50 lines
---
 common/nvme    | 3 ++-
 tests/nvme/051 | 2 +-
 tests/nvme/052 | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)
common/nvme +2 -1
index c1aa8d6..6371efe 100644
@@ -16,6 +16,7 @@ def_hostid="0f01fb42-9f7f-4856-b0b3-51e60b8de349"
 def_hostnqn="nqn.2014-08.org.nvmexpress:uuid:${def_hostid}"
 export def_subsysnqn="blktests-subsystem-1"
 export def_subsys_uuid="91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+export def_nsid="1"
 _check_conflict_and_set_default NVMET_TRTYPES nvme_trtype "loop"
 _check_conflict_and_set_default NVME_IMG_SIZE nvme_img_size 1G
 _check_conflict_and_set_default NVME_NUM_ITER nvme_num_iter 1000
@@ -537,7 +538,7 @@ _create_nvmet_subsystem() {
 	mkdir -p "${cfs_path}"
 	echo 0 > "${cfs_path}/attr_allow_any_host"
 	_create_nvmet_ns --subsysnqn "${nvmet_subsystem}" \
-			 --nsid "1" \
+			 --nsid "${def_nsid}" \
 			 --blkdev "${blkdev}" \
 			 --uuid "${uuid}" \
 			 ${resv_enable}
tests/nvme/051 +1 -1
index 624b42f..4757b80 100755
@@ -33,7 +33,7 @@ test() {
 	_setup_nvmet
 
 	_nvmet_target_setup
-	ns="${NVMET_CFS}subsystems/${def_subsysnqn}/namespaces/1"
+	ns="${NVMET_CFS}subsystems/${def_subsysnqn}/namespaces/${def_nsid}"
 
 	# fire off two enable/disable loops concurrently and wait
 	# for them to complete...
tests/nvme/052 +0 -0
index 1dcda23..781a9f0 100755
@@ -57,10 +57,10 @@ test() {
 
 	_nvme_connect_subsys
 

tests/nvme/052 test() { · line 66

Quoted 10 lines
tests/nvme/052 +3 -3
-	# start iteration from ns-id 2 because ns-id 1 is created
-	# by default when nvme target is setup. Also ns-id 1 is
+	# start iteration from def_nsid+1 because def_nsid is created
+	# by default when nvme target is setup. Also def_nsid is
 	# deleted when nvme target is cleaned up.
-	for ((i = 2; i <= iterations; i++)); do {
+	for ((i = $((${def_nsid})) + 1; i <= iterations; i++)); do {
 		truncate -s "${NVME_IMG_SIZE}" "$(_nvme_def_file_path).$i"
 		uuid="$(uuidgen -r)"
 

After this change, when def_nsid is larger than iteration=20, nvme/052 will do nothing. I think the change should be like this:

    for ((i = 2; i <= iterations; i++)); do {
        nsid=$((def_nsid + i - 1))
	truncate -s "${NVME_IMG_SIZE}" "$(_nvme_def_file_path).${nsid}"
        uuid=$(_create_nvmet_ns --blkdev "$(_nvme_def_file_path).${nsid}" \
                                   --nsid "${nsid}")
        ....

Also, same change will be required in nvme/016 and nvme/017. They also use the --nsid option.

$ git grep -e "--nsid"
common/nvme:                    --nsid)
tests/nvme/016:         _create_nvmet_ns --nsid "${i}" \
tests/nvme/017:         _create_nvmet_ns --nsid "${i}" \
tests/nvme/052:                                 --nsid "${i}")
#4 lore raw
Quoted 7 lines · Shinichiro Kawasaki
Quoted 1 line · Guixin Liu

Use def_nsid instead of hard code, the default of def_nsid is 1.

Hi Guixin, thnaks for the patch.

May I know the motivation to introduce def_nsid? Does it aim to improve code readability? Or does it aim to allow testing various def_nsid values?

I found it useful where we don't have to hard code the values also it's easier to search for the default namespace id than individually looking for it when it's require as number of testcases are growing.

Thanks for suggesting fixes on other testcases.

-ck

author
#5 lore raw
In reply to Shinichiro Kawasaki
Quoted 6 lines · Shinichiro Kawasaki
Quoted 1 line · Guixin Liu

Use def_nsid instead of hard code, the default of def_nsid is 1.

Hi Guixin, thnaks for the patch.

May I know the motivation to introduce def_nsid? Does it aim to improve code readability? Or does it aim to allow testing various def_nsid values?

Just like def_subsysnqn and def_subsys_uuid, avoid hard code in testcases,

and let us to know the ns_id created by default.

Quoted 7 lines

I guessed that the latter one is the motivation, and tried it. After applying the patch, I edited common/nvme to have differnet value: export def_nsid="2". With this change, nvme/004 failed. I guess your patch missed a change in _remove_nvmet_subsystem(). With this change, nvme/004 passed.

Review _remove_nvmet_subsystem() { · line 595

Quoted 8 lines
(quoted diff) +1 -1
@@ -589,7 +589,7 @@ _remove_nvmet_subsystem() {
         local nvmet_subsystem="$1"
         local subsys_path="${NVMET_CFS}/subsystems/${nvmet_subsystem}"
 
-       _remove_nvmet_ns "${nvmet_subsystem}" "1"
+       _remove_nvmet_ns "${nvmet_subsystem}" "$def_nsid"
         rm -f "${subsys_path}"/allowed_hosts/*
         rmdir "${subsys_path}"
  }

Thanks, I miss this, will be changed in v2.

Best Regards,

Guixin Liu

Quoted 77 lines
Quoted 49 lines
---
  common/nvme    | 3 ++-
  tests/nvme/051 | 2 +-
  tests/nvme/052 | 6 +++---
  3 files changed, 6 insertions(+), 5 deletions(-)
common/nvme +2 -1
index c1aa8d6..6371efe 100644
@@ -16,6 +16,7 @@ def_hostid="0f01fb42-9f7f-4856-b0b3-51e60b8de349"
  def_hostnqn="nqn.2014-08.org.nvmexpress:uuid:${def_hostid}"
  export def_subsysnqn="blktests-subsystem-1"
  export def_subsys_uuid="91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+export def_nsid="1"
  _check_conflict_and_set_default NVMET_TRTYPES nvme_trtype "loop"
  _check_conflict_and_set_default NVME_IMG_SIZE nvme_img_size 1G
  _check_conflict_and_set_default NVME_NUM_ITER nvme_num_iter 1000
@@ -537,7 +538,7 @@ _create_nvmet_subsystem() {
  	mkdir -p "${cfs_path}"
  	echo 0 > "${cfs_path}/attr_allow_any_host"
  	_create_nvmet_ns --subsysnqn "${nvmet_subsystem}" \
-			 --nsid "1" \
+			 --nsid "${def_nsid}" \
  			 --blkdev "${blkdev}" \
  			 --uuid "${uuid}" \
  			 ${resv_enable}
tests/nvme/051 +1 -1
index 624b42f..4757b80 100755
@@ -33,7 +33,7 @@ test() {
  	_setup_nvmet
 
  	_nvmet_target_setup
-	ns="${NVMET_CFS}subsystems/${def_subsysnqn}/namespaces/1"
+	ns="${NVMET_CFS}subsystems/${def_subsysnqn}/namespaces/${def_nsid}"
 
  	# fire off two enable/disable loops concurrently and wait
  	# for them to complete...
tests/nvme/052 +0 -0
index 1dcda23..781a9f0 100755
@@ -57,10 +57,10 @@ test() {
 
  	_nvme_connect_subsys
 

tests/nvme/052 test() { · line 66

Quoted 10 lines
tests/nvme/052 +3 -3
-	# start iteration from ns-id 2 because ns-id 1 is created
-	# by default when nvme target is setup. Also ns-id 1 is
+	# start iteration from def_nsid+1 because def_nsid is created
+	# by default when nvme target is setup. Also def_nsid is
  	# deleted when nvme target is cleaned up.
-	for ((i = 2; i <= iterations; i++)); do {
+	for ((i = $((${def_nsid})) + 1; i <= iterations; i++)); do {
  		truncate -s "${NVME_IMG_SIZE}" "$(_nvme_def_file_path).$i"
  		uuid="$(uuidgen -r)"
 

After this change, when def_nsid is larger than iteration=20, nvme/052 will do nothing. I think the change should be like this:

     for ((i = 2; i <= iterations; i++)); do {
         nsid=$((def_nsid + i - 1))
	truncate -s "${NVME_IMG_SIZE}" "$(_nvme_def_file_path).${nsid}"
         uuid=$(_create_nvmet_ns --blkdev "$(_nvme_def_file_path).${nsid}" \
                                    --nsid "${nsid}")
         ....

Also, same change will be required in nvme/016 and nvme/017. They also use the --nsid option.

$ git grep -e "--nsid"
common/nvme:                    --nsid)
tests/nvme/016:         _create_nvmet_ns --nsid "${i}" \
tests/nvme/017:         _create_nvmet_ns --nsid "${i}" \
tests/nvme/052:                                 --nsid "${i}")
#6 lore raw
Quoted 4 lines · Guixin Liu
Quoted 2 lines · Shinichiro Kawasaki
Quoted 1 line · Guixin Liu

Use def_nsid instead of hard code, the default of def_nsid is 1.

Quoted 8 lines
Quoted 4 lines

Hi Guixin, thnaks for the patch.

May I know the motivation to introduce def_nsid? Does it aim to improve code readability? Or does it aim to allow testing various def_nsid values?

Just like def_subsysnqn and def_subsys_uuid, avoid hard code in testcases,

and let us to know the ns_id created by default.

Thank you, I see it. I think Chaitanya finds the same value.

I forgot to mention that your v1 patch has this shellcheck waning:

  tests/nvme/052:63:15: note: $/${} is unnecessary on arithmetic variables. [SC2004]

It will be appreciated to address it, and run "make check" for confirmation.