Commit 4f857ce5 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

scripts/setup: Stop checking for broken uio_pci_generic driver 



This check was put in place as a workaround for some specific kernel
builds which were mainly shipped under centos8. Since we already
dropped centos8 in the CI and replaced it with rocky8 (where kernel
is actually stable) there's no value in maintaining that anymore.

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


Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
parent eab0c664

scripts/setup.sh

+0 −8
Original line number Diff line number Diff line
@@ -160,14 +160,6 @@ function linux_bind_driver() { 
	echo "" > "/sys/bus/pci/devices/$bdf/driver_override"



	if [[ ! -e /sys/bus/pci/drivers/$driver_name/$bdf ]]; then

		if [[ $driver_name == uio_pci_generic ]] && ! check_for_driver igb_uio; then

			# uio_pci_generic driver might be broken in some 4.18.x kernels (see

			# centos8 for instance) so try to fallback to igb_uio.

			pci_dev_echo "$bdf" "uio_pci_generic potentially broken, moving to igb_uio"

			drivers_d["$bdf"]="no driver"

			linux_bind_driver "$bdf" igb_uio

			return

		fi

		pci_dev_echo "$bdf" "failed to bind to $driver_name, aborting"

		return 1

	fi

test/common/autotest_common.sh

+1 −10
Original line number Diff line number Diff line
@@ -268,11 +268,6 @@ if [ "$(uname -s)" = "Linux" ]; then 


	MAKE="make"

	MAKEFLAGS=${MAKEFLAGS:--j$(nproc)}

	if [[ $SPDK_TEST_USE_IGB_UIO -eq 1 ]]; then

		export DRIVER_OVERRIDE=igb_uio

		# Building kernel modules requires root privileges

		MAKE="sudo $MAKE"

	fi

elif [ "$(uname -s)" = "FreeBSD" ]; then

	MAKE="gmake"

	MAKEFLAGS=${MAKEFLAGS:--j$(sysctl -a | grep -E -i 'hw.ncpu' | awk '{print $2}')}
@@ -1345,12 +1340,8 @@ function autotest_cleanup() { 
	$rootdir/scripts/setup.sh reset

	$rootdir/scripts/setup.sh cleanup

	if [ $(uname -s) = "Linux" ]; then

		if [[ $SPDK_TEST_USE_IGB_UIO -eq 1 ]]; then

			[[ -e /sys/module/igb_uio ]] && rmmod igb_uio

		else

		modprobe -r uio_pci_generic

	fi

	fi

	rm -rf "$asan_suppression_file"

	if [[ -n $old_core_pattern ]]; then

		echo "$old_core_pattern" > /proc/sys/kernel/core_pattern

test/setup/driver.sh

+1 −12
Original line number Diff line number Diff line
@@ -34,22 +34,11 @@ vfio() { 
	return 1

}



igb_uio() {

	is_driver igb_uio

}



pick_driver() {

	if vfio; then

		echo "vfio-pci"

	elif uio; then

		# Consider special case for broken uio_pci_generic driver

		if igb_uio; then

			echo "@(uio_pci_generic|igb_uio)"

		else

		echo "uio_pci_generic"

		fi

	elif igb_uio; then

		echo "igb_uio"

	else

		echo "No valid driver found"

	fi