From bbb4826343d7e8b3ec426626264ccdbb7c6a6ddc Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Fri, 11 Feb 2022 08:32:57 +0000 Subject: [PATCH] env_dpdk: link dmadev if CONFIG_VHOST=y rte_dmadev was introduced in DPDK 21.11, and rte_vhost is now dependent on it. So link rte_dmadev if we find it and if CONFIG_VHOST is enabled. Fixes issue #2374. Signed-off-by: Jim Harris Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11594 (master) (cherry picked from commit 662678dfbef02424b0d55d4ea5aca603941fb48d) Change-Id: Iccbf7cb897f51cbc9d545274d4d00a442b2fd353 Signed-off-by: Karol Latecki Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11637 Tested-by: SPDK CI Jenkins Reviewed-by: Konrad Sztyber Reviewed-by: Jim Harris --- lib/env_dpdk/env.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/env_dpdk/env.mk b/lib/env_dpdk/env.mk index 36257fb03e..66a42ab05c 100644 --- a/lib/env_dpdk/env.mk +++ b/lib/env_dpdk/env.mk @@ -105,6 +105,11 @@ LINK_HASH=n ifeq ($(CONFIG_VHOST),y) DPDK_LIB_LIST += rte_vhost +ifneq (, $(wildcard $(DPDK_LIB_DIR)/librte_dmadev.*)) +# Introduced in DPDK 21.11, and rte_vhost became dependent on +# it shortly thereafter +DPDK_LIB_LIST += rte_dmadev +endif LINK_HASH=y ifneq ($(DPDK_FRAMEWORK),y) DPDK_LIB_LIST += rte_cryptodev @@ -122,6 +127,7 @@ DPDK_LIB_LIST += rte_rcu endif endif + DPDK_LIB_LIST_SORTED = $(sort $(DPDK_LIB_LIST)) DPDK_SHARED_LIB = $(DPDK_LIB_LIST_SORTED:%=$(DPDK_LIB_DIR)/lib%.so)