From patchwork Mon Sep 26 10:01:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruifeng Wang X-Patchwork-Id: 116867 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3203BA00C2; Mon, 26 Sep 2022 12:01:46 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 268D34113D; Mon, 26 Sep 2022 12:01:46 +0200 (CEST) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mails.dpdk.org (Postfix) with ESMTP id CC3C7400D7 for ; Mon, 26 Sep 2022 12:01:44 +0200 (CEST) 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 DED521063; Mon, 26 Sep 2022 03:01:50 -0700 (PDT) Received: from net-arm-n1amp-02.shanghai.arm.com (net-arm-n1amp-02.shanghai.arm.com [10.169.210.108]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 2B12E3F73B; Mon, 26 Sep 2022 03:01:41 -0700 (PDT) From: Ruifeng Wang To: gakhil@marvell.com, roy.fan.zhang@intel.com Cc: dev@dpdk.org, honnappa.nagarahalli@arm.com, nd@arm.com, Ruifeng Wang Subject: [PATCH 1/2] test/crypto: fix unexpected test abort Date: Mon, 26 Sep 2022 18:01:19 +0800 Message-Id: <20220926100120.3980185-2-ruifeng.wang@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220926100120.3980185-1-ruifeng.wang@arm.com> References: <20220926100120.3980185-1-ruifeng.wang@arm.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org rte_cryptodev_sym_session_create now updates rte_errno. So rte_errno should be reset before executing current test case. This prevents current case from being aborted due to errno set by previous negative case. Signed-off-by: Ruifeng Wang --- app/test/test_cryptodev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index b77e14cb06..981db009b8 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -2176,6 +2176,7 @@ test_AES_CBC_HMAC_SHA1_encrypt_digest(void) ut_params->auth_xform.auth.key.data = hmac_sha1_key; ut_params->auth_xform.auth.digest_length = DIGEST_BYTE_LENGTH_SHA1; + rte_errno = 0; ut_params->sess = rte_cryptodev_sym_session_create( ts_params->valid_devs[0], &ut_params->cipher_xform, ts_params->session_mpool); From patchwork Mon Sep 26 10:01:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruifeng Wang X-Patchwork-Id: 116868 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EAEEDA00C2; Mon, 26 Sep 2022 12:01:51 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DBE0A415D7; Mon, 26 Sep 2022 12:01:51 +0200 (CEST) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mails.dpdk.org (Postfix) with ESMTP id 80A67400D7 for ; Mon, 26 Sep 2022 12:01:50 +0200 (CEST) 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 9FB3A1063; Mon, 26 Sep 2022 03:01:56 -0700 (PDT) Received: from net-arm-n1amp-02.shanghai.arm.com (net-arm-n1amp-02.shanghai.arm.com [10.169.210.108]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id E92ED3F73B; Mon, 26 Sep 2022 03:01:47 -0700 (PDT) From: Ruifeng Wang To: gakhil@marvell.com, roy.fan.zhang@intel.com Cc: dev@dpdk.org, honnappa.nagarahalli@arm.com, nd@arm.com, Ruifeng Wang Subject: [PATCH 2/2] crypto/armv8: adapt to updated sym session framework Date: Mon, 26 Sep 2022 18:01:20 +0800 Message-Id: <20220926100120.3980185-3-ruifeng.wang@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220926100120.3980185-1-ruifeng.wang@arm.com> References: <20220926100120.3980185-1-ruifeng.wang@arm.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Adapt to data structure changes. Signed-off-by: Ruifeng Wang --- drivers/crypto/armv8/armv8_pmd_private.h | 2 -- drivers/crypto/armv8/rte_armv8_pmd.c | 4 ++-- drivers/crypto/armv8/rte_armv8_pmd_ops.c | 5 ++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/crypto/armv8/armv8_pmd_private.h b/drivers/crypto/armv8/armv8_pmd_private.h index 75ddba79c1..41292d8851 100644 --- a/drivers/crypto/armv8/armv8_pmd_private.h +++ b/drivers/crypto/armv8/armv8_pmd_private.h @@ -106,8 +106,6 @@ struct armv8_crypto_qp { /**< Ring for placing process packets */ struct rte_mempool *sess_mp; /**< Session Mempool */ - struct rte_mempool *sess_mp_priv; - /**< Session Private Data Mempool */ struct rte_cryptodev_stats stats; /**< Queue pair statistics */ char name[RTE_CRYPTODEV_NAME_MAX_LEN]; diff --git a/drivers/crypto/armv8/rte_armv8_pmd.c b/drivers/crypto/armv8/rte_armv8_pmd.c index 75a95e3689..ebca5c09ee 100644 --- a/drivers/crypto/armv8/rte_armv8_pmd.c +++ b/drivers/crypto/armv8/rte_armv8_pmd.c @@ -521,7 +521,7 @@ get_session(struct armv8_crypto_qp *qp, struct rte_crypto_op *op) if (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION) { /* get existing session */ if (likely(op->sym->session != NULL)) { - sess = op->sym->session->data; + sess = CRYPTODEV_GET_SYM_SESS_PRIV(op->sym->session); } } else { /* provide internal session */ @@ -530,7 +530,7 @@ get_session(struct armv8_crypto_qp *qp, struct rte_crypto_op *op) if (rte_mempool_get(qp->sess_mp, (void **)&_sess)) return NULL; - sess = (struct armv8_crypto_session *)_sess->data; + sess = (struct armv8_crypto_session *)_sess->driver_priv_data; if (unlikely(armv8_crypto_set_session_parameters(sess, op->sym->xform) != 0)) { diff --git a/drivers/crypto/armv8/rte_armv8_pmd_ops.c b/drivers/crypto/armv8/rte_armv8_pmd_ops.c index 176bb9e6a0..c4964bc112 100644 --- a/drivers/crypto/armv8/rte_armv8_pmd_ops.c +++ b/drivers/crypto/armv8/rte_armv8_pmd_ops.c @@ -244,7 +244,6 @@ armv8_crypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id, goto qp_setup_cleanup; qp->sess_mp = qp_conf->mp_session; - qp->sess_mp_priv = qp_conf->mp_session_private; memset(&qp->stats, 0, sizeof(qp->stats)); @@ -265,7 +264,7 @@ armv8_crypto_pmd_sym_session_get_size(struct rte_cryptodev *dev __rte_unused) /** Configure the session from a crypto xform chain */ static int -armv8_crypto_pmd_sym_session_configure(struct rte_cryptodev *dev, +armv8_crypto_pmd_sym_session_configure(struct rte_cryptodev *dev __rte_unused, struct rte_crypto_sym_xform *xform, struct rte_cryptodev_sym_session *sess) { @@ -277,7 +276,7 @@ armv8_crypto_pmd_sym_session_configure(struct rte_cryptodev *dev, return -EINVAL; } - sess_private_data = sess->data; + sess_private_data = sess->driver_priv_data; ret = armv8_crypto_set_session_parameters(sess_private_data, xform); if (ret != 0) {