The previous commit introduced the helper function _echo(). Use it in common/nvme and tests/nvme/rc to trace sysfs attribute writes. Signed-off-by: Shin'ichiro Kawasaki --- common/nvme | 34 ++++++++++++++--------------- tests/nvme/rc | 60 +++++++++++++++++++++++++-------------------------- 2 files changed, 46 insertions(+), 48 deletions(-) diff --git a/common/nvme b/common/nvme index 565de59..aa44ca6 100644 --- a/common/nvme +++ b/common/nvme @@ -570,18 +570,18 @@ _create_nvmet_port() { traddr=$(_fc_traddr $port) adrfam="fc" fi - echo "${trtype}" > "${portcfs}/addr_trtype" - echo "${traddr}" > "${portcfs}/addr_traddr" - echo "${adrfam}" > "${portcfs}/addr_adrfam" + _echo "${trtype}" "${portcfs}/addr_trtype" + _echo "${traddr}" "${portcfs}/addr_traddr" + _echo "${adrfam}" "${portcfs}/addr_adrfam" if [[ "${adrfam}" != "fc" ]] && \ [[ "${adrfam}" != "loop" ]] ; then - echo "${trsvcid}" > "${portcfs}/addr_trsvcid" + _echo "${trsvcid}" "${portcfs}/addr_trsvcid" fi if [[ "${trtype}" == "tcp" ]] && \ [[ "${tls}" != "none" ]]; then - echo "tls1.3" > "${portcfs}/addr_tsas" + _echo "tls1.3" "${portcfs}/addr_tsas" if [[ "${tls}" != "required" ]]; then - echo "not required" > "${portcfs}/addr_treq" + _echo "not required" "${portcfs}/addr_treq" fi fi echo "${port}" @@ -601,7 +601,7 @@ _setup_nvmet_port_ana() { fi mkdir "${anaport}" fi - echo "${anastate}" > "${anaport}/ana_state" + _echo "${anastate}" "${anaport}/ana_state" } _remove_nvmet_port() { @@ -722,19 +722,19 @@ _create_nvmet_ns() { subsys_path="${NVMET_CFS}/subsystems/${subsysnqn}" ns_path="${subsys_path}/namespaces/${nsid}" mkdir "${ns_path}" - printf "%s" "${blkdev}" > "${ns_path}/device_path" + _echo "$(printf "%s" "${blkdev}")" "${ns_path}/device_path" if [[ -f "${ns_path}/resv_enable" && "${resv_enable}" = true ]] ; then - printf 1 > "${ns_path}/resv_enable" + _echo 1 "${ns_path}/resv_enable" fi if [[ -n "${uuid}" ]]; then - printf "%s" "${uuid}" > "${ns_path}/device_uuid" + _echo "$(printf "%s" "${uuid}")" "${ns_path}/device_uuid" else uuid=$(cat "${ns_path}/device_uuid") fi if (( grpid != 1 )); then - printf "%d" "${grpid}" > "${ns_path}/ana_grpid" + _echo "$(printf "%d" "${grpid}")" "${ns_path}/ana_grpid" fi - printf 1 > "${ns_path}/enable" + _echo 1 "${ns_path}/enable" echo "${uuid}" } @@ -748,7 +748,7 @@ _setup_nvmet_ns_ana() { if [[ ! -d "${ns_path}" ]]; then return fi - echo "${anagrpid}" > "${ns_path}/anagrpid" + _echo "${anagrpid}" "${ns_path}/anagrpid" } _create_nvmet_subsystem() { @@ -786,7 +786,7 @@ _create_nvmet_subsystem() { cfs_path="${NVMET_CFS}/subsystems/${subsystem}" mkdir -p "${cfs_path}" - echo 0 > "${cfs_path}/attr_allow_any_host" + _echo 0 "${cfs_path}/attr_allow_any_host" if [[ -z "${blkdev}" ]]; then return 0 fi @@ -825,10 +825,10 @@ _create_nvmet_host() { mkdir "${host_path}" _add_nvmet_allow_hosts "${nvmet_subsystem}" "${nvmet_hostnqn}" if [[ "${nvmet_hostkey}" ]] ; then - echo "${nvmet_hostkey}" > "${host_path}/dhchap_key" + _echo "${nvmet_hostkey}" "${host_path}/dhchap_key" fi if [[ "${nvmet_ctrlkey}" ]] ; then - echo "${nvmet_ctrlkey}" > "${host_path}/dhchap_ctrl_key" + _echo "${nvmet_ctrlkey}" "${host_path}/dhchap_ctrl_key" fi } @@ -838,7 +838,7 @@ _remove_nvmet_ns() { local subsys_path="${NVMET_CFS}/subsystems/${nvmet_subsystem}" local nvmet_ns_path="${subsys_path}/namespaces/${nsid}" - echo 0 > "${nvmet_ns_path}/enable" + _echo 0 "${nvmet_ns_path}/enable" rmdir "${nvmet_ns_path}" } diff --git a/tests/nvme/rc b/tests/nvme/rc index a8f80d8..c106359 100644 --- a/tests/nvme/rc +++ b/tests/nvme/rc @@ -223,12 +223,12 @@ _create_nvmet_passthru() { local passthru_path="${subsys_path}/passthru" mkdir -p "${subsys_path}" - echo 0 > "${subsys_path}/attr_allow_any_host" + _echo 0 "${subsys_path}/attr_allow_any_host" _test_dev_nvme_ctrl > "${passthru_path}/device_path" - echo 1 > "${passthru_path}/enable" + _echo 1 "${passthru_path}/enable" if [[ -f "${passthru_path}/clear_ids" ]]; then - echo 1 > "${passthru_path}/clear_ids" + _echo 1 "${passthru_path}/clear_ids" fi } @@ -237,7 +237,7 @@ _remove_nvmet_passhtru() { local subsys_path="${NVMET_CFS}/subsystems/${nvmet_subsystem}" local passthru_path="${subsys_path}/passthru" - echo 0 > "${passthru_path}/enable" + _echo 0 "${passthru_path}/enable" rm -f "${subsys_path}"/allowed_hosts/* rmdir "${subsys_path}" } @@ -247,8 +247,7 @@ _set_nvmet_hostkey() { local nvmet_hostkey="$2" local cfs_path="${NVMET_CFS}/hosts/${nvmet_hostnqn}" - echo "${nvmet_hostkey}" > \ - "${cfs_path}/dhchap_key" + _echo "${nvmet_hostkey}" "${cfs_path}/dhchap_key" } _set_nvmet_ctrlkey() { @@ -256,8 +255,7 @@ _set_nvmet_ctrlkey() { local nvmet_ctrlkey="$2" local cfs_path="${NVMET_CFS}/hosts/${nvmet_hostnqn}" - echo "${nvmet_ctrlkey}" > \ - "${cfs_path}/dhchap_ctrl_key" + _echo "${nvmet_ctrlkey}" "${cfs_path}/dhchap_ctrl_key" } _set_nvmet_hash() { @@ -265,8 +263,7 @@ _set_nvmet_hash() { local nvmet_hash="$2" local cfs_path="${NVMET_CFS}/hosts/${nvmet_hostnqn}" - echo "${nvmet_hash}" > \ - "${cfs_path}/dhchap_hash" + _echo "${nvmet_hash}" "${cfs_path}/dhchap_hash" } _set_nvmet_dhgroup() { @@ -274,8 +271,7 @@ _set_nvmet_dhgroup() { local nvmet_dhgroup="$2" local cfs_path="${NVMET_CFS}/hosts/${nvmet_hostnqn}" - echo "${nvmet_dhgroup}" > \ - "${cfs_path}/dhchap_dhgroup" + _echo "${nvmet_dhgroup}" "${cfs_path}/dhchap_dhgroup" } _enable_nvmet_ns() { @@ -285,7 +281,7 @@ _enable_nvmet_ns() { cfs_path="${NVMET_CFS}/subsystems/${subsysnqn}" ns_path="${cfs_path}/namespaces/${nsid}" - echo 1 > "${ns_path}/enable" + _echo 1 "${ns_path}/enable" } _disable_nvmet_ns() { @@ -295,7 +291,7 @@ _disable_nvmet_ns() { cfs_path="${NVMET_CFS}/subsystems/${subsysnqn}" ns_path="${cfs_path}/namespaces/${nsid}" - echo 0 > "${ns_path}/enable" + _echo 0 "${ns_path}/enable" } _set_nvmet_ns_uuid() { @@ -473,8 +469,10 @@ _nvme_passthru_logging_setup() _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 + _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() @@ -495,55 +493,55 @@ _nvme_err_inject_cleanup() local a for a in /sys/kernel/debug/"$1"/fault_inject/*; do - echo "${NS_DEV_FAULT_INJECT_SAVE[${a}]}" > "${a}" + _echo "${NS_DEV_FAULT_INJECT_SAVE[${a}]}" "${a}" done for a in /sys/kernel/debug/"$2"/fault_inject/*; do - echo "${CTRL_DEV_FAULT_INJECT_SAVE[${a}]}" > "${a}" + _echo "${CTRL_DEV_FAULT_INJECT_SAVE[${a}]}" "${a}" done } _nvme_enable_err_inject() { - echo "$2" > /sys/kernel/debug/"$1"/fault_inject/verbose - echo "$3" > /sys/kernel/debug/"$1"/fault_inject/probability - echo "$4" > /sys/kernel/debug/"$1"/fault_inject/dont_retry - echo "$5" > /sys/kernel/debug/"$1"/fault_inject/status - echo "$6" > /sys/kernel/debug/"$1"/fault_inject/times + _echo "$2" /sys/kernel/debug/"$1"/fault_inject/verbose + _echo "$3" /sys/kernel/debug/"$1"/fault_inject/probability + _echo "$4" /sys/kernel/debug/"$1"/fault_inject/dont_retry + _echo "$5" /sys/kernel/debug/"$1"/fault_inject/status + _echo "$6" /sys/kernel/debug/"$1"/fault_inject/times } _nvme_disable_err_inject() { - echo 0 > /sys/kernel/debug/"$1"/fault_inject/probability - echo 0 > /sys/kernel/debug/"$1"/fault_inject/times + _echo 0 /sys/kernel/debug/"$1"/fault_inject/probability + _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 + _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 + _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 + _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 + _echo off /sys/class/nvme/"$2"/"$1"/passthru_err_log_enabled } _nvme_reset_ctrl() { - echo 1 > /sys/class/nvme/"$1"/reset_controller + _echo 1 /sys/class/nvme/"$1"/reset_controller } _nvme_delete_ctrl() { - echo 1 > /sys/class/nvme/"$1"/delete_controller + _echo 1 /sys/class/nvme/"$1"/delete_controller } # Check whether the version of the fio is greater than or equal to $1.$2.$3 -- 2.54.0