From patchwork Thu Jan 23 03:45:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruifeng Wang X-Patchwork-Id: 65072 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 35708A0536; Thu, 23 Jan 2020 04:46:22 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E3CF334EF; Thu, 23 Jan 2020 04:46:21 +0100 (CET) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by dpdk.org (Postfix) with ESMTP id BECCF2C6D for ; Thu, 23 Jan 2020 04:46:20 +0100 (CET) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4987E1FB; Wed, 22 Jan 2020 19:46:20 -0800 (PST) Received: from net-arm-thunderx2-02.shanghai.arm.com (net-arm-thunderx2-02.shanghai.arm.com [10.169.40.171]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 6C7243F52E; Wed, 22 Jan 2020 19:46:18 -0800 (PST) From: Ruifeng Wang To: akhil.goyal@nxp.com, gavin.hu@arm.com Cc: dev@dpdk.org, jerinj@marvell.com, honnappa.nagarahalli@arm.com, nd@arm.com, Ruifeng Wang Date: Thu, 23 Jan 2020 11:45:53 +0800 Message-Id: <20200123034557.146822-2-ruifeng.wang@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200123034557.146822-1-ruifeng.wang@arm.com> References: <20191210082814.1509-1-ruifeng.wang@arm.com> <20200123034557.146822-1-ruifeng.wang@arm.com> Subject: [dpdk-dev] [PATCH v3 1/5] crypto/armv8: link PMD to crypto library hosted by Arm X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Armv8 crypto PMD linked to armv8_crypto library created by Marvell. Maintenance of armv8_crypto library will be discontinued. Change Armv8 PMD to link to AArch64 crypto library hosted by Arm. Signed-off-by: Ruifeng Wang Reviewed-by: Honnappa Nagarahalli Reviewed-by: Gavin Hu Reviewed-by: Ola Liljedahl --- drivers/crypto/armv8/Makefile | 3 +- drivers/crypto/armv8/armv8_pmd_private.h | 4 ++- drivers/crypto/armv8/rte_armv8_pmd.c | 40 ++++++++++++++---------- drivers/crypto/armv8/rte_armv8_pmd_ops.c | 2 -- mk/rte.app.mk | 2 +- 5 files changed, 29 insertions(+), 22 deletions(-) diff --git a/drivers/crypto/armv8/Makefile b/drivers/crypto/armv8/Makefile index 125283664..7f20a28d4 100644 --- a/drivers/crypto/armv8/Makefile +++ b/drivers/crypto/armv8/Makefile @@ -24,9 +24,8 @@ EXPORT_MAP := rte_pmd_armv8_version.map # external library dependencies CFLAGS += -I$(ARMV8_CRYPTO_LIB_PATH) -CFLAGS += -I$(ARMV8_CRYPTO_LIB_PATH)/asm/include CFLAGS += -DALLOW_EXPERIMENTAL_API -LDLIBS += -L$(ARMV8_CRYPTO_LIB_PATH) -larmv8_crypto +LDLIBS += -L$(ARMV8_CRYPTO_LIB_PATH) -lAArch64crypto LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_cryptodev LDLIBS += -lrte_bus_vdev diff --git a/drivers/crypto/armv8/armv8_pmd_private.h b/drivers/crypto/armv8/armv8_pmd_private.h index 24040dda2..e08d0df78 100644 --- a/drivers/crypto/armv8/armv8_pmd_private.h +++ b/drivers/crypto/armv8/armv8_pmd_private.h @@ -5,6 +5,8 @@ #ifndef _ARMV8_PMD_PRIVATE_H_ #define _ARMV8_PMD_PRIVATE_H_ +#include "AArch64cryptolib.h" + #define CRYPTODEV_NAME_ARMV8_PMD crypto_armv8 /**< ARMv8 Crypto PMD device name */ @@ -98,7 +100,7 @@ enum armv8_crypto_auth_mode { typedef int (*crypto_func_t)(uint8_t *, uint8_t *, uint64_t, uint8_t *, uint8_t *, uint64_t, - crypto_arg_t *); + armv8_cipher_digest_t *); typedef void (*crypto_key_sched_t)(uint8_t *, const uint8_t *); diff --git a/drivers/crypto/armv8/rte_armv8_pmd.c b/drivers/crypto/armv8/rte_armv8_pmd.c index 7dc83e69e..fd8140896 100644 --- a/drivers/crypto/armv8/rte_armv8_pmd.c +++ b/drivers/crypto/armv8/rte_armv8_pmd.c @@ -12,7 +12,7 @@ #include #include -#include "armv8_crypto_defs.h" +#include "AArch64cryptolib.h" #include "armv8_pmd_private.h" @@ -78,8 +78,10 @@ crypto_func_tbl_t[CRYPTO_CIPHER_MAX][CRYPTO_AUTH_MAX][CRYPTO_CIPHER_KEYLEN_MAX]; static const crypto_func_tbl_t crypto_op_ca_encrypt = { /* [cipher alg][auth alg][key length] = crypto_function, */ - [CIPH_AES_CBC][AUTH_SHA1_HMAC][KEYL(128)] = aes128cbc_sha1_hmac, - [CIPH_AES_CBC][AUTH_SHA256_HMAC][KEYL(128)] = aes128cbc_sha256_hmac, + [CIPH_AES_CBC][AUTH_SHA1_HMAC][KEYL(128)] = + armv8_enc_aes_cbc_sha1_128, + [CIPH_AES_CBC][AUTH_SHA256_HMAC][KEYL(128)] = + armv8_enc_aes_cbc_sha256_128, }; static const crypto_func_tbl_t @@ -95,8 +97,10 @@ crypto_op_ac_encrypt = { static const crypto_func_tbl_t crypto_op_ac_decrypt = { /* [cipher alg][auth alg][key length] = crypto_function, */ - [CIPH_AES_CBC][AUTH_SHA1_HMAC][KEYL(128)] = sha1_hmac_aes128cbc_dec, - [CIPH_AES_CBC][AUTH_SHA256_HMAC][KEYL(128)] = sha256_hmac_aes128cbc_dec, + [CIPH_AES_CBC][AUTH_SHA1_HMAC][KEYL(128)] = + armv8_dec_aes_cbc_sha1_128, + [CIPH_AES_CBC][AUTH_SHA256_HMAC][KEYL(128)] = + armv8_dec_aes_cbc_sha256_128, }; /** @@ -155,13 +159,13 @@ crypto_key_sched_tbl_t[CRYPTO_CIPHER_MAX][CRYPTO_CIPHER_KEYLEN_MAX]; static const crypto_key_sched_tbl_t crypto_key_sched_encrypt = { /* [cipher alg][key length] = key_expand_func, */ - [CIPH_AES_CBC][KEYL(128)] = aes128_key_sched_enc, + [CIPH_AES_CBC][KEYL(128)] = armv8_expandkeys_enc_aes_cbc_128, }; static const crypto_key_sched_tbl_t crypto_key_sched_decrypt = { /* [cipher alg][key length] = key_expand_func, */ - [CIPH_AES_CBC][KEYL(128)] = aes128_key_sched_dec, + [CIPH_AES_CBC][KEYL(128)] = armv8_expandkeys_dec_aes_cbc_128, }; /** @@ -277,14 +281,16 @@ auth_set_prerequisites(struct armv8_crypto_session *sess, * Calculate partial hash values for i_key_pad and o_key_pad. * Will be used as initialization state for final HMAC. */ - error = sha1_block_partial(NULL, sess->auth.hmac.i_key_pad, - partial, SHA1_BLOCK_SIZE); + error = armv8_sha1_block_partial(NULL, + sess->auth.hmac.i_key_pad, + partial, SHA1_BLOCK_SIZE); if (error != 0) return -1; memcpy(sess->auth.hmac.i_key_pad, partial, SHA1_BLOCK_SIZE); - error = sha1_block_partial(NULL, sess->auth.hmac.o_key_pad, - partial, SHA1_BLOCK_SIZE); + error = armv8_sha1_block_partial(NULL, + sess->auth.hmac.o_key_pad, + partial, SHA1_BLOCK_SIZE); if (error != 0) return -1; memcpy(sess->auth.hmac.o_key_pad, partial, SHA1_BLOCK_SIZE); @@ -310,14 +316,16 @@ auth_set_prerequisites(struct armv8_crypto_session *sess, * Calculate partial hash values for i_key_pad and o_key_pad. * Will be used as initialization state for final HMAC. */ - error = sha256_block_partial(NULL, sess->auth.hmac.i_key_pad, - partial, SHA256_BLOCK_SIZE); + error = armv8_sha256_block_partial(NULL, + sess->auth.hmac.i_key_pad, + partial, SHA256_BLOCK_SIZE); if (error != 0) return -1; memcpy(sess->auth.hmac.i_key_pad, partial, SHA256_BLOCK_SIZE); - error = sha256_block_partial(NULL, sess->auth.hmac.o_key_pad, - partial, SHA256_BLOCK_SIZE); + error = armv8_sha256_block_partial(NULL, + sess->auth.hmac.o_key_pad, + partial, SHA256_BLOCK_SIZE); if (error != 0) return -1; memcpy(sess->auth.hmac.o_key_pad, partial, SHA256_BLOCK_SIZE); @@ -552,7 +560,7 @@ process_armv8_chained_op(struct armv8_crypto_qp *qp, struct rte_crypto_op *op, struct rte_mbuf *mbuf_src, struct rte_mbuf *mbuf_dst) { crypto_func_t crypto_func; - crypto_arg_t arg; + armv8_cipher_digest_t arg; struct rte_mbuf *m_asrc, *m_adst; uint8_t *csrc, *cdst; uint8_t *adst, *asrc; diff --git a/drivers/crypto/armv8/rte_armv8_pmd_ops.c b/drivers/crypto/armv8/rte_armv8_pmd_ops.c index 57952bef5..4fd384d1a 100644 --- a/drivers/crypto/armv8/rte_armv8_pmd_ops.c +++ b/drivers/crypto/armv8/rte_armv8_pmd_ops.c @@ -8,8 +8,6 @@ #include #include -#include "armv8_crypto_defs.h" - #include "armv8_pmd_private.h" static const struct rte_cryptodev_capabilities diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 15acf95db..fb391af57 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -280,7 +280,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += -L$(LIBSSO_KASUMI_PATH)/build -l _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ZUC) += -lrte_pmd_zuc _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ZUC) += -L$(LIBSSO_ZUC_PATH)/build -lsso_zuc _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += -lrte_pmd_armv8 -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += -L$(ARMV8_CRYPTO_LIB_PATH) -larmv8_crypto +_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += -L$(ARMV8_CRYPTO_LIB_PATH) -lAArch64crypto _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) += -L$(LIBMUSDK_PATH)/lib -lrte_pmd_mvsam_crypto -lmusdk _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += -lrte_pmd_nitrox _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += -lrte_pmd_octeontx_crypto From patchwork Thu Jan 23 03:45:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruifeng Wang X-Patchwork-Id: 65073 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5F331A0536; Thu, 23 Jan 2020 04:46:32 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B64CC49DF; Thu, 23 Jan 2020 04:46:25 +0100 (CET) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by dpdk.org (Postfix) with ESMTP id 444D7493D for ; Thu, 23 Jan 2020 04:46:24 +0100 (CET) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id BEA911FB; Wed, 22 Jan 2020 19:46:23 -0800 (PST) Received: from net-arm-thunderx2-02.shanghai.arm.com (net-arm-thunderx2-02.shanghai.arm.com [10.169.40.171]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id E1B843F52E; Wed, 22 Jan 2020 19:46:21 -0800 (PST) From: Ruifeng Wang To: akhil.goyal@nxp.com, gavin.hu@arm.com Cc: dev@dpdk.org, jerinj@marvell.com, honnappa.nagarahalli@arm.com, nd@arm.com, Dharmik Thakkar Date: Thu, 23 Jan 2020 11:45:54 +0800 Message-Id: <20200123034557.146822-3-ruifeng.wang@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200123034557.146822-1-ruifeng.wang@arm.com> References: <20191210082814.1509-1-ruifeng.wang@arm.com> <20200123034557.146822-1-ruifeng.wang@arm.com> Subject: [dpdk-dev] [PATCH v3 2/5] crypto/armv8: enable meson build X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Dharmik Thakkar Add new meson.build file for crypto/armv8 Suggested-by: Thomas Monjalon Signed-off-by: Dharmik Thakkar Reviewed-by: Honnappa Nagarahalli Tested-by: Ruifeng Wang --- drivers/crypto/armv8/meson.build | 25 +++++++++++++++++++++++++ drivers/crypto/meson.build | 1 + meson_options.txt | 2 ++ 3 files changed, 28 insertions(+) create mode 100644 drivers/crypto/armv8/meson.build diff --git a/drivers/crypto/armv8/meson.build b/drivers/crypto/armv8/meson.build new file mode 100644 index 000000000..6ecb78b42 --- /dev/null +++ b/drivers/crypto/armv8/meson.build @@ -0,0 +1,25 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2019 Arm Limited + +path = get_option('armv8_crypto_dir') +if path == '' + build = false + reason = 'missing dependency, "armv8_crypto"' + subdir_done() +endif + +inc_dir = path + +lib = cc.find_library('libAArch64crypto', dirs: [path], required: false) +if not lib.found() + build = false + reason = 'missing dependency, "AArch64crypto"' + subdir_done() +else + ext_deps += lib + includes += include_directories(inc_dir) +endif + +deps += ['bus_vdev'] +sources = files('rte_armv8_pmd.c', 'rte_armv8_pmd_ops.c') +allow_experimental_apis = true diff --git a/drivers/crypto/meson.build b/drivers/crypto/meson.build index 229debdfe..7fa1fbe26 100644 --- a/drivers/crypto/meson.build +++ b/drivers/crypto/meson.build @@ -3,6 +3,7 @@ drivers = ['aesni_gcm', 'aesni_mb', + 'armv8', 'caam_jr', 'ccp', 'dpaa_sec', diff --git a/meson_options.txt b/meson_options.txt index 53dfe13c3..20be15fe6 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,5 +1,7 @@ # Please keep these options sorted alphabetically. +option('armv8_crypto_dir', type: 'string', value: '', + description: 'path to the armv8_crypto library installation directory') option('disable_drivers', type: 'string', value: '', description: 'Comma-separated list of drivers to explicitly disable.') option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-', From patchwork Thu Jan 23 03:45:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruifeng Wang X-Patchwork-Id: 65074 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4E1C5A0536; Thu, 23 Jan 2020 04:46:40 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7F71F4C74; Thu, 23 Jan 2020 04:46:28 +0100 (CET) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by dpdk.org (Postfix) with ESMTP id 773254C74 for ; Thu, 23 Jan 2020 04:46:27 +0100 (CET) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 042411FB; Wed, 22 Jan 2020 19:46:27 -0800 (PST) Received: from net-arm-thunderx2-02.shanghai.arm.com (net-arm-thunderx2-02.shanghai.arm.com [10.169.40.171]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 1E41E3F52E; Wed, 22 Jan 2020 19:46:24 -0800 (PST) From: Ruifeng Wang To: akhil.goyal@nxp.com, gavin.hu@arm.com Cc: dev@dpdk.org, jerinj@marvell.com, honnappa.nagarahalli@arm.com, nd@arm.com, Ruifeng Wang Date: Thu, 23 Jan 2020 11:45:55 +0800 Message-Id: <20200123034557.146822-4-ruifeng.wang@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200123034557.146822-1-ruifeng.wang@arm.com> References: <20191210082814.1509-1-ruifeng.wang@arm.com> <20200123034557.146822-1-ruifeng.wang@arm.com> Subject: [dpdk-dev] [PATCH v3 3/5] doc: update link to the crypto library for armv8 PMD X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Armv8 crypto PMD now uses crypto library hosted by Arm. Update doc with the crypto library link to reflect the change. Signed-off-by: Ruifeng Wang Reviewed-by: Honnappa Nagarahalli Acked-by: Jerin Jacob --- doc/guides/cryptodevs/armv8.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/doc/guides/cryptodevs/armv8.rst b/doc/guides/cryptodevs/armv8.rst index 1ab40096e..fee85354b 100644 --- a/doc/guides/cryptodevs/armv8.rst +++ b/doc/guides/cryptodevs/armv8.rst @@ -28,12 +28,11 @@ Installation In order to enable this virtual crypto PMD, user must: -* Download ARMv8 crypto library source code from - `here `_ +* Download AArch64 crypto library source code from + `here `_ * Export the environmental variable ARMV8_CRYPTO_LIB_PATH with - the path where the ``armv8_crypto`` library was downloaded - or cloned. + the path to ``AArch64cryptolib`` library. * Build the library by invoking: From patchwork Thu Jan 23 03:45:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruifeng Wang X-Patchwork-Id: 65075 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id CCF85A0536; Thu, 23 Jan 2020 04:46:47 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 481C34C8E; Thu, 23 Jan 2020 04:46:32 +0100 (CET) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by dpdk.org (Postfix) with ESMTP id B62854C8B for ; Thu, 23 Jan 2020 04:46:30 +0100 (CET) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4A88FFEC; Wed, 22 Jan 2020 19:46:30 -0800 (PST) Received: from net-arm-thunderx2-02.shanghai.arm.com (net-arm-thunderx2-02.shanghai.arm.com [10.169.40.171]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 6471B3F52E; Wed, 22 Jan 2020 19:46:28 -0800 (PST) From: Ruifeng Wang To: akhil.goyal@nxp.com, gavin.hu@arm.com Cc: dev@dpdk.org, jerinj@marvell.com, honnappa.nagarahalli@arm.com, nd@arm.com, Ruifeng Wang Date: Thu, 23 Jan 2020 11:45:56 +0800 Message-Id: <20200123034557.146822-5-ruifeng.wang@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200123034557.146822-1-ruifeng.wang@arm.com> References: <20191210082814.1509-1-ruifeng.wang@arm.com> <20200123034557.146822-1-ruifeng.wang@arm.com> Subject: [dpdk-dev] [PATCH v3 4/5] doc: update release notes for armv8 crypto PMD X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Armv8 crypto PMD is changed to depend on external crypto library hosted by Arm. Library name also has change. Signed-off-by: Ruifeng Wang Reviewed-by: Honnappa Nagarahalli --- doc/guides/rel_notes/release_20_02.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/guides/rel_notes/release_20_02.rst b/doc/guides/rel_notes/release_20_02.rst index 50e2c1484..b0484af1b 100644 --- a/doc/guides/rel_notes/release_20_02.rst +++ b/doc/guides/rel_notes/release_20_02.rst @@ -143,6 +143,11 @@ New Features Added a new OCTEON TX2 rawdev PMD for End Point mode of operation. See the :doc:`../rawdevs/octeontx2_ep` for more details on this new PMD. +* **Changed armv8 crypto PMD external dependency.** + + armv8 crypto PMD now depends on Arm crypto library, and Marvell's + armv8 crypto library is not used anymore. Library name is changed + from armv8_crypto to AArch64crypto. Removed Items ------------- From patchwork Thu Jan 23 03:45:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruifeng Wang X-Patchwork-Id: 65076 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 44A23A0536; Thu, 23 Jan 2020 04:46:55 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3C94114581; Thu, 23 Jan 2020 04:46:36 +0100 (CET) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by dpdk.org (Postfix) with ESMTP id 2E46B14581; Thu, 23 Jan 2020 04:46:34 +0100 (CET) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B08831FB; Wed, 22 Jan 2020 19:46:33 -0800 (PST) Received: from net-arm-thunderx2-02.shanghai.arm.com (net-arm-thunderx2-02.shanghai.arm.com [10.169.40.171]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id A0EE73F52E; Wed, 22 Jan 2020 19:46:31 -0800 (PST) From: Ruifeng Wang To: akhil.goyal@nxp.com, gavin.hu@arm.com Cc: dev@dpdk.org, jerinj@marvell.com, honnappa.nagarahalli@arm.com, nd@arm.com, Ruifeng Wang , stable@dpdk.org Date: Thu, 23 Jan 2020 11:45:57 +0800 Message-Id: <20200123034557.146822-6-ruifeng.wang@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200123034557.146822-1-ruifeng.wang@arm.com> References: <20191210082814.1509-1-ruifeng.wang@arm.com> <20200123034557.146822-1-ruifeng.wang@arm.com> Subject: [dpdk-dev] [PATCH v3 5/5] crypto/armv8: fix clang build X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 1. Clang requires braces around initialization of subobject. 2. Clang complains implicit conversion of enumeration type. Trapped issue with Clang version 8.0 and CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO was set. Error messages: rte_armv8_pmd.c:144:2: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces] NULL ^~~~ { } /usr/lib/llvm-8/lib/clang/8.0.0/include/stddef.h:105:16: note: expanded from macro 'NULL' ^~~~~~~~~~ rte_armv8_pmd.c:429:21: error: implicit conversion from enumeration type 'enum rte_crypto_cipher_operation' to different enumeration type 'enum armv8_crypto_cipher_operation' [-Werror,-Wenum-conversion] cop = sess->cipher.direction; ~ ~~~~~~~~~~~~~^~~~~~~~~ Fixes: 169ca3db550c ("crypto/armv8: add PMD optimized for ARMv8 processors") Cc: stable@dpdk.org Signed-off-by: Ruifeng Wang Reviewed-by: Honnappa Nagarahalli Reviewed-by: Gavin Hu --- drivers/crypto/armv8/rte_armv8_pmd.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/crypto/armv8/rte_armv8_pmd.c b/drivers/crypto/armv8/rte_armv8_pmd.c index fd8140896..d2b7ab5e0 100644 --- a/drivers/crypto/armv8/rte_armv8_pmd.c +++ b/drivers/crypto/armv8/rte_armv8_pmd.c @@ -86,12 +86,12 @@ crypto_op_ca_encrypt = { static const crypto_func_tbl_t crypto_op_ca_decrypt = { - NULL + { {NULL} } }; static const crypto_func_tbl_t crypto_op_ac_encrypt = { - NULL + { {NULL} } }; static const crypto_func_tbl_t @@ -377,7 +377,16 @@ armv8_crypto_set_session_chained_parameters(struct armv8_crypto_session *sess, /* Select cipher key */ sess->cipher.key.length = cipher_xform->cipher.key.length; /* Set cipher direction */ - cop = sess->cipher.direction; + switch (sess->cipher.direction) { + case RTE_CRYPTO_CIPHER_OP_ENCRYPT: + cop = ARMV8_CRYPTO_CIPHER_OP_ENCRYPT; + break; + case RTE_CRYPTO_CIPHER_OP_DECRYPT: + cop = ARMV8_CRYPTO_CIPHER_OP_DECRYPT; + break; + default: + return -ENOTSUP; + } /* Set cipher algorithm */ calg = cipher_xform->cipher.algo;