ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripts/setup: Keep track of the driver given device is bound to

Browse Source 
Change-Id: I4c3a54d017f2ed26ce1fa5afb539063f73fadbc1
Signed-off-by: Michal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4031
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Michal Berger 2020-09-02 14:53:42 +02:00 committed by Tomasz Zawadzki
parent 4f1701f60f
commit 0897e4dbfe
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
scripts/setup.sh
View File

@ -95,21 +95,17 @@ function pci_dev_echo() {
function linux_bind_driver() { function linux_bind_driver() {
bdf="$1" bdf="$1"
driver_name="$2" driver_name="$2"
old_driver_name="no driver" old_driver_name=${drivers_d["$bdf"]:-no driver}
ven_dev_id="${pci_ids_vendor["$bdf"]#0x} ${pci_ids_device["$bdf"]#0x}" ven_dev_id="${pci_ids_vendor["$bdf"]#0x} ${pci_ids_device["$bdf"]#0x}"
if [ -e "/sys/bus/pci/devices/$bdf/driver" ]; then if [[ $driver_name == "$old_driver_name" ]]; then
old_driver_name=$(basename $(readlink /sys/bus/pci/devices/$bdf/driver)) pci_dev_echo "$bdf" "Already using the $old_driver_name driver"
return 0
if [ "$driver_name" = "$old_driver_name" ]; then
pci_dev_echo "$bdf" "Already using the $old_driver_name driver"
return 0
fi
echo "$ven_dev_id" > "/sys/bus/pci/devices/$bdf/driver/remove_id" 2> /dev/null || true
echo "$bdf" > "/sys/bus/pci/devices/$bdf/driver/unbind"
fi fi
echo "$ven_dev_id" > "/sys/bus/pci/devices/$bdf/driver/remove_id" 2> /dev/null || true
echo "$bdf" > "/sys/bus/pci/devices/$bdf/driver/unbind"
pci_dev_echo "$bdf" "$old_driver_name -> $driver_name" pci_dev_echo "$bdf" "$old_driver_name -> $driver_name"
echo "$ven_dev_id" > "/sys/bus/pci/drivers/$driver_name/new_id" 2> /dev/null || true echo "$ven_dev_id" > "/sys/bus/pci/drivers/$driver_name/new_id" 2> /dev/null || true
@ -127,12 +123,11 @@ function linux_unbind_driver() {
local bdf="$1" local bdf="$1"
local ven_dev_id local ven_dev_id
ven_dev_id="${pci_ids_vendor["$bdf"]#0x} ${pci_ids_device["$bdf"]#0x}" ven_dev_id="${pci_ids_vendor["$bdf"]#0x} ${pci_ids_device["$bdf"]#0x}"
local old_driver_name="no driver" local old_driver_name=${drivers_d["$bdf"]:-no driver}
if [ -e "/sys/bus/pci/devices/$bdf/driver" ]; then if [[ -e /sys/bus/pci/drivers/$old_driver_name ]]; then
old_driver_name=$(basename $(readlink /sys/bus/pci/devices/$bdf/driver)) echo "$ven_dev_id" > "/sys/bus/pci/drivers/$old_driver_name/remove_id" 2> /dev/null || true
echo "$ven_dev_id" > "/sys/bus/pci/devices/$bdf/driver/remove_id" 2> /dev/null || true echo "$bdf" > "/sys/bus/pci/drivers/$old_driver_name/unbind"
echo "$bdf" > "/sys/bus/pci/devices/$bdf/driver/unbind"
fi fi
pci_dev_echo "$bdf" "$old_driver_name -> no driver" pci_dev_echo "$bdf" "$old_driver_name -> no driver"
@ -172,7 +167,7 @@ function get_mounted_part_dev_from_bdf_block() {
function collect_devices() { function collect_devices() {
# NVMe, IOAT, IDXD, VIRTIO, VMD # NVMe, IOAT, IDXD, VIRTIO, VMD
local ids dev_type dev_id bdf bdfs in_use local ids dev_type dev_id bdf bdfs in_use driver
ids+="PCI_DEVICE_ID_INTEL_IOAT" ids+="PCI_DEVICE_ID_INTEL_IOAT"
ids+="|PCI_DEVICE_ID_INTEL_IDXD" ids+="|PCI_DEVICE_ID_INTEL_IDXD"
@ -180,7 +175,7 @@ function collect_devices() {
ids+="|PCI_DEVICE_ID_INTEL_VMD" ids+="|PCI_DEVICE_ID_INTEL_VMD"
ids+="|SPDK_PCI_CLASS_NVME" ids+="|SPDK_PCI_CLASS_NVME"
local -gA nvme_d ioat_d idxd_d virtio_d vmd_d all_devices_d local -gA nvme_d ioat_d idxd_d virtio_d vmd_d all_devices_d drivers_d
while read -r _ dev_type dev_id; do while read -r _ dev_type dev_id; do
bdfs=(${pci_bus_cache["0x8086:$dev_id"]}) bdfs=(${pci_bus_cache["0x8086:$dev_id"]})
@ -200,6 +195,10 @@ function collect_devices() {
fi fi
eval "${dev_type}_d[$bdf]=$in_use" eval "${dev_type}_d[$bdf]=$in_use"
all_devices_d["$bdf"]=$in_use all_devices_d["$bdf"]=$in_use
if [[ -e /sys/bus/pci/devices/$bdf/driver ]]; then
driver=$(readlink -f "/sys/bus/pci/devices/$bdf/driver")
drivers_d["$bdf"]=${driver##*/}
fi
done done
done < <(grep -E "$ids" "$rootdir/include/spdk/pci_ids.h") done < <(grep -E "$ids" "$rootdir/include/spdk/pci_ids.h")
} }
@ -476,7 +475,7 @@ function status_linux() {
echo "NVMe devices" echo "NVMe devices"
for bdf in "${!nvme_d[@]}"; do for bdf in "${!nvme_d[@]}"; do
driver=$(grep DRIVER /sys/bus/pci/devices/$bdf/uevent | awk -F"=" '{print $2}') driver=${drivers_d["$bdf"]}
if [ "$numa_nodes" = "0" ]; then if [ "$numa_nodes" = "0" ]; then
node="-" node="-"
else else
@ -497,7 +496,7 @@ function status_linux() {
echo "I/OAT Engine" echo "I/OAT Engine"
for bdf in "${!ioat_d[@]}"; do for bdf in "${!ioat_d[@]}"; do
driver=$(grep DRIVER /sys/bus/pci/devices/$bdf/uevent | awk -F"=" '{print $2}') driver=${drivers_d["$bdf"]}
if [ "$numa_nodes" = "0" ]; then if [ "$numa_nodes" = "0" ]; then
node="-" node="-"
else else
@ -513,7 +512,7 @@ function status_linux() {
echo "IDXD Engine" echo "IDXD Engine"
for bdf in "${!idxd_d[@]}"; do for bdf in "${!idxd_d[@]}"; do
driver=$(grep DRIVER /sys/bus/pci/devices/$bdf/uevent | awk -F"=" '{print $2}') driver=${drivers_d["$bdf"]}
if [ "$numa_nodes" = "0" ]; then if [ "$numa_nodes" = "0" ]; then
node="-" node="-"
else else
@ -526,7 +525,7 @@ function status_linux() {
echo "virtio" echo "virtio"
for bdf in "${!virtio_d[@]}"; do for bdf in "${!virtio_d[@]}"; do
driver=$(grep DRIVER /sys/bus/pci/devices/$bdf/uevent | awk -F"=" '{print $2}') driver=${drivers_d["$bdf"]}
if [ "$numa_nodes" = "0" ]; then if [ "$numa_nodes" = "0" ]; then
node="-" node="-"
else else
@ -543,7 +542,7 @@ function status_linux() {
echo "VMD" echo "VMD"
for bdf in "${!vmd_d[@]}"; do for bdf in "${!vmd_d[@]}"; do
driver=$(grep DRIVER /sys/bus/pci/devices/$bdf/uevent | awk -F"=" '{print $2}') driver=${drivers_d["$bdf"]}
node=$(cat /sys/bus/pci/devices/$bdf/numa_node) node=$(cat /sys/bus/pci/devices/$bdf/numa_node)
if ((node == -1)); then if ((node == -1)); then
node=unknown node=unknown