Commit fa3f818b authored by Michal Berger's avatar Michal Berger Committed by Konrad Sztyber
Browse files

tests: Skip block devices marked as hidden 



These devices don't come with their major:minor dev, hence they won't
pop up under /dev, i.e. are not really usable.

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


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
parent c976353b

scripts/setup.sh

+9 −3
Original line number Diff line number Diff line
@@ -195,13 +195,19 @@ function linux_hugetlbfs_mounts() { 


function get_block_dev_from_bdf() {

	local bdf=$1

	local block

	local block blocks=() ctrl



	for block in /sys/block/*; do

		if [[ $(readlink -f "$block/device") == *"/$bdf/"* ]]; then

			echo "${block##*/}"

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

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

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

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

			fi

		elif [[ $(readlink -f "$block/device") == *"/$bdf/"* ]]; then

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

		fi

	done

	printf '%s\n' "${blocks[@]}"

}



function get_used_bdf_block_devs() {

test/setup/devices.sh

+4 −3
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ rootdir=$(readlink -f "$testdir/../../") 
source "$testdir/common.sh"



shopt -s nullglob

shopt -s extglob



cleanup() {

	cleanup_nvme
@@ -195,9 +196,9 @@ declare -a blocks=() 
declare -A blocks_to_pci=()

min_disk_size=$((1024 ** 3 * 3)) # 3GB



for block in "/sys/block/nvme"*; do

	pci=$(readlink -f "$block/device/device")

	pci=${pci##*/}

for block in "/sys/block/nvme"!(*c*); do

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

	pci=$(< "/sys/class/nvme/$ctrl/address")

	[[ ${zoned_devs[*]} == *"$pci"* ]] && continue

	if ! block_in_use "${block##*/}" && (($(sec_size_to_bytes "${block##*/}") >= min_disk_size)); then

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