From 83afe686908915f4a2086ce8082eccd8899fe625 Mon Sep 17 00:00:00 2001 From: paul luse Date: Thu, 30 May 2019 21:04:26 -0400 Subject: [PATCH] dpdk: build and link QAT for both crypto and compression In prep for full QAT compression support later in this patch series. dpdkbuild/Makefile slightly refactored for readability, x86 crypto check removed as it pre-dated checks we now have in configure. Signed-off-by: paul luse Change-Id: Iaaaf51b9eb5e18840f47d2d4f431c5a6e8c420ee Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/456408 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto --- dpdkbuild/Makefile | 34 +++++++++++++++++----------------- lib/env_dpdk/env.mk | 4 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dpdkbuild/Makefile b/dpdkbuild/Makefile index 9ac0bf556..5bfecf4d6 100644 --- a/dpdkbuild/Makefile +++ b/dpdkbuild/Makefile @@ -36,36 +36,23 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk .PHONY: all clean install uninstall -CRYPTO_ENABLED=n - +DPDK_FRAMEWORK = n DPDK_OPTS = DPDK_CFLAGS = -ifeq ($(TARGET_MACHINE),x86_64) ifeq ($(CONFIG_CRYPTO),y) -CRYPTO_ENABLED = y +DPDK_FRAMEWORK = y DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_AESNI_MB=y +DPDK_OPTS += CONFIG_RTE_LIBRTE_REORDER=y DPDK_CFLAGS += -I$(IPSEC_MB_DIR) DPDK_LDFLAGS += -L$(IPSEC_MB_DIR) -DPDK_OPTS += CONFIG_RTE_LIBRTE_REORDER=y -DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT=y -DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT_SYM=y -endif -ifeq ($(CONFIG_IGB_UIO_DRIVER),y) -DPDK_OPTS += CONFIG_RTE_EAL_IGB_UIO=y else -DPDK_OPTS += CONFIG_RTE_EAL_IGB_UIO=n -endif -endif - -ifeq ($(CRYPTO_ENABLED),n) DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n DPDK_OPTS += CONFIG_RTE_LIBRTE_REORDER=n -DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT=n -DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT_SYM=n endif ifeq ($(CONFIG_REDUCE),y) +DPDK_FRAMEWORK = y DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_ISAL=y DPDK_CFLAGS += -I$(ISAL_DIR) DPDK_LDFLAGS += -L$(ISAL_DIR)/.libs @@ -73,6 +60,19 @@ else DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_ISAL=n endif +ifeq ($(DPDK_FRAMEWORK),y) +DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT=y +DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT_SYM=y +ifeq ($(CONFIG_IGB_UIO_DRIVER),y) +DPDK_OPTS += CONFIG_RTE_EAL_IGB_UIO=y +else +DPDK_OPTS += CONFIG_RTE_EAL_IGB_UIO=n +endif +else +DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT=n +DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT_SYM=n +endif + ifeq ($(TARGET_MACHINE),aarch64) DPDK_CONFIG := arm64-armv8a else diff --git a/lib/env_dpdk/env.mk b/lib/env_dpdk/env.mk index e539690c2..b9e370ca0 100644 --- a/lib/env_dpdk/env.mk +++ b/lib/env_dpdk/env.mk @@ -84,7 +84,7 @@ endif DPDK_FRAMEWORK=n ifeq ($(CONFIG_CRYPTO),y) DPDK_FRAMEWORK=y -DPDK_LIB_LIST += rte_pmd_aesni_mb rte_pmd_qat rte_reorder +DPDK_LIB_LIST += rte_pmd_aesni_mb rte_reorder endif ifeq ($(CONFIG_REDUCE),y) @@ -93,7 +93,7 @@ DPDK_LIB_LIST += rte_pmd_isal_comp endif ifeq ($(DPDK_FRAMEWORK),y) -DPDK_LIB_LIST += rte_cryptodev rte_compressdev rte_bus_vdev +DPDK_LIB_LIST += rte_cryptodev rte_compressdev rte_bus_vdev rte_pmd_qat endif ifneq (, $(wildcard $(DPDK_ABS_DIR)/lib/librte_kvargs.*))