Re: [dpdk-dev] [PATCH v1 2/2] event/octeontx2: support crypto adapter forward mode

On Sat, Mar 27, 2021 at 06:27:49AM +0000, Pavan Nikhilesh Bhagavatula wrote:

quoted

-----Original Message-----
From: Shijith Thotton <sthotton@marvell.com>
Sent: Friday, March 26, 2021 2:42 PM
To: dev@dpdk.org
Cc: Shijith Thotton <sthotton@marvell.com>; thomas@monjalon.net;
Jerin Jacob Kollanukkaran [off-list ref];
abhinandan.gujjar@intel.com; hemant.agrawal@nxp.com;
nipun.gupta@nxp.com; sachin.saxena@oss.nxp.com; Anoob Joseph
[off-list ref]; matan@nvidia.com;
roy.fan.zhang@intel.com; g.singh@nxp.com; erik.g.carrillo@intel.com;
jay.jayatheerthan@intel.com; Pavan Nikhilesh Bhagavatula
[off-list ref]; harry.van.haaren@intel.com; Akhil
Goyal [off-list ref]
Subject: [PATCH v1 2/2] event/octeontx2: support crypto adapter
forward mode

Advertise crypto adapter forward mode capability and set crypto
adapter
enqueue function in driver.

Signed-off-by: Shijith Thotton <sthotton@marvell.com>
---
drivers/crypto/octeontx2/otx2_cryptodev_ops.c | 34 +++++---
drivers/event/octeontx2/otx2_evdev.c          |  5 +-
.../event/octeontx2/otx2_evdev_crypto_adptr.c |  3 +-
...dptr_dp.h => otx2_evdev_crypto_adptr_rx.h} |  6 +-
.../octeontx2/otx2_evdev_crypto_adptr_tx.h    | 82
+++++++++++++++++++
drivers/event/octeontx2/otx2_worker.h         |  2 +-
drivers/event/octeontx2/otx2_worker_dual.h    |  2 +-
7 files changed, 117 insertions(+), 17 deletions(-)
rename drivers/event/octeontx2/{otx2_evdev_crypto_adptr_dp.h =>
otx2_evdev_crypto_adptr_rx.h} (93%)
create mode 100644
drivers/event/octeontx2/otx2_evdev_crypto_adptr_tx.h

diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c

b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
index cec20b5c6..a72285892 100644

--- a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
+++ b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c

@@ -7,6 +7,7 @@

#include <rte_cryptodev_pmd.h>
#include <rte_errno.h>
#include <rte_ethdev.h>
+#include <rte_event_crypto_adapter.h>

#include "otx2_cryptodev.h"
#include "otx2_cryptodev_capabilities.h"

@@ -438,11 +439,23 @@ static __rte_always_inline void __rte_hot

otx2_ca_enqueue_req(const struct otx2_cpt_qp *qp,
		    struct cpt_request_info *req,
		    void *lmtline,
+		    struct rte_crypto_op *op,
		    uint64_t cpt_inst_w7)
{
+	union rte_event_crypto_metadata *m_data;
	union cpt_inst_s inst;
	uint64_t lmt_status;

+	if (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION)
+		m_data = rte_cryptodev_sym_session_get_user_data(
+						op->sym->session);
+	else if (op->sess_type == RTE_CRYPTO_OP_SESSIONLESS &&
+		 op->private_data_offset)
+		m_data = (union rte_event_crypto_metadata *)
+			 ((uint8_t *)op +
+			  op->private_data_offset);
+
+
	inst.u[0] = 0;
	inst.s9x.res_addr = req->comp_baddr;
	inst.u[2] = 0;

@@ -453,12 +466,11 @@ otx2_ca_enqueue_req(const struct

otx2_cpt_qp *qp,
	inst.s9x.ei2 = req->ist.ei2;
	inst.s9x.ei3 = cpt_inst_w7;

-	inst.s9x.qord = 1;
-	inst.s9x.grp = qp->ev.queue_id;
-	inst.s9x.tt = qp->ev.sched_type;
-	inst.s9x.tag = (RTE_EVENT_TYPE_CRYPTODEV << 28) |
-			qp->ev.flow_id;
-	inst.s9x.wq_ptr = (uint64_t)req >> 3;
+	inst.u[2] = (((RTE_EVENT_TYPE_CRYPTODEV << 28) |
+		      m_data->response_info.flow_id) |
+		     ((uint64_t)m_data->response_info.sched_type << 32)
|
+		     ((uint64_t)m_data->response_info.queue_id << 34));
+	inst.u[3] = 1 | (((uint64_t)req >> 3) << 3);
	req->qp = qp;

	do {

@@ -481,6 +493,7 @@ static __rte_always_inline int32_t __rte_hot

otx2_cpt_enqueue_req(const struct otx2_cpt_qp *qp,
		     struct pending_queue *pend_q,
		     struct cpt_request_info *req,
+		     struct rte_crypto_op *op,
		     uint64_t cpt_inst_w7)
{
	void *lmtline = qp->lmtline;

@@ -488,7 +501,7 @@ otx2_cpt_enqueue_req(const struct

otx2_cpt_qp *qp,
	uint64_t lmt_status;

	if (qp->ca_enable) {
-		otx2_ca_enqueue_req(qp, req, lmtline, cpt_inst_w7);
+		otx2_ca_enqueue_req(qp, req, lmtline, op,
cpt_inst_w7);
		return 0;
	}

@@ -594,7 +607,8 @@ otx2_cpt_enqueue_asym(struct otx2_cpt_qp

*qp,
		goto req_fail;
	}

-	ret = otx2_cpt_enqueue_req(qp, pend_q, params.req, sess-

quoted

cpt_inst_w7);

+	ret = otx2_cpt_enqueue_req(qp, pend_q, params.req, op,
+				   sess->cpt_inst_w7);

	if (unlikely(ret)) {
		CPT_LOG_DP_ERR("Could not enqueue crypto req");

@@ -638,7 +652,7 @@ otx2_cpt_enqueue_sym(struct otx2_cpt_qp

*qp, struct rte_crypto_op *op,
		return ret;
	}

-	ret = otx2_cpt_enqueue_req(qp, pend_q, req, sess-

quoted

cpt_inst_w7);

+	ret = otx2_cpt_enqueue_req(qp, pend_q, req, op, sess-

quoted

cpt_inst_w7);

	if (unlikely(ret)) {
		/* Free buffer allocated by fill params routines */

@@ -707,7 +721,7 @@ otx2_cpt_enqueue_sec(struct otx2_cpt_qp

*qp, struct rte_crypto_op *op,
		return ret;
	}

-	ret = otx2_cpt_enqueue_req(qp, pend_q, req, sess-

quoted

cpt_inst_w7);

+	ret = otx2_cpt_enqueue_req(qp, pend_q, req, op, sess-

quoted

cpt_inst_w7);

	if (winsz && esn) {
		seq_in_sa = ((uint64_t)esn_hi << 32) | esn_low;

diff --git a/drivers/event/octeontx2/otx2_evdev.c

b/drivers/event/octeontx2/otx2_evdev.c
index 770a801c4..59450521a 100644

--- a/drivers/event/octeontx2/otx2_evdev.c
+++ b/drivers/event/octeontx2/otx2_evdev.c

@@ -12,8 +12,9 @@

#include <rte_mbuf_pool_ops.h>
#include <rte_pci.h>

-#include "otx2_evdev_stats.h"
#include "otx2_evdev.h"
+#include "otx2_evdev_crypto_adptr_tx.h"
+#include "otx2_evdev_stats.h"
#include "otx2_irq.h"
#include "otx2_tim_evdev.h"

@@ -311,6 +312,7 @@ SSO_TX_ADPTR_ENQ_FASTPATH_FUNC

			[!!(dev->tx_offloads &
NIX_TX_OFFLOAD_OL3_OL4_CSUM_F)]
			[!!(dev->tx_offloads &
NIX_TX_OFFLOAD_L3_L4_CSUM_F)];
	}
+	event_dev->ca_enqueue = otx2_ssogws_ca_enq;

	if (dev->dual_ws) {
		event_dev->enqueue		=
otx2_ssogws_dual_enq;

@@ -473,6 +475,7 @@ SSO_TX_ADPTR_ENQ_FASTPATH_FUNC

				[!!(dev->tx_offloads &

NIX_TX_OFFLOAD_L3_L4_CSUM_F)];
		}
+		event_dev->ca_enqueue = otx2_ssogws_dual_ca_enq;
	}

	event_dev->txa_enqueue_same_dest = event_dev-

quoted

txa_enqueue;

diff --git a/drivers/event/octeontx2/otx2_evdev_crypto_adptr.c

b/drivers/event/octeontx2/otx2_evdev_crypto_adptr.c
index 4e8a96cb6..2c9b347f0 100644

--- a/drivers/event/octeontx2/otx2_evdev_crypto_adptr.c
+++ b/drivers/event/octeontx2/otx2_evdev_crypto_adptr.c

@@ -18,7 +18,8 @@ otx2_ca_caps_get(const struct rte_eventdev

*dev,
	RTE_SET_USED(cdev);

	*caps =
RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND |
-
RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_NE
W;
+
RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_NE
W |
+
RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FW
D;

	return 0;
}

diff --git a/drivers/event/octeontx2/otx2_evdev_crypto_adptr_dp.h

b/drivers/event/octeontx2/otx2_evdev_crypto_adptr_rx.h
similarity index 93%
rename from drivers/event/octeontx2/otx2_evdev_crypto_adptr_dp.h
rename to drivers/event/octeontx2/otx2_evdev_crypto_adptr_rx.h
index 70b63933e..9e331fdd7 100644

--- a/drivers/event/octeontx2/otx2_evdev_crypto_adptr_dp.h
+++ b/drivers/event/octeontx2/otx2_evdev_crypto_adptr_rx.h

@@ -2,8 +2,8 @@
 * Copyright (C) 2020 Marvell International Ltd.
 */

-#ifndef _OTX2_EVDEV_CRYPTO_ADPTR_DP_H_
-#define _OTX2_EVDEV_CRYPTO_ADPTR_DP_H_
+#ifndef _OTX2_EVDEV_CRYPTO_ADPTR_RX_H_
+#define _OTX2_EVDEV_CRYPTO_ADPTR_RX_H_

#include <rte_cryptodev.h>
#include <rte_cryptodev_pmd.h>

@@ -72,4 +72,4 @@ otx2_handle_crypto_event(uint64_t get_work1)

	return (uint64_t)(cop);
}
-#endif /* _OTX2_EVDEV_CRYPTO_ADPTR_DP_H_ */
+#endif /* _OTX2_EVDEV_CRYPTO_ADPTR_RX_H_ */

diff --git a/drivers/event/octeontx2/otx2_evdev_crypto_adptr_tx.h

b/drivers/event/octeontx2/otx2_evdev_crypto_adptr_tx.h
new file mode 100644
index 000000000..470d2e274

--- /dev/null
+++ b/drivers/event/octeontx2/otx2_evdev_crypto_adptr_tx.h

@@ -0,0 +1,82 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2021 Marvell International Ltd.
+ */
+
+#ifndef _OTX2_EVDEV_CRYPTO_ADPTR_TX_H_
+#define _OTX2_EVDEV_CRYPTO_ADPTR_TX_H_
+
+#include <rte_cryptodev.h>
+#include <rte_cryptodev_pmd.h>
+#include <rte_event_crypto_adapter.h>
+#include <rte_eventdev.h>
+
+#include <otx2_cryptodev_qp.h>
+#include <otx2_worker.h>
+
+static inline uint16_t
+otx2_ca_enq(uint64_t base, const struct rte_event *ev)
+{
+	union rte_event_crypto_metadata *m_data;
+	struct rte_crypto_op *crypto_op;
+	struct rte_cryptodev *cdev;
+	struct otx2_cpt_qp *qp;
+	uint8_t cdev_id;
+	uint16_t qp_id;
+
+	crypto_op = ev->event_ptr;
+	if (crypto_op == NULL)
+		return 0;
+
+	if (crypto_op->sess_type == RTE_CRYPTO_OP_WITH_SESSION)

{
+		m_data = rte_cryptodev_sym_session_get_user_data(
+						crypto_op->sym-

quoted

session);

+		if (m_data == NULL)
+			goto free_op;
+
+		cdev_id = m_data->request_info.cdev_id;
+		qp_id = m_data->request_info.queue_pair_id;
+	} else if (crypto_op->sess_type ==
RTE_CRYPTO_OP_SESSIONLESS &&
+		   crypto_op->private_data_offset) {
+		m_data = (union rte_event_crypto_metadata *)
+			 ((uint8_t *)crypto_op +
+			  crypto_op->private_data_offset);
+		cdev_id = m_data->request_info.cdev_id;
+		qp_id = m_data->request_info.queue_pair_id;
+	} else {
+		goto free_op;
+	}
+
+	cdev = &rte_cryptodevs[cdev_id];
+	qp = cdev->data->queue_pairs[qp_id];
+
+	if (!ev->sched_type)
+		otx2_ssogws_head_wait(base + SSOW_LF_GWS_TAG);

Directly pass the TAG address.

Ack. Will send v2 with the change.

quoted

+	if (qp->ca_enable)
+		return cdev->enqueue_burst(qp, &crypto_op, 1);
+
+free_op:
+	rte_pktmbuf_free(crypto_op->sym->m_src);
+	rte_crypto_op_free(crypto_op);
+	return 0;
+}
+
+static uint16_t __rte_hot
+otx2_ssogws_ca_enq(void *port, struct rte_event ev[], uint16_t
nb_events)
+{
+	struct otx2_ssogws *ws = port;
+
+	RTE_SET_USED(nb_events);
+
+	return otx2_ca_enq(ws->base, ev);

ws->tag_op

quoted

+}
+
+static uint16_t __rte_hot
+otx2_ssogws_dual_ca_enq(void *port, struct rte_event ev[], uint16_t
nb_events)
+{
+	struct otx2_ssogws_dual *ws = port;
+
+	RTE_SET_USED(nb_events);
+
+	return otx2_ca_enq(ws->base[!ws->vws], ev);

ws->ws_state[!ws->vws].tag_op

quoted

+}
+#endif /* _OTX2_EVDEV_CRYPTO_ADPTR_TX_H_ */

diff --git a/drivers/event/octeontx2/otx2_worker.h

b/drivers/event/octeontx2/otx2_worker.h
index 2b716c042..fd149be91 100644

--- a/drivers/event/octeontx2/otx2_worker.h
+++ b/drivers/event/octeontx2/otx2_worker.h

@@ -10,7 +10,7 @@

#include <otx2_common.h>
#include "otx2_evdev.h"
-#include "otx2_evdev_crypto_adptr_dp.h"
+#include "otx2_evdev_crypto_adptr_rx.h"
#include "otx2_ethdev_sec_tx.h"

/* SSO Operations */

diff --git a/drivers/event/octeontx2/otx2_worker_dual.h

b/drivers/event/octeontx2/otx2_worker_dual.h
index 72b616439..36ae4dd88 100644

--- a/drivers/event/octeontx2/otx2_worker_dual.h
+++ b/drivers/event/octeontx2/otx2_worker_dual.h

@@ -10,7 +10,7 @@

#include <otx2_common.h>
#include "otx2_evdev.h"
-#include "otx2_evdev_crypto_adptr_dp.h"
+#include "otx2_evdev_crypto_adptr_rx.h"

/* SSO Operations */
static __rte_always_inline uint16_t
--
2.25.1