Test the NVMe reservation feature
Subsystems (2)
v5 cover Test the NVMe reservation feature
Changes from v4 to v5:
- Remove hardcode ns_id.
Changes from v3 to v4:
- Introduce var test_dev="/dev/${nvmedev}n1" instead of using "/dev/${nvmedev}n1" everywhere.
- Filter the resv-report result.
Changes from v2 to v3:
- Put calling "resv-report --help" to the beginning of test_resv().
- Introduce a hlper resv_report.
- Fit newest blktests version.
Changes from v1 to v2:
- Add a new patch to add a optinal argument --resv_enable.
- Make resv-report fit the new --eds argument.
- Filter the hosid output to make the new test case independent from hostid.
- Change the new test case name to "Test the NVMe reservation feature".
Guixin Liu (2):
nvme/{md/001,rc,002,016,017,030,052}: introduce --resv_enable argument
nvme: test the nvme reservation feature
common/nvme | 89 +++++++++++++++++++++++++++++++++------ tests/md/001 | 4 +- tests/nvme/002 | 3 +- tests/nvme/016 | 7 +++- tests/nvme/017 | 10 +++-- tests/nvme/030 | 6 ++- tests/nvme/052 | 5 ++- tests/nvme/054 | 101 +++++++++++++++++++++++++++++++++++++++++++++ tests/nvme/054.out | 68 ++++++++++++++++++++++++++++++ tests/nvme/rc | 11 ++++- 10 files changed, 278 insertions(+), 26 deletions(-) create mode 100644 tests/nvme/054 create mode 100644 tests/nvme/054.out
Signature · 1 line
2.43.0
PATCH v5 1/2 nvme/{md/001,rc,002,016,017,030,052}: introduce --resv_enable argument
Add an optional argument --resv_enable to _nvmet_target_setup() and propagate it to _create_nvmet_subsystem() and _create_nvmet_ns().
One can call functions with --resv_enable to enable reservation feature on a specific namespace.
And also make _create_nvmet_ns and _create_nvmet_subsystem to parse for arguments, this makes these functions more flexible to use.
--- common/nvme | 89 ++++++++++++++++++++++++++++++++++++++++++-------- tests/md/001 | 4 ++- tests/nvme/002 | 3 +- tests/nvme/016 | 7 ++-- tests/nvme/017 | 10 +++--- tests/nvme/030 | 6 ++-- tests/nvme/052 | 5 ++- tests/nvme/rc | 11 +++++-- 8 files changed, 109 insertions(+), 26 deletions(-)
common/nvme +76 -13
@@ -452,32 +452,95 @@ _remove_nvmet_port() { } _create_nvmet_ns() { - local nvmet_subsystem="$1" - local nsid="$2" - local blkdev="$3" + local nvmet_subsystem="" + local nsid="" + local blkdev="" local uuid="00000000-0000-0000-0000-000000000000" - local subsys_path="${NVMET_CFS}/subsystems/${nvmet_subsystem}" - local ns_path="${subsys_path}/namespaces/${nsid}" + local subsys_path="" + local ns_path="" + local resv_enable=false - if [[ $# -eq 4 ]]; then - uuid="$4" - fi + while [[ $# -gt 0 ]]; do + case $1 in + --subsysnqn) + nvmet_subsystem="$2" + shift 2 + ;; + --nsid) + nsid="$2" + shift 2 + ;; + --blkdev) + blkdev="$2" + shift 2 + ;; + --uuid) + uuid="$2" + shift 2 + ;; + --resv_enable) + resv_enable=true + shift 1 + ;; + *) + echo "WARNING: unknown argument: $1" + shift + ;; + esac + done + + subsys_path="${NVMET_CFS}/subsystems/${nvmet_subsystem}" + ns_path="${subsys_path}/namespaces/${nsid}" mkdir "${ns_path}" printf "%s" "${blkdev}" > "${ns_path}/device_path" printf "%s" "${uuid}" > "${ns_path}/device_uuid" + if [[ -f "${ns_path}/resv_enable" && "${resv_enable}" = true ]] ; then + printf 1 > "${ns_path}/resv_enable" + fi printf 1 > "${ns_path}/enable" } _create_nvmet_subsystem() { - local nvmet_subsystem="$1" - local blkdev="$2" - local uuid=$3 - local cfs_path="${NVMET_CFS}/subsystems/${nvmet_subsystem}" + local nvmet_subsystem="" + local blkdev="" + local uuid="00000000-0000-0000-0000-000000000000" + local resv_enable="" + local cfs_path="" + + while [[ $# -gt 0 ]]; do + case $1 in + --subsysnqn) + nvmet_subsystem="$2" + shift 2 + ;; + --blkdev) + blkdev="$2" + shift 2 + ;; + --uuid) + uuid="$2" + shift 2 + ;; + --resv_enable) + resv_enable="--resv_enable"; + shift 1 + ;; + *) + echo "WARNING: unknown argument: $1" + shift + ;; + esac + done + cfs_path="${NVMET_CFS}/subsystems/${nvmet_subsystem}" mkdir -p "${cfs_path}" echo 0 > "${cfs_path}/attr_allow_any_host" - _create_nvmet_ns "${nvmet_subsystem}" "1" "${blkdev}" "${uuid}" + _create_nvmet_ns --subsysnqn "${nvmet_subsystem}" \ + --nsid "1" \ + --blkdev "${blkdev}" \ + --uuid "${uuid}" \ + ${resv_enable} } _add_nvmet_allow_hosts() {
tests/md/001 +3 -1
@@ -52,7 +52,9 @@ setup_nvme_over_tcp() { local port port="$(_create_nvmet_port "${nvme_trtype}")" - _create_nvmet_subsystem "${def_subsysnqn}" "/dev/mapper/ram0_big_optio" "${def_subsys_uuid}" + _create_nvmet_subsystem --subsysnqn "${def_subsysnqn}" \ + --blkdev "/dev/mapper/ram0_big_optio" \ + --uuid "${def_subsys_uuid}" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}"
tests/nvme/002 +2 -1
@@ -34,7 +34,8 @@ test() { local genctr=1 for ((i = 0; i < iterations; i++)); do - _create_nvmet_subsystem "blktests-subsystem-$i" "${loop_dev}" + _create_nvmet_subsystem --subsysnqn "blktests-subsystem-$i" \ + --blkdev "${loop_dev}" _add_nvmet_subsys_to_port "${port}" "blktests-subsystem-$i" done
tests/nvme/016 +5 -2
@@ -29,10 +29,13 @@ test() { loop_dev="$(losetup -f)" local genctr=1 - _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" + _create_nvmet_subsystem --subsysnqn "${def_subsysnqn}" \ + --blkdev "${loop_dev}" for ((i = 2; i <= iterations; i++)); do - _create_nvmet_ns "${def_subsysnqn}" "${i}" "${loop_dev}" + _create_nvmet_ns --subsysnqn "${def_subsysnqn}" \ + --nsid "${i}" \ + --blkdev "${loop_dev}" done port="$(_create_nvmet_port "${nvme_trtype}")"
tests/nvme/017 +6 -4
@@ -29,12 +29,14 @@ test() { local genctr=1 - _create_nvmet_subsystem "${def_subsysnqn}" "$(_nvme_def_file_path)" \ - "${def_subsys_uuid}" + _create_nvmet_subsystem --subsysnqn "${def_subsysnqn}" \ + --blkdev "$(_nvme_def_file_path)" \ + --uuid "${def_subsys_uuid}" for ((i = 2; i <= iterations; i++)); do - _create_nvmet_ns "${def_subsysnqn}" "${i}" \ - "$(_nvme_def_file_path)" + _create_nvmet_ns --subsysnqn "${def_subsysnqn}" \ + --nsid "${i}" \ + --blkdev "$(_nvme_def_file_path)" done port="$(_create_nvmet_port "${nvme_trtype}")"
tests/nvme/030 +4 -2
@@ -30,13 +30,15 @@ test() { port="$(_create_nvmet_port "${nvme_trtype}")" - _create_nvmet_subsystem "${subsys}1" "$(losetup -f)" + _create_nvmet_subsystem --subsysnqn "${subsys}1" \ + --blkdev "$(losetup -f)" _add_nvmet_subsys_to_port "${port}" "${subsys}1" _create_nvmet_host "${subsys}1" "${def_hostnqn}" genctr=$(_discovery_genctr) - _create_nvmet_subsystem "${subsys}2" "$(losetup -f)" + _create_nvmet_subsystem --subsysnqn "${subsys}2" \ + --blkdev "$(losetup -f)" _add_nvmet_subsys_to_port "${port}" "${subsys}2" genctr=$(_check_genctr "${genctr}" "adding a subsystem to a port")
tests/nvme/052 +4 -1
@@ -64,7 +64,10 @@ test() { truncate -s "${NVME_IMG_SIZE}" "$(_nvme_def_file_path).$i" uuid="$(uuidgen -r)" - _create_nvmet_ns "${def_subsysnqn}" "${i}" "$(_nvme_def_file_path).$i" "${uuid}" + _create_nvmet_ns --subsysnqn "${def_subsysnqn}" \ + --nsid "${i}" \ + --blkdev "$(_nvme_def_file_path).$i" \ + --uuid "${uuid}" # wait until async request is processed and ns is created if ! nvmf_wait_for_ns "${uuid}" created; then
tests/nvme/rc +9 -2
@@ -324,6 +324,7 @@ _nvmet_target_setup() { local subsysnqn="${def_subsysnqn}" local subsys_uuid="${def_subsys_uuid}" local port + local resv_enable="" while [[ $# -gt 0 ]]; do case $1 in
@@ -347,6 +348,10 @@ _nvmet_target_setup() { subsys_uuid="$2" shift 2 ;; + --resv_enable) + resv_enable="--resv_enable" + shift 1 + ;; *) echo "WARNING: unknown argument: $1" shift
@@ -361,8 +366,10 @@ _nvmet_target_setup() { blkdev="$(_nvme_def_file_path)" fi - _create_nvmet_subsystem "${subsysnqn}" "${blkdev}" \ - "${subsys_uuid}" + _create_nvmet_subsystem --subsysnqn "${subsysnqn}" \ + --blkdev "${blkdev}" \ + --uuid "${subsys_uuid}" \ + ${resv_enable} port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${subsysnqn}" _create_nvmet_host "${subsysnqn}" "${def_hostnqn}" \
Signature · 1 line
2.43.0
PATCH v5 2/2 nvme: test the nvme reservation feature
In reply to Guixin LiuTest the NVMe reservation feature, including register, acquire, release and report.
--- tests/nvme/054 | 101 +++++++++++++++++++++++++++++++++++++++++++++ tests/nvme/054.out | 68 ++++++++++++++++++++++++++++++ 2 files changed, 169 insertions(+) create mode 100644 tests/nvme/054 create mode 100644 tests/nvme/054.out
tests/nvme/054 new file +101 -0
@@ -0,0 +1,101 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-3.0+ +# Copyright (C) 2024 Guixin Liu +# Copyright (C) 2024 Alibaba Group. +# +# Test the NVMe reservation feature +# +. tests/nvme/rc + +DESCRIPTION="Test the NVMe reservation feature" +QUICK=1 +nvme_trtype="loop" + +requires() { + _nvme_requires +} + +resv_report() { + local test_dev=$1 + local report_arg=$2 + + nvme resv-report "${test_dev}" "${report_arg}" | grep -v "hostid" | \ + grep -E "gen|rtype|regctl|regctlext|cntlid|rcsts|rkey" +} + +test_resv() { + local ns=$1 + local report_arg="--cdw11=1" + test_dev="/dev/${ns}" + + if nvme resv-report --help 2>&1 | grep -- '--eds' > /dev/null; then + report_arg="--eds" + fi + + echo "Register" + resv_report "${test_dev}" "${report_arg}" + nvme resv-register "${test_dev}" --nrkey=4 --rrega=0 + resv_report "${test_dev}" "${report_arg}" + + echo "Replace" + nvme resv-register "${test_dev}" --crkey=4 --nrkey=5 --rrega=2 + resv_report "${test_dev}" "${report_arg}" + + echo "Unregister" + nvme resv-register "${test_dev}" --crkey=5 --rrega=1 + resv_report "${test_dev}" "${report_arg}" + + echo "Acquire" + nvme resv-register "${test_dev}" --nrkey=4 --rrega=0 + nvme resv-acquire "${test_dev}" --crkey=4 --rtype=1 --racqa=0 + resv_report "${test_dev}" "${report_arg}" + + echo "Preempt" + nvme resv-acquire "${test_dev}" --crkey=4 --rtype=2 --racqa=1 + resv_report "${test_dev}" "${report_arg}" + + echo "Release" + nvme resv-release "${test_dev}" --crkey=4 --rtype=2 --rrela=0 + resv_report "${test_dev}" "${report_arg}" + + echo "Clear" + nvme resv-register "${test_dev}" --nrkey=4 --rrega=0 + nvme resv-acquire "${test_dev}" --crkey=4 --rtype=1 --racqa=0 + resv_report "${test_dev}" "${report_arg}" + nvme resv-release "${test_dev}" --crkey=4 --rrela=1 +} + +test() { + echo "Running ${TEST_NAME}" + + _setup_nvmet + + local ns + local skipped=false + local subsys_path="" + local ns_path="" + + _nvmet_target_setup --blkdev file --resv_enable + subsys_path="${NVMET_CFS}/subsystems/${def_subsysnqn}" + _nvme_connect_subsys + + ns=$(_find_nvme_ns "${def_subsys_uuid}") + ns_id=$(echo "${ns}" | grep -oE '[0-9]+' | sed -n '2p') + ns_path="${subsys_path}/namespaces/${ns_id}" + + if [[ -f "${ns_path}/resv_enable" ]] ; then + test_resv "${ns}" + else + SKIP_REASONS+=("missing reservation feature") + skipped=true + fi + + _nvme_disconnect_subsys + _nvmet_target_cleanup + + if [[ "${skipped}" = true ]] ; then + return 1 + fi + + echo "Test complete" +}
tests/nvme/054.out new file +68 -0
68 lines not on this page · raw message
Signature · 1 line
2.43.0
Re: [PATCH blktests v5 2/2] nvme: test the nvme reservation feature
Quoted 5 lines · Guixin Liu
Test the NVMe reservation feature, including register, acquire, release and report.
Signed-off-by Guixin Liu <[email protected]>Reviewed-by Chaitanya Kulkarni <[email protected]>
Looks good to me. Thanks!
Quoted 191 lines
--- tests/nvme/054 | 101 +++++++++++++++++++++++++++++++++++++++++++++ tests/nvme/054.out | 68 ++++++++++++++++++++++++++++++ 2 files changed, 169 insertions(+) create mode 100644 tests/nvme/054 create mode 100644 tests/nvme/054.outtests/nvme/054 new file +101
-0@@ -0,0 +1,101 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-3.0+ +# Copyright (C) 2024 Guixin Liu +# Copyright (C) 2024 Alibaba Group. +# +# Test the NVMe reservation feature +# +. tests/nvme/rc + +DESCRIPTION="Test the NVMe reservation feature" +QUICK=1 +nvme_trtype="loop" + +requires() { + _nvme_requires +} + +resv_report() { + local test_dev=$1 + local report_arg=$2 + + nvme resv-report "${test_dev}" "${report_arg}" | grep -v "hostid" | \ + grep -E "gen|rtype|regctl|regctlext|cntlid|rcsts|rkey" +} + +test_resv() { + local ns=$1 + local report_arg="--cdw11=1" + test_dev="/dev/${ns}" + + if nvme resv-report --help 2>&1 | grep -- '--eds' > /dev/null; then + report_arg="--eds" + fi + + echo "Register" + resv_report "${test_dev}" "${report_arg}" + nvme resv-register "${test_dev}" --nrkey=4 --rrega=0 + resv_report "${test_dev}" "${report_arg}" + + echo "Replace" + nvme resv-register "${test_dev}" --crkey=4 --nrkey=5 --rrega=2 + resv_report "${test_dev}" "${report_arg}" + + echo "Unregister" + nvme resv-register "${test_dev}" --crkey=5 --rrega=1 + resv_report "${test_dev}" "${report_arg}" + + echo "Acquire" + nvme resv-register "${test_dev}" --nrkey=4 --rrega=0 + nvme resv-acquire "${test_dev}" --crkey=4 --rtype=1 --racqa=0 + resv_report "${test_dev}" "${report_arg}" + + echo "Preempt" + nvme resv-acquire "${test_dev}" --crkey=4 --rtype=2 --racqa=1 + resv_report "${test_dev}" "${report_arg}" + + echo "Release" + nvme resv-release "${test_dev}" --crkey=4 --rtype=2 --rrela=0 + resv_report "${test_dev}" "${report_arg}" + + echo "Clear" + nvme resv-register "${test_dev}" --nrkey=4 --rrega=0 + nvme resv-acquire "${test_dev}" --crkey=4 --rtype=1 --racqa=0 + resv_report "${test_dev}" "${report_arg}" + nvme resv-release "${test_dev}" --crkey=4 --rrela=1 +} + +test() { + echo "Running ${TEST_NAME}" + + _setup_nvmet + + local ns + local skipped=false + local subsys_path="" + local ns_path="" + + _nvmet_target_setup --blkdev file --resv_enable + subsys_path="${NVMET_CFS}/subsystems/${def_subsysnqn}" + _nvme_connect_subsys + + ns=$(_find_nvme_ns "${def_subsys_uuid}") + ns_id=$(echo "${ns}" | grep -oE '[0-9]+' | sed -n '2p') + ns_path="${subsys_path}/namespaces/${ns_id}" + + if [[ -f "${ns_path}/resv_enable" ]] ; then + test_resv "${ns}" + else + SKIP_REASONS+=("missing reservation feature") + skipped=true + fi + + _nvme_disconnect_subsys + _nvmet_target_cleanup + + if [[ "${skipped}" = true ]] ; then + return 1 + fi + + echo "Test complete" +}tests/nvme/054.out new file +68
-0@@ -0,0 +1,68 @@ +Running nvme/054 +Register +gen : 0 +rtype : 0 +regctl : 0 +NVME Reservation success +gen : 1 +rtype : 0 +regctl : 1 +regctlext[0] : + cntlid : ffff + rcsts : 0 + rkey : 4 +Replace +NVME Reservation success +gen : 2 +rtype : 0 +regctl : 1 +regctlext[0] : + cntlid : ffff + rcsts : 0 + rkey : 5 +Unregister +NVME Reservation success +gen : 3 +rtype : 0 +regctl : 0 +Acquire +NVME Reservation success +NVME Reservation Acquire success +gen : 4 +rtype : 1 +regctl : 1 +regctlext[0] : + cntlid : ffff + rcsts : 1 + rkey : 4 +Preempt +NVME Reservation Acquire success +gen : 5 +rtype : 2 +regctl : 1 +regctlext[0] : + cntlid : ffff + rcsts : 1 + rkey : 4 +Release +NVME Reservation Release success +gen : 5 +rtype : 0 +regctl : 1 +regctlext[0] : + cntlid : ffff + rcsts : 0 + rkey : 4 +Clear +NVME Reservation success +NVME Reservation Acquire success +gen : 6 +rtype : 1 +regctl : 1 +regctlext[0] : + cntlid : ffff + rcsts : 1 + rkey : 4 +NVME Reservation Release success +disconnected 1 controller(s) +Test completeSignature · 1 line
2.43.0
I applied the patches. Of note is that I folded in a couple of nit changes to the second patch:
- set executable flag to nvme/054
- added 'local' to test_dev
Thanks!