Commit 0005b3ed authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

scripts/setup: Change how nvme ctrl is picked up 



Don't rely on block device's name since scenario where, for
instance, nvme0n1 is attached to nvme2 is plausible:

 # readlink -f /sys/block/nvme0n1/device
  /sys/devices/pci0000:80/0000:80:03.0/0000:85:00.0/nvme/nvme2

Change-Id: I21fcb5abb31bc424041d33750d4249224e0144a4
Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/19656


Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarJim Harris <jim.harris@gmail.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 73517575

scripts/setup.sh

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ function get_block_dev_from_bdf() { 


	for block in /sys/block/*; do

		if [[ $block == *nvme* ]]; then

			ctrl=${block##*/} ctrl=${ctrl%n*}

			ctrl=$(readlink -f "$block/device") ctrl=${ctrl##*/}

			if [[ -e /sys/class/nvme/$ctrl && $(< "/sys/class/nvme/$ctrl/address") == "$bdf" ]]; then

				blocks+=("${block##*/}")

			fi