From: Damjan Marion <damarion@cisco.com>
Date: Tue, 26 May 2020 22:37:49 +0000 (+0200)
Subject: dpdk: bump to DPDK v20.05
X-Git-Tag: v21.01-rc0~341
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=94f3295d3807ccadbadbc863640af4fc4c224d7f;p=vpp.git

dpdk: bump to DPDK v20.05

Type: improvement
Change-Id: I5f89fc3d994bd85d2c5138069ea2c58661814228
Signed-off-by: Damjan Marion <damarion@cisco.com>
---

diff --git a/build/external/packages/dpdk.mk b/build/external/packages/dpdk.mk
index c4e6dc76913..2ade07b5431 100644
--- a/build/external/packages/dpdk.mk
+++ b/build/external/packages/dpdk.mk
@@ -21,13 +21,13 @@ DPDK_MLX5_PMD                ?= n
 DPDK_TAP_PMD                 ?= n
 DPDK_FAILSAFE_PMD            ?= n
 
-DPDK_VERSION                 ?= 20.02
+DPDK_VERSION                 ?= 20.05
 DPDK_BASE_URL                ?= http://fast.dpdk.org/rel
 DPDK_TARBALL                 := dpdk-$(DPDK_VERSION).tar.xz
 DPDK_TAR_URL                 := $(DPDK_BASE_URL)/$(DPDK_TARBALL)
 DPDK_18.11_TARBALL_MD5_CKSUM := 04b86f4a77f4f81a7fbd26467dd2ea9f
-DPDK_19.08_TARBALL_MD5_CKSUM := 8a6f5bd844b7a06b34787063409298ed
 DPDK_20.02_TARBALL_MD5_CKSUM := e20171462d6b2252dfbae1de8c45ba10
+DPDK_20.05_TARBALL_MD5_CKSUM := 7c6f3e7f7de2422775c4cba116012c4d
 MACHINE=$(shell uname -m)
 
 # replace dot with space, and if 3rd word exists we deal with stable dpdk rel
@@ -228,6 +228,10 @@ $(B)/custom-config: $(B)/.dpdk-patch.ok Makefile
 	$(call set,RTE_LIBRTE_IFPGA_BUS,n)
 	$(call set,RTE_LIBRTE_BBDEV,n)
 	$(call set,RTE_LIBRTE_BBDEV_NULL,n)
+	$(call set,RTE_LIBRTE_GRAPH,n)
+	$(call set,RTE_LIBRTE_NODE,n)
+	$(call set,RTE_LIBRTE_FIB,n)
+	$(call set,RTE_LIBRTE_RIB,n)
 	$(call set,RTE_TEST_PMD,n)
 	$(call set,RTE_KNI_KMOD,n)
 	$(call set,RTE_EAL_IGB_UIO,n)
diff --git a/src/plugins/dpdk/cryptodev/cryptodev.c b/src/plugins/dpdk/cryptodev/cryptodev.c
index 39da4d7a3ca..62e21265d33 100644
--- a/src/plugins/dpdk/cryptodev/cryptodev.c
+++ b/src/plugins/dpdk/cryptodev/cryptodev.c
@@ -24,6 +24,7 @@
 #include <dpdk/buffer.h>
 #include <dpdk/device/dpdk.h>
 #include <dpdk/device/dpdk_priv.h>
+#undef always_inline
 #include <rte_bus_vdev.h>
 #include <rte_cryptodev.h>
 #include <rte_crypto_sym.h>
@@ -31,6 +32,12 @@
 #include <rte_cryptodev_pmd.h>
 #include <rte_config.h>
 
+#if CLIB_DEBUG > 0
+#define always_inline static inline
+#else
+#define always_inline static inline __attribute__ ((__always_inline__))
+#endif
+
 #define CRYPTODEV_NB_CRYPTO_OPS 1024
 #define CRYPTODEV_NB_SESSION    10240
 #define CRYPTODEV_DEF_DRIVE	crypto_aesni_mb