Commit c708e6df authored by Tomasz Zawadzki's avatar Tomasz Zawadzki
Browse files

test/dpdk: enable kmods on FreeBSD for upstream DPDK tests 

To compile contigmem and nic_uio in DPDK the `enable_kmods`
flag has to be enabled in meson. This is required for FreeBSD.

This is done in dpdkbuild/Makefile for the submodule,
but is needed in build_native_dpdk() for upstream DPDK tests.

While here, removed comment in autotest_common.sh that refered
to patch that was already upstreamed to DPDK. See:
https://review.spdk.io/gerrit/c/spdk/dpdk/+/2534



Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: I2ee17ed5b62291881e64b687c642a81993e03e36
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11238


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarMichal Berger <michallinuxstuff@gmail.com>
Reviewed-by: default avatarPawel Piatek <pawelx.piatek@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent d1637d78

autobuild.sh

+7 −1
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ function build_native_dpdk() { 
	local external_dpdk_base_dir

	local compiler_version

	local compiler

	local dpdk_kmods



	compiler=${CC:-gcc}
@@ -167,8 +168,13 @@ function build_native_dpdk() { 
		fi

	fi



	dpdk_kmods="false"

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

		dpdk_kmods="true"

	fi



	meson build-tmp --prefix="$external_dpdk_dir" --libdir lib \

		-Denable_docs=false -Denable_kmods=false -Dtests=false \

		-Denable_docs=false -Denable_kmods="$dpdk_kmods" -Dtests=false \

		-Dc_link_args="$dpdk_ldflags" -Dc_args="$dpdk_cflags" \

		-Dmachine=native -Denable_drivers=$(printf "%s," "${DPDK_DRIVERS[@]}")

	ninja -C "$external_dpdk_base_dir/build-tmp" $MAKEFLAGS

test/common/autotest_common.sh

+0 −1
Original line number Diff line number Diff line
@@ -1265,7 +1265,6 @@ function freebsd_update_contigmem_mod() { 
	if [ $(uname) = FreeBSD ]; then

		kldunload contigmem.ko || true

		if [ -n "$SPDK_RUN_EXTERNAL_DPDK" ]; then

			echo "Warning: SPDK only works on FreeBSD with patches that only exist in SPDK's dpdk submodule"

			cp -f "$SPDK_RUN_EXTERNAL_DPDK/kmod/contigmem.ko" /boot/modules/

			cp -f "$SPDK_RUN_EXTERNAL_DPDK/kmod/contigmem.ko" /boot/kernel/

			cp -f "$SPDK_RUN_EXTERNAL_DPDK/kmod/nic_uio.ko" /boot/modules/