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

scripts/setup: Group all devices into respective arrays

Browse Source 
This is a first patch from a series attempting to merge similar
routines used throughout setup.sh.

Change-Id: I4c71b88f7556b0e9e2f65a37b8175914022486a4
Signed-off-by: Michal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3889
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Michal Berger 2020-08-21 12:15:13 +02:00 committed by Tomasz Zawadzki
parent 58216dd07e
commit 51b5fa8579
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scripts/setup.sh
View File

@ -179,6 +179,31 @@ function get_virtio_names_from_bdf() {
eval "$2=( " "${virtio_names[@]}" " )" eval "$2=( " "${virtio_names[@]}" " )"
} }
function collect_devices() {
# NVMe, IOAT, IDXD, VIRTIO, VMD
local ids dev_type dev_id bdf bdfs
ids+="PCI_DEVICE_ID_INTEL_IOAT"
ids+="|PCI_DEVICE_ID_INTEL_IDXD"
ids+="|PCI_DEVICE_ID_VIRTIO"
ids+="|PCI_DEVICE_ID_INTEL_VMD"
ids+="|SPDK_PCI_CLASS_NVME"
local -gA nvme_d ioat_d idxd_d virtio_d vmd_d all_devices_d
while read -r _ dev_type dev_id; do
bdfs=(${pci_bus_cache["0x8086:$dev_id"]})
[[ $dev_type == *NVME* ]] && bdfs=(${pci_bus_cache["$dev_id"]})
[[ $dev_type == *VIRT* ]] && bdfs=(${pci_bus_cache["0x1af4:$dev_id"]})
[[ $dev_type =~ (NVME|IOAT|IDXD|VIRTIO|VMD) ]]
for bdf in "${bdfs[@]}"; do
eval "${BASH_REMATCH[1],,}_d[$bdf]=1"
all_devices_d["$bdf"]=1
done
done < <(grep -E "$ids" "$rootdir/include/spdk/pci_ids.h")
}
function configure_linux_pci() { function configure_linux_pci() {
local driver_path="" local driver_path=""
driver_name="" driver_name=""
@ -850,6 +875,7 @@ if [ -z "$TARGET_USER" ]; then
fi fi
fi fi
collect_devices "$mode"
if [[ $os == Linux ]]; then if [[ $os == Linux ]]; then
HUGEPGSZ=$(($(grep Hugepagesize /proc/meminfo | cut -d : -f 2 | tr -dc '0-9'))) HUGEPGSZ=$(($(grep Hugepagesize /proc/meminfo | cut -d : -f 2 | tr -dc '0-9')))
HUGEPGSZ_MB=$((HUGEPGSZ / 1024)) HUGEPGSZ_MB=$((HUGEPGSZ / 1024))