From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id F1E9CA00C2;
Thu, 6 Oct 2022 10:22:37 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id E61BE42BAE;
Thu, 6 Oct 2022 10:22:37 +0200 (CEST)
Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com
[67.231.148.174])
by mails.dpdk.org (Postfix) with ESMTP id B26D242B88
for <dev@dpdk.org>; Thu, 6 Oct 2022 10:22:36 +0200 (CEST)
Received: from pps.filterd (m0045849.ppops.net [127.0.0.1])
by mx0a-0016f401.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 295LG1XO020615;
Thu, 6 Oct 2022 01:22:35 -0700
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;
h=from : to : cc :
subject : date : message-id : mime-version : content-transfer-encoding :
content-type; s=pfpt0220; bh=xyI/xW9UIxfsc3DpMSratkWjd+6C8xH6c+/Vvxo/p7E=;
b=OhxZZRXPYBgRrr0S4Sz7YCJ3t0qCHzsPfO+Gy7V7gXE2qCnBubsAtnBTRkrBaUwl20zl
ytehMW1C7AbADT/lBwRY3/DHn/flfVTsLlQAaknvv5+fTc4d467UcEpIdJyrmmVjQaPS
OXJ+8/+ld/pl4kO9MZDDOb28zoEJvLEb/ZWnnTkrFAjKszLTRox0RqUBTgXtnAUmnF8M
vFzoj29eu6zmynEiEylkTATrB4S/G5Hg0tI9VXUZmxow9uKCJRFm8WfKOL/oTxOXcBPk
e+s0wADBC8t0j/KkbVV1k5B51xGNROZnaGtqigE13t3dUcgW3ueho8mEaL5ido/6QyOi QQ==
Received: from dc5-exch02.marvell.com ([199.233.59.182])
by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3k17uhc56x-1
(version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);
Thu, 06 Oct 2022 01:22:34 -0700
Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com
(10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18;
Thu, 6 Oct 2022 01:22:32 -0700
Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com
(10.69.176.38) with Microsoft SMTP Server id 15.0.1497.2 via Frontend
Transport; Thu, 6 Oct 2022 01:22:32 -0700
Received: from localhost.localdomain (unknown [10.28.36.102])
by maili.marvell.com (Postfix) with ESMTP id 5D5563F70A4;
Thu, 6 Oct 2022 01:22:31 -0700 (PDT)
From: Akhil Goyal <gakhil@marvell.com>
To: <dev@dpdk.org>
CC: <thomas@monjalon.net>, <lironh@marvell.com>, Akhil Goyal
<gakhil@marvell.com>
Subject: [PATCH] crypto/mvsam: fix build for session rework
Date: Thu, 6 Oct 2022 13:52:28 +0530
Message-ID: <20221006082228.91120-1-gakhil@marvell.com>
X-Mailer: git-send-email 2.25.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-Proofpoint-GUID: WrMEmk0IMuP0Oe4t_HVDEysreLupzSSA
X-Proofpoint-ORIG-GUID: WrMEmk0IMuP0Oe4t_HVDEysreLupzSSA
X-Proofpoint-Virus-Version: vendor=baseguard
engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1
definitions=2022-10-05_05,2022-10-06_01,2022-06-22_01
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
mvsam build was broken due to the recent session rework,
as it was not enabled in default build.
This patch fixes the build.
Fixes: 3f3fc3308bd0 ("security: remove private mempool usage")
Fixes: bdce2564dbf7 ("cryptodev: rework session framework")
Fixes: 66837861d375 ("drivers/crypto: support security session size query")
Signed-off-by: Akhil Goyal <gakhil@marvell.com>
---
drivers/crypto/mvsam/rte_mrvl_pmd.c | 2 +-
drivers/crypto/mvsam/rte_mrvl_pmd_ops.c | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/crypto/mvsam/rte_mrvl_pmd.c b/drivers/crypto/mvsam/rte_mrvl_pmd.c
index 88651b9a55..1641da9ca6 100644
--- a/drivers/crypto/mvsam/rte_mrvl_pmd.c
+++ b/drivers/crypto/mvsam/rte_mrvl_pmd.c
@@ -767,7 +767,7 @@ mrvl_request_prepare_sec(struct sam_cio_ipsec_params *request,
return -EINVAL;
}
- sess = SECURITY_GET_SESS_PRIV(op->sym->sec_session);
+ sess = SECURITY_GET_SESS_PRIV(op->sym->session);
if (unlikely(sess == NULL)) {
MRVL_LOG(ERR, "Session was not created for this device! %d",
cryptodev_driver_id);
diff --git a/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c b/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c
index 6ac0407c36..5a0658cf83 100644
--- a/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c
+++ b/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c
@@ -704,7 +704,6 @@ mrvl_crypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
break;
qp->sess_mp = qp_conf->mp_session;
- qp->sess_mp_priv = qp_conf->mp_session_private;
memset(&qp->stats, 0, sizeof(qp->stats));
dev->data->queue_pairs[qp_id] = qp;
@@ -778,11 +777,11 @@ mrvl_crypto_pmd_sym_session_configure(__rte_unused struct rte_cryptodev *dev,
* @returns 0. Always.
*/
static void
-mrvl_crypto_pmd_sym_session_clear(struct rte_cryptodev *dev,
+mrvl_crypto_pmd_sym_session_clear(struct rte_cryptodev *dev __rte_unused,
struct rte_cryptodev_sym_session *sess)
{
- void *sess_priv = sess->data;
+ void *sess_priv = sess->driver_priv_data;
/* Zero out the whole structure */
if (sess_priv) {
@@ -908,7 +907,7 @@ mrvl_crypto_pmd_security_session_destroy(void *dev __rte_unused,
}
static unsigned int
-mrvl_crypto_pmd_security_session_create(void *device __rte_unused)
+mrvl_crypto_pmd_security_session_get_size(void *device __rte_unused)
{
return sizeof(struct mrvl_crypto_session);
}
--
2.25.1