14ce25ab00
This patch adds waitforblk() after rebinding the driver. If timing was unfortunate, it was possible to issue id-ctrlr command to a device that was not yet ready. Meaning the support for fw command was not read properly. No error was reported due to "set +e", so this patch moves it till after id-ctrlr. Example of the error: # get_nvme_ctrlr_from_bdf 0000:82:00.0 # readlink -f /sys/class/nvme/nvme9 # grep 0000:82:00.0/nvme/nvme # bdf_sysfs_path=/sys/devices/pci0000:80/0000:80:03.0/0000:82:00.0/nvme/nvme9 # [[ -z /sys/devices/pci0000:80/0000:80:03.0/0000:82:00.0/nvme/nvme9 ]] # basename /sys/devices/pci0000:80/0000:80:03.0/0000:82:00.0/nvme/nvme9 # printf '%s\n' nvme9 # nvme_name=nvme9 # [[ -z nvme9 ]] # set +e # ctrlr=/dev/nvme9 # ns=/dev/nvme9n1 # /usr/local/src/nvme-cli/nvme id-ctrl /dev/nvme9 # grep oacs # cut -d: -f2 /dev/nvme9: Resource temporarily unavailable Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Change-Id: I5728a5062cd553eb39d18d9869fdf56319a27777 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2950 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: Karol Latecki <karol.latecki@intel.com>
110 lines
2.6 KiB
Bash
Executable File
110 lines
2.6 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
testdir=$(readlink -f $(dirname $0))
|
|
rootdir=$(readlink -f $testdir/../../..)
|
|
source $rootdir/scripts/common.sh
|
|
source $rootdir/test/common/autotest_common.sh
|
|
|
|
rm -Rf $testdir/match_files
|
|
mkdir $testdir/match_files
|
|
|
|
KERNEL_OUT=$testdir/match_files/kernel.out
|
|
CUSE_OUT=$testdir/match_files/cuse.out
|
|
|
|
NVME_CMD=/usr/local/src/nvme-cli/nvme
|
|
rpc_py=$rootdir/scripts/rpc.py
|
|
|
|
bdf=$(get_first_nvme_bdf)
|
|
|
|
PCI_WHITELIST="${bdf}" $rootdir/scripts/setup.sh reset
|
|
sleep 1
|
|
nvme_name=$(get_nvme_ctrlr_from_bdf ${bdf})
|
|
if [[ -z "$nvme_name" ]]; then
|
|
echo "setup.sh failed bind kernel driver to ${bdf}"
|
|
return 1
|
|
fi
|
|
|
|
ctrlr="/dev/${nvme_name}"
|
|
ns="/dev/${nvme_name}n1"
|
|
|
|
waitforblk "${nvme_name}n1"
|
|
|
|
oacs=$(${NVME_CMD} id-ctrl $ctrlr | grep oacs | cut -d: -f2)
|
|
oacs_firmware=$((oacs & 0x4))
|
|
|
|
set +e
|
|
|
|
${NVME_CMD} get-ns-id $ns > ${KERNEL_OUT}.1
|
|
${NVME_CMD} id-ns $ns > ${KERNEL_OUT}.2
|
|
${NVME_CMD} list-ns $ns > ${KERNEL_OUT}.3
|
|
|
|
${NVME_CMD} id-ctrl $ctrlr > ${KERNEL_OUT}.4
|
|
${NVME_CMD} list-ctrl $ctrlr > ${KERNEL_OUT}.5
|
|
if [ "$oacs_firmware" -ne "0" ]; then
|
|
${NVME_CMD} fw-log $ctrlr > ${KERNEL_OUT}.6
|
|
fi
|
|
${NVME_CMD} smart-log $ctrlr
|
|
${NVME_CMD} error-log $ctrlr > ${KERNEL_OUT}.7
|
|
${NVME_CMD} get-feature $ctrlr -f 1 -s 1 -l 100 > ${KERNEL_OUT}.8
|
|
${NVME_CMD} get-log $ctrlr -i 1 -l 100 > ${KERNEL_OUT}.9
|
|
${NVME_CMD} reset $ctrlr > ${KERNEL_OUT}.10
|
|
|
|
set -e
|
|
|
|
$rootdir/scripts/setup.sh
|
|
|
|
$SPDK_BIN_DIR/spdk_tgt -m 0x3 &
|
|
spdk_tgt_pid=$!
|
|
trap 'kill -9 ${spdk_tgt_pid}; exit 1' SIGINT SIGTERM EXIT
|
|
|
|
waitforlisten $spdk_tgt_pid
|
|
|
|
$rpc_py bdev_nvme_attach_controller -b Nvme0 -t PCIe -a ${bdf}
|
|
$rpc_py bdev_nvme_cuse_register -n Nvme0
|
|
|
|
sleep 5
|
|
|
|
if [ ! -c /dev/spdk/nvme0 ]; then
|
|
return 1
|
|
fi
|
|
|
|
$rpc_py bdev_get_bdevs
|
|
$rpc_py bdev_nvme_get_controllers
|
|
|
|
set +e
|
|
|
|
ns="/dev/spdk/nvme0n1"
|
|
${NVME_CMD} get-ns-id $ns > ${CUSE_OUT}.1
|
|
${NVME_CMD} id-ns $ns > ${CUSE_OUT}.2
|
|
${NVME_CMD} list-ns $ns > ${CUSE_OUT}.3
|
|
|
|
ctrlr="/dev/spdk/nvme0"
|
|
${NVME_CMD} id-ctrl $ctrlr > ${CUSE_OUT}.4
|
|
${NVME_CMD} list-ctrl $ctrlr > ${CUSE_OUT}.5
|
|
if [ "$oacs_firmware" -ne "0" ]; then
|
|
${NVME_CMD} fw-log $ctrlr > ${CUSE_OUT}.6
|
|
fi
|
|
${NVME_CMD} smart-log $ctrlr
|
|
${NVME_CMD} error-log $ctrlr > ${CUSE_OUT}.7
|
|
${NVME_CMD} get-feature $ctrlr -f 1 -s 1 -l 100 > ${CUSE_OUT}.8
|
|
${NVME_CMD} get-log $ctrlr -i 1 -l 100 > ${CUSE_OUT}.9
|
|
${NVME_CMD} reset $ctrlr > ${CUSE_OUT}.10
|
|
|
|
set -e
|
|
|
|
for i in {1..10}; do
|
|
if [ -f "${KERNEL_OUT}.${i}" ] && [ -f "${CUSE_OUT}.${i}" ]; then
|
|
sed -i "s/${nvme_name}/nvme0/g" ${KERNEL_OUT}.${i}
|
|
diff --suppress-common-lines ${KERNEL_OUT}.${i} ${CUSE_OUT}.${i}
|
|
fi
|
|
done
|
|
|
|
rm -Rf $testdir/match_files
|
|
|
|
if [ ! -c "$ctrlr" ]; then
|
|
return 1
|
|
fi
|
|
|
|
trap - SIGINT SIGTERM EXIT
|
|
killprocess $spdk_tgt_pid
|