DPDK patches and discussions
 help / color / mirror / Atom feed
* [dpdk-dev] [PATCH v1 1/2] crypto/aesni_mb: support IPsec MUlti-buffer lib v0.49
@ 2018-03-27 12:14 Kovacevic, Marko
  2018-03-27 12:14 ` [dpdk-dev] [PATCH v1 2/2] crypto/aesni_gcm: support IPsec Multi-buffer " Kovacevic, Marko
                   ` (3 more replies)
  0 siblings, 4 replies; 13+ messages in thread
From: Kovacevic, Marko @ 2018-03-27 12:14 UTC (permalink / raw)
  To: dev; +Cc: pablo.de.lara.guarch, Marko Kovacevic

From: Marko Kovacevic <marko.kovacevic@intel.com>

Signed-off-by: Marko Kovacevic <marko.kovacevic@intel.com>
---
 devtools/test-build.sh                     |  2 --
 doc/guides/cryptodevs/aesni_mb.rst         | 13 ++++++-------
 drivers/crypto/aesni_mb/Makefile           | 10 +---------
 drivers/crypto/aesni_mb/aesni_mb_ops.h     |  3 +--
 drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 12 ++++++------
 mk/rte.app.mk                              |  2 +-
 6 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/devtools/test-build.sh b/devtools/test-build.sh
index 3362edc..cc72234 100755
--- a/devtools/test-build.sh
+++ b/devtools/test-build.sh
@@ -183,8 +183,6 @@ config () # <directory> <target> <options>
 		test -z "$ARMV8_CRYPTO_LIB_PATH" || \
 		sed -ri   's,(PMD_ARMV8_CRYPTO=)n,\1y,' $1/.config
 		test -z "$AESNI_MULTI_BUFFER_LIB_PATH" || \
-		sed -ri       's,(PMD_AESNI_MB=)n,\1y,' $1/.config
-		test -z "$AESNI_MULTI_BUFFER_LIB_PATH" || \
 		sed -ri      's,(PMD_AESNI_GCM=)n,\1y,' $1/.config
 		test -z "$LIBSSO_SNOW3G_PATH" || \
 		sed -ri         's,(PMD_SNOW3G=)n,\1y,' $1/.config
diff --git a/doc/guides/cryptodevs/aesni_mb.rst b/doc/guides/cryptodevs/aesni_mb.rst
index 3950daa..1680c4a 100644
--- a/doc/guides/cryptodevs/aesni_mb.rst
+++ b/doc/guides/cryptodevs/aesni_mb.rst
@@ -56,12 +56,13 @@ Installation
 To build DPDK with the AESNI_MB_PMD the user is required to download the multi-buffer
 library from `here <https://github.com/01org/intel-ipsec-mb>`_
 and compile it on their user system before building DPDK.
-The latest version of the library supported by this PMD is v0.48, which
-can be downloaded from `<https://github.com/01org/intel-ipsec-mb/archive/v0.48.zip>`_.
+The latest version of the library supported by this PMD is v0.49, which
+can be downloaded from `<https://github.com/01org/intel-ipsec-mb/archive/v0.49.zip>`_.
 
 .. code-block:: console
 
-	make
+    make
+    make install
 
 As a reference, the following table shows a mapping between the past DPDK versions
 and the Multi-Buffer library version supported by them:
@@ -77,7 +78,8 @@ and the Multi-Buffer library version supported by them:
    17.02           0.44
    17.05 - 17.08   0.45 - 0.48
    17.11           0.47 - 0.48
-   18.02+          0.48
+   18.02           0.48
+   18.05           0.49
    ==============  ============================
 
 
@@ -86,9 +88,6 @@ Initialization
 
 In order to enable this virtual crypto PMD, user must:
 
-* Export the environmental variable AESNI_MULTI_BUFFER_LIB_PATH with the path where
-  the library was extracted.
-
 * Build the multi buffer library (explained in Installation section).
 
 * Set CONFIG_RTE_LIBRTE_PMD_AESNI_MB=y in config/common_base.
diff --git a/drivers/crypto/aesni_mb/Makefile b/drivers/crypto/aesni_mb/Makefile
index d9f8fb9..806a95e 100644
--- a/drivers/crypto/aesni_mb/Makefile
+++ b/drivers/crypto/aesni_mb/Makefile
@@ -3,12 +3,6 @@
 
 include $(RTE_SDK)/mk/rte.vars.mk
 
-ifneq ($(MAKECMDGOALS),clean)
-ifeq ($(AESNI_MULTI_BUFFER_LIB_PATH),)
-$(error "Please define AESNI_MULTI_BUFFER_LIB_PATH environment variable")
-endif
-endif
-
 # library name
 LIB = librte_pmd_aesni_mb.a
 
@@ -23,9 +17,7 @@ LIBABIVER := 1
 EXPORT_MAP := rte_pmd_aesni_mb_version.map
 
 # external library dependencies
-CFLAGS += -I$(AESNI_MULTI_BUFFER_LIB_PATH)
-CFLAGS += -I$(AESNI_MULTI_BUFFER_LIB_PATH)/include
-LDLIBS += -L$(AESNI_MULTI_BUFFER_LIB_PATH) -lIPSec_MB
+LDLIBS += -lIPSec_MB
 LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
 LDLIBS += -lrte_cryptodev
 LDLIBS += -lrte_bus_vdev
diff --git a/drivers/crypto/aesni_mb/aesni_mb_ops.h b/drivers/crypto/aesni_mb/aesni_mb_ops.h
index 4d596e8..56fd829 100644
--- a/drivers/crypto/aesni_mb/aesni_mb_ops.h
+++ b/drivers/crypto/aesni_mb/aesni_mb_ops.h
@@ -9,8 +9,7 @@
 #define LINUX
 #endif
 
-#include <mb_mgr.h>
-#include <aux_funcs.h>
+#include <intel-ipsec-mb.h>
 
 enum aesni_mb_vector_mode {
 	RTE_AESNI_MB_NOT_SUPPORTED = 0,
diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c
index cb97175..6f06ec4 100644
--- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c
+++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c
@@ -2,7 +2,7 @@
  * Copyright(c) 2015-2017 Intel Corporation
  */
 
-#include <des.h>
+#include <intel-ipsec-mb.h>
 
 #include <rte_common.h>
 #include <rte_hexdump.h>
@@ -517,15 +517,15 @@ set_mb_job_params(JOB_AES_HMAC *job, struct aesni_mb_qp *qp,
 	/* Set authentication parameters */
 	job->hash_alg = session->auth.algo;
 	if (job->hash_alg == AES_XCBC) {
-		job->_k1_expanded = session->auth.xcbc.k1_expanded;
-		job->_k2 = session->auth.xcbc.k2;
-		job->_k3 = session->auth.xcbc.k3;
+		job->u.XCBC._k1_expanded = session->auth.xcbc.k1_expanded;
+		job->u.XCBC._k2 = session->auth.xcbc.k2;
+		job->u.XCBC._k3 = session->auth.xcbc.k3;
 	} else if (job->hash_alg == AES_CCM) {
 		job->u.CCM.aad = op->sym->aead.aad.data + 18;
 		job->u.CCM.aad_len_in_bytes = session->aead.aad_len;
 	} else {
-		job->hashed_auth_key_xor_ipad = session->auth.pads.inner;
-		job->hashed_auth_key_xor_opad = session->auth.pads.outer;
+		job->u.HMAC._hashed_auth_key_xor_ipad = session->auth.pads.inner;
+		job->u.HMAC._hashed_auth_key_xor_opad = session->auth.pads.outer;
 	}
 
 	/* Mutable crypto operation parameters */
diff --git a/mk/rte.app.mk b/mk/rte.app.mk
index 94525dc..b05a9ed 100644
--- a/mk/rte.app.mk
+++ b/mk/rte.app.mk
@@ -198,7 +198,7 @@ endif # CONFIG_RTE_LIBRTE_BBDEV
 
 ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y)
 _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB)    += -lrte_pmd_aesni_mb
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB)    += -L$(AESNI_MULTI_BUFFER_LIB_PATH) -lIPSec_MB
+_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB)    += -lIPSec_MB
 _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM)   += -lrte_pmd_aesni_gcm
 _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM)   += -L$(AESNI_MULTI_BUFFER_LIB_PATH) -lIPSec_MB
 _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL)     += -lrte_pmd_openssl -lcrypto
-- 
2.9.5

^ permalink raw reply	[flat|nested] 13+ messages in thread
end of thread, other threads:[~2018-04-04 12:33 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-27 12:14 [dpdk-dev] [PATCH v1 1/2] crypto/aesni_mb: support IPsec MUlti-buffer lib v0.49 Kovacevic, Marko
2018-03-27 12:14 ` [dpdk-dev] [PATCH v1 2/2] crypto/aesni_gcm: support IPsec Multi-buffer " Kovacevic, Marko
2018-03-30 15:16   ` De Lara Guarch, Pablo
2018-03-30 15:41     ` De Lara Guarch, Pablo
2018-03-30 15:16 ` [dpdk-dev] [PATCH v1 1/2] crypto/aesni_mb: support IPsec MUlti-buffer " De Lara Guarch, Pablo
2018-03-30 15:40   ` De Lara Guarch, Pablo
2018-03-31 13:40 ` Thomas Monjalon
2018-04-03 13:29 ` [dpdk-dev] [PATCH v2 " Kovacevic, Marko
2018-04-03 13:30   ` [dpdk-dev] [PATCH v2 2/2] crypto/aesni_gcm: support IPsec Multi-buffer " Kovacevic, Marko
2018-04-03 15:22   ` [dpdk-dev] [PATCH v3 1/2] crypto/aesni_mb: support IPsec MUlti-buffer " Kovacevic, Marko
2018-04-03 15:22     ` [dpdk-dev] [PATCH v3 2/2] crypto/aesni_gcm: support IPsec Multi-buffer " Kovacevic, Marko
2018-04-04 12:33       ` De Lara Guarch, Pablo
2018-04-04 12:32     ` [dpdk-dev] [PATCH v3 1/2] crypto/aesni_mb: support IPsec MUlti-buffer " De Lara Guarch, Pablo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).