From 235049db2122e72035798ba437d48c3e0b3684df Mon Sep 17 00:00:00 2001 From: Sergio Gonzalez Monroy Date: Mon, 14 Aug 2017 09:46:19 +0100 Subject: dpdk: cleanup unused build option *_uses_dpdk_cryptodev_sw Change-Id: I62939592bd3cb151e02c55a3f1ee6e7d1ce469cb Signed-off-by: Sergio Gonzalez Monroy --- build-data/packages/dpdk.mk | 5 ----- build-data/packages/vpp.mk | 3 --- build-data/platforms/vpp.mk | 1 - src/plugins/dpdk/ipsec/dpdk_crypto_ipsec_doc.md | 15 ++++----------- 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/build-data/packages/dpdk.mk b/build-data/packages/dpdk.mk index ed89bb1b7b2..ddfb8fd192e 100644 --- a/build-data/packages/dpdk.mk +++ b/build-data/packages/dpdk.mk @@ -10,11 +10,6 @@ DPDK_MAKE_ARGS = -C $(call find_source_fn,$(PACKAGE_SOURCE)) \ DPDK_INSTALL_DIR=$(PACKAGE_INSTALL_DIR) \ DPDK_DEBUG=$(DPDK_DEBUG) -DPDK_CRYPTO_SW_PMD=$(strip $($(PLATFORM)_uses_dpdk_cryptodev_sw)) -ifneq ($(DPDK_CRYPTO_SW_PMD),) -DPDK_MAKE_ARGS += DPDK_CRYPTO_SW_PMD=y -endif - DPDK_MLX5_PMD=$(strip $($(PLATFORM)_uses_dpdk_mlx5_pmd)) ifneq ($(DPDK_MLX5_PMD),) DPDK_MAKE_ARGS += DPDK_MLX5_PMD=y diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk index 1acc59b2922..170f99c52b4 100644 --- a/build-data/packages/vpp.mk +++ b/build-data/packages/vpp.mk @@ -23,9 +23,6 @@ vpp_CPPFLAGS += $(call installed_includes_fn, dpdk)/dpdk vpp_LDFLAGS += $(call installed_libs_fn, dpdk) vpp_CPPFLAGS += -I/usr/include/dpdk endif -ifeq ($($(PLATFORM)_uses_dpdk_cryptodev_sw),yes) -vpp_configure_args += --with-dpdk-crypto-sw -endif ifeq ($($(PLATFORM)_uses_dpdk_mlx5_pmd),yes) vpp_configure_args += --with-dpdk-mlx5-pmd endif diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk index 4577fa2e8a4..6d0fc82847f 100644 --- a/build-data/platforms/vpp.mk +++ b/build-data/platforms/vpp.mk @@ -39,7 +39,6 @@ vpp_uses_dpdk = yes vpp_root_packages = vpp gmod # DPDK configuration parameters -# vpp_uses_dpdk_cryptodev_sw = yes # vpp_uses_dpdk_mlx5_pmd = yes # vpp_uses_external_dpdk = yes # vpp_dpdk_inc_dir = /usr/include/dpdk diff --git a/src/plugins/dpdk/ipsec/dpdk_crypto_ipsec_doc.md b/src/plugins/dpdk/ipsec/dpdk_crypto_ipsec_doc.md index 5a9f9c6e6e2..b3dbd6ea025 100644 --- a/src/plugins/dpdk/ipsec/dpdk_crypto_ipsec_doc.md +++ b/src/plugins/dpdk/ipsec/dpdk_crypto_ipsec_doc.md @@ -7,10 +7,10 @@ This document is meant to contain all related information about implementation a DPDK Cryptodev is an asynchronous crypto API that supports both Hardware and Software implementations (for more details refer to [DPDK Cryptography Device Library documentation](http://dpdk.org/doc/guides/prog_guide/cryptodev_lib.html)). -When DPDK support is enabled and there are enough Cryptodev resources for all workers, the node graph is reconfigured by adding and changing default next nodes. +When there are enough Cryptodev resources for all workers, the node graph is reconfigured by adding and changing the default next nodes. The following nodes are added: -* dpdk-crypto-input : polling input node, basically dequeuing from crypto devices. +* dpdk-crypto-input : polling input node, dequeuing from crypto devices. * dpdk-esp-encrypt : internal node. * dpdk-esp-decrypt : internal node. * dpdk-esp-encrypt-post : internal node. @@ -23,16 +23,9 @@ Set new default next nodes: ### How to enable VPP IPSec with DPDK Cryptodev support -DPDK Cryptodev is supported in DPDK enabled VPP and by default only HW Cryptodev is supported. -To enable SW Cryptodev support (AESNI-MB-PMD and GCM-PMD), we need the following env option: +When building DPDK with VPP, Cryptodev support is always enabled. - vpp_uses_dpdk_cryptodev_sw=yes - -A couple of ways to achive this: -* uncomment/add it in the platforms config (ie. build-data/platforms/vpp.mk) -* set the option when building vpp (ie. make vpp_uses_dpdk_cryptodev_sw=yes build-release) - -When enabling SW Cryptodev support, it means that you need to pre-build the required crypto libraries needed by those SW Cryptodev PMDs. This requires nasm, see nasm section below. +Additionally, on x86_64 platforms, DPDK is built with SW crypto support. ### Crypto Resources allocation -- cgit 1.2.3-korg