6fc5e718ab
Disks with NVMe driver were probably not whitelisted before. Do not add them to NVMe subsystem configuration. Change-Id: I9418590f5562a96750685d101323b60e56cc90cb Signed-off-by: Karol Latecki <karol.latecki@intel.com> Reviewed-on: https://review.gerrithub.io/c/438426 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
57 lines
1.1 KiB
Bash
Executable File
57 lines
1.1 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
set -e
|
|
|
|
rootdir=$(readlink -f $(dirname $0))/..
|
|
source "$rootdir/scripts/common.sh"
|
|
|
|
function create_classic_config()
|
|
{
|
|
echo "[Nvme]"
|
|
for (( i=0; i < ${#bdfs[@]}; i++))
|
|
do
|
|
echo " TransportID \"trtype:PCIe traddr:${bdfs[i]}\" Nvme$i"
|
|
done
|
|
}
|
|
|
|
function create_json_config()
|
|
{
|
|
echo "{"
|
|
echo '"subsystem": "bdev",'
|
|
echo '"config": ['
|
|
for (( i=0; i < ${#bdfs[@]}; i++))
|
|
do
|
|
echo '{'
|
|
echo '"params": {'
|
|
echo '"trtype": "PCIe",'
|
|
echo "\"name\": \"Nvme$i\","
|
|
echo "\"traddr\": \"${bdfs[i]}\""
|
|
echo '},'
|
|
echo '"method": "construct_nvme_bdev"'
|
|
if [ -z ${bdfs[i+1]} ]; then
|
|
echo '}'
|
|
else
|
|
echo '},'
|
|
fi
|
|
done
|
|
echo ']'
|
|
echo '}'
|
|
}
|
|
|
|
bdfs=()
|
|
# Check used drivers. If it's not vfio-pci or uio-pci-generic
|
|
# then most likely PCI_WHITELIST option was used for setup.sh
|
|
# and we do not want to use that disk.
|
|
for bdf in $(iter_pci_class_code 01 08 02); do
|
|
driver=`grep DRIVER /sys/bus/pci/devices/$bdf/uevent | awk -F"=" '{print $2}'`
|
|
if [ "$driver" != "nvme" ]; then
|
|
bdfs+=("$bdf")
|
|
fi
|
|
done
|
|
|
|
if [ "$1" = "--json" ]; then
|
|
create_json_config
|
|
else
|
|
create_classic_config
|
|
fi
|