Commit f1068fef authored Aug 10, 2023 by Michal Berger Committed by Tomasz Zawadzki Sep 07, 2023

scripts/setup: Add some extra details to pdevices()



To allow user identify given devices easier, especially when they
are bound to userspace drivers.

Change-Id: I66d4de6204aa62b23a0ddec4ff851fdc61490fc3
Signed-off-by: Michal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/19443


Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Jim Harris <jim.harris@gmail.com>

parent 44fef7d2

scripts/common/setup/interactive.sh

+5 −2

Original line number	Diff line number	Diff line
		@@ -118,9 +118,12 @@ pdevices() {
		echo "No devices found"
		else
		for dev in "${!dev_ref[@]}"; do
		printf '%s- %s [%s, %s]\n' \
		printf '%s- %s [%s, %s] (%s@%s:%s)\n' \
		"${set_marker:+${markers["${use_map[all_devices_d["$dev"]]}"]} }" \
		"$dev" "${use_map[all_devices_d["$dev"]]}" "${drivers_d["$dev"]:-none}"
		"$dev" "${use_map[all_devices_d["$dev"]]}" "${drivers_d["$dev"]:-none}" \
		"${all_devices_type_d["$dev"]}" \
		"${pci_ids_vendor["$dev"]}" \
		"${pci_ids_device["$dev"]}"
		done
		fi
		}

scripts/setup.sh

+2 −1

Original line number	Diff line number	Diff line
		@@ -292,7 +292,7 @@ function collect_devices() {
		ids+="\|PCI_DEVICE_ID_INTEL_VMD"
		ids+="\|SPDK_PCI_CLASS_NVME"

		local -gA nvme_d ioat_d dsa_d iaa_d virtio_d vmd_d all_devices_d drivers_d types_d
		local -gA nvme_d ioat_d dsa_d iaa_d virtio_d vmd_d all_devices_d drivers_d types_d all_devices_type_d

		while read -r _ dev_type dev_id; do
		bdfs=(${pci_bus_cache["0x8086:$dev_id"]})
		@@ -332,6 +332,7 @@ function collect_devices() {
		fi
		eval "${dev_type}_d[$bdf]=$in_use"
		all_devices_d["$bdf"]=$in_use
		all_devices_type_d["$bdf"]=$dev_type
		if [[ -e /sys/bus/pci/devices/$bdf/driver ]]; then
		driver=$(readlink -f "/sys/bus/pci/devices/$bdf/driver")
		drivers_d["$bdf"]=${driver##*/}