From 8db652e17eef643e272c41bacf58329750e0f2c2 Mon Sep 17 00:00:00 2001 From: Alexey Marchuk Date: Fri, 11 Sep 2020 15:27:59 +0300 Subject: [PATCH] mk: Build crypto/qat when --with-reduce is specified DPDK compilation fails when we configure SPDK using --with-reduce: ../drivers/common/qat/qat_qp.c:18:10: fatal error: qat_sym.h: No such file or directory #include "qat_sym.h" ^~~~~~~~~~~ But when SPDK is also configured using --with-crypto, DPDK is built successfully --with-crypto enables build of crypto/qat driver and meson config for this driver adds dpdk/driver/crypto/qat directory to QAT includes. This directory contains the missing qat_sym.h and qat_sym_pmd.h files. Group common drivers required by crypto/reduce Fixes issue #1529 Change-Id: I7a53411798091e9a3c16442f3951ff73138d7337 Signed-off-by: Alexey Marchuk Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4179 Reviewed-by: Paul Luse Reviewed-by: Tomasz Zawadzki Reviewed-by: Ben Walker Reviewed-by: Jim Harris Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins --- dpdkbuild/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dpdkbuild/Makefile b/dpdkbuild/Makefile index f6429eb44..9568f263c 100644 --- a/dpdkbuild/Makefile +++ b/dpdkbuild/Makefile @@ -51,15 +51,20 @@ DPDK_OPTS += -Denable_kmods=$(DPDK_KMODS) # the drivers we use DPDK_DRIVERS = bus bus/pci bus/vdev mempool/ring +# common crypto/reduce drivers +ifeq ($(findstring y,$(CONFIG_CRYPTO)$(CONFIG_REDUCE)),y) +DPDK_DRIVERS += crypto/qat compress/qat common/qat +endif + ifeq ($(CONFIG_CRYPTO),y) # crypto/qat is just a stub, the compress/qat pmd is used instead -DPDK_DRIVERS += crypto crypto/aesni_mb crypto/qat compress/qat common/qat +DPDK_DRIVERS += crypto crypto/aesni_mb DPDK_CFLAGS += -I$(IPSEC_MB_DIR) DPDK_LDFLAGS += -L$(IPSEC_MB_DIR) endif ifeq ($(CONFIG_REDUCE),y) -DPDK_DRIVERS += compress compress/isal compress/qat common/qat +DPDK_DRIVERS += compress compress/isal DPDK_CFLAGS += -I$(ISAL_DIR) DPDK_LDFLAGS += -L$(ISAL_DIR)/.libs -lisal endif