Tests the ability to enable and disable error logging for passthru admin commands issued to the controller and passthru IO commands issued to a namespace. Signed-off-by: Alan Adamson <alan.adamson@xxxxxxxxxx> --- tests/nvme/039 | 41 +++++++++++++++++++++++++++++++++++++++++ tests/nvme/039.out | 2 ++ tests/nvme/rc | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+) diff --git a/tests/nvme/039 b/tests/nvme/039 index 73b53d0b949c..7cf7638ed4c8 100755 --- a/tests/nvme/039 +++ b/tests/nvme/039 @@ -130,6 +130,33 @@ inject_invalid_admin_cmd() fi } +inject_invalid_io_cmd_passthru() +{ + local ns_dev + local ctrl_dev + local ns + + ns_dev="$1" + ctrl_dev=${ns_dev%n*} + ns=$(echo "$ns_dev" | cut -d "n" -f3) + + # Inject a 'Invalid Command Opcode' (0x1) on a read (0x02) + _nvme_enable_err_inject "$ns_dev" 0 100 1 0x1 1 + + nvme io-passthru /dev/"$ctrl_dev" --opcode=0x02 --namespace-id="$ns" \ + --data-len=512 --read --cdw10=0 --cdw11=0 --cdw12="$2" 2> /dev/null 1>&2 + + _nvme_disable_err_inject "$1" + if ${nvme_verbose_errors}; then + last_dmesg 2 | grep "Invalid Command Opcode (" | \ + sed 's/nvme.*://g' + else + last_dmesg 2 | grep "Cmd(0x2" | sed 's/I\/O Cmd/Read/g' | \ + sed 's/I\/O Error/Invalid Command Opcode/g' | \ + sed 's/nvme.*://g' + fi +} + test_device() { echo "Running ${TEST_NAME}" @@ -147,6 +174,7 @@ test_device() { ctrl_dev=${ns_dev%n*} _nvme_err_inject_setup "${ns_dev}" "${ctrl_dev}" + _nvme_passthru_logging_setup "${ns_dev}" "${ctrl_dev}" # wait DEFAULT_RATELIMIT_INTERVAL=5 seconds to ensure errors are printed sleep 5 @@ -155,6 +183,19 @@ test_device() { inject_invalid_status_on_read "${ns_dev}" inject_write_fault_on_write "${ns_dev}" + # Test Pass Thru Admin Logging + _nvme_disable_passthru_admin_error_logging "${ctrl_dev}" + inject_invalid_admin_cmd "${ctrl_dev}" + _nvme_enable_passthru_admin_error_logging "${ctrl_dev}" + inject_access_denied_on_identify "${ctrl_dev}" + + # Test Pass Thru IO Logging + _nvme_disable_passthru_io_error_logging "${ns_dev}" "${ctrl_dev}" + inject_invalid_io_cmd_passthru "${ns_dev}" 0 + _nvme_enable_passthru_io_error_logging "${ns_dev}" "${ctrl_dev}" + inject_invalid_io_cmd_passthru "${ns_dev}" 1 + + _nvme_passthru_logging_cleanup "${ns_dev}" "${ctrl_dev}" _nvme_err_inject_cleanup "${ns_dev}" "${ctrl_dev}" echo "Test complete" diff --git a/tests/nvme/039.out b/tests/nvme/039.out index 139070d22240..fea76cfd1245 100644 --- a/tests/nvme/039.out +++ b/tests/nvme/039.out @@ -2,4 +2,6 @@ Running nvme/039 Read(0x2) @ LBA 0, 1 blocks, Unrecovered Read Error (sct 0x2 / sc 0x81) DNR Read(0x2) @ LBA 0, 1 blocks, Unknown (sct 0x3 / sc 0x75) DNR Write(0x1) @ LBA 0, 1 blocks, Write Fault (sct 0x2 / sc 0x80) DNR + Identify(0x6), Access Denied (sct 0x2 / sc 0x86) DNR cdw10=0x1 cdw11=0x0 cdw12=0x0 cdw13=0x0 cdw14=0x0 cdw15=0x0 + Read(0x2), Invalid Command Opcode (sct 0x0 / sc 0x1) DNR cdw10=0x0 cdw11=0x0 cdw12=0x1 cdw13=0x0 cdw14=0x0 cdw15=0x0 Test complete diff --git a/tests/nvme/rc b/tests/nvme/rc index dfc4c1ef1975..2d6ebeab2f6f 100644 --- a/tests/nvme/rc +++ b/tests/nvme/rc @@ -943,6 +943,23 @@ _check_uuid() { declare -A NS_DEV_FAULT_INJECT_SAVE declare -A CTRL_DEV_FAULT_INJECT_SAVE +ns_dev_passthru_logging=off +ctrl_dev_passthru_logging=off + +_nvme_passthru_logging_setup() +{ + ctrl_dev_passthru_logging=$(cat /sys/class/nvme/"$2"/passthru_err_log_enabled) + ns_dev_passthru_logging=$(cat /sys/class/nvme/"$2"/"$1"/passthru_err_log_enabled) + + _nvme_disable_passthru_admin_error_logging "$2" + _nvme_disable_passthru_io_error_logging "$1" "$2" +} + +_nvme_passthru_logging_cleanup() +{ + echo $ctrl_dev_passthru_logging > /sys/class/nvme/"$2"/passthru_err_log_enabled + echo $ns_dev_passthru_logging > /sys/class/nvme/"$2"/"$1"/passthru_err_log_enabled +} _nvme_err_inject_setup() { @@ -985,6 +1002,26 @@ _nvme_disable_err_inject() echo 0 > /sys/kernel/debug/"$1"/fault_inject/times } +_nvme_enable_passthru_admin_error_logging() +{ + echo on > /sys/class/nvme/"$1"/passthru_err_log_enabled +} + +_nvme_enable_passthru_io_error_logging() +{ + echo on > /sys/class/nvme/"$2"/"$1"/passthru_err_log_enabled +} + +_nvme_disable_passthru_admin_error_logging() +{ + echo off > /sys/class/nvme/"$1"/passthru_err_log_enabled +} + +_nvme_disable_passthru_io_error_logging() +{ + echo off > /sys/class/nvme/"$2"/"$1"/passthru_err_log_enabled +} + _nvme_reset_ctrl() { echo 1 > /sys/class/nvme/"$1"/reset_controller } -- 2.39.3