d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

crypto/cnxk: use rlen from CPT result with lookaside

Browse Source 
Use rlen from CPT result with lookaside operations

Signed-off-by: Tejasree Kondoj <ktejasree@marvell.com>
Acked-by: Akhil Goyal <gakhil@marvell.com>
This commit is contained in:
Tejasree Kondoj 2021-09-01 15:49:26 +05:30 committed by Akhil Goyal
parent 77ca2a4f1f
commit d665f0fc3d
4 changed files with 14 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/crypto/cnxk/cn10k_cryptodev_ops.c
View File

@ -47,7 +47,7 @@ sess_put:
static __rte_always_inline int __rte_hot
cpt_sec_inst_fill(struct rte_crypto_op *op, struct cn10k_sec_session *sess,
struct cpt_inflight_req *infl_req, struct cpt_inst_s *inst)
struct cpt_inst_s *inst)
{
struct rte_crypto_sym_op *sym_op = op->sym;
union roc_ot_ipsec_sa_word2 *w2;
@ -69,10 +69,8 @@ cpt_sec_inst_fill(struct rte_crypto_op *op, struct cn10k_sec_session *sess,
if (w2->s.dir == ROC_IE_OT_SA_DIR_OUTBOUND)
ret = process_outb_sa(op, sa, inst);
else {
infl_req->op_flags |= CPT_OP_FLAGS_IPSEC_DIR_INBOUND;
else
ret = process_inb_sa(op, sa, inst);
}
return ret;
}
@ -121,8 +119,7 @@ cn10k_cpt_fill_inst(struct cnxk_cpt_qp *qp, struct rte_crypto_op *ops[],
if (op->sess_type == RTE_CRYPTO_OP_SECURITY_SESSION) {
sec_sess = get_sec_session_private_data(
sym_op->sec_session);
ret = cpt_sec_inst_fill(op, sec_sess, infl_req,
&inst[0]);
ret = cpt_sec_inst_fill(op, sec_sess, &inst[0]);
if (unlikely(ret))
return 0;
w7 = sec_sess->sa.inst.w7;
@ -259,30 +256,13 @@ update_pending:
static inline void
cn10k_cpt_sec_post_process(struct rte_crypto_op *cop,
struct cpt_inflight_req *infl_req)
struct cpt_cn10k_res_s *res)
{
struct rte_crypto_sym_op *sym_op = cop->sym;
struct rte_mbuf *m = sym_op->m_src;
struct rte_ipv6_hdr *ip6;
struct rte_ipv4_hdr *ip;
uint16_t m_len;
struct rte_mbuf *m = cop->sym->m_src;
const uint16_t m_len = res->rlen;
if (infl_req->op_flags & CPT_OP_FLAGS_IPSEC_DIR_INBOUND) {
ip = (struct rte_ipv4_hdr *)rte_pktmbuf_mtod(m, char *);
if (((ip->version_ihl & 0xf0) >> RTE_IPV4_IHL_MULTIPLIER) ==
IPVERSION) {
m_len = rte_be_to_cpu_16(ip->total_length);
} else {
PLT_ASSERT(((ip->version_ihl & 0xf0) >>
RTE_IPV4_IHL_MULTIPLIER) == 6);
ip6 = (struct rte_ipv6_hdr *)ip;
m_len = rte_be_to_cpu_16(ip6->payload_len) +
sizeof(struct rte_ipv6_hdr);
}
m->data_len = m_len;
m->pkt_len = m_len;
}
m->data_len = m_len;
m->pkt_len = m_len;
}
static inline void
@ -310,7 +290,7 @@ cn10k_cpt_dequeue_post_process(struct cnxk_cpt_qp *qp,
cop->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
if (cop->type == RTE_CRYPTO_OP_TYPE_SYMMETRIC) {
if (cop->sess_type == RTE_CRYPTO_OP_SECURITY_SESSION) {
cn10k_cpt_sec_post_process(cop, infl_req);
cn10k_cpt_sec_post_process(cop, res);
return;
}

4
drivers/crypto/cnxk/cn10k_ipsec.c
View File

@ -176,9 +176,7 @@ cn10k_ipsec_outb_sa_create(struct roc_cpt *roc_cpt,
if (ret)
return ret;
sa->partial_len = rlens.partial_len;
sa->roundup_byte = rlens.roundup_byte;
sa->roundup_len = rlens.roundup_len;
sa->max_extended_len = rlens.max_extended_len;
/* pre-populate CPT INST word 4 */
inst_w4.u64 = 0;

4
drivers/crypto/cnxk/cn10k_ipsec.h
View File

@ -20,9 +20,7 @@ struct cn10k_ipsec_sa {
};
/** Pre-populated CPT inst words */
struct cnxk_cpt_inst_tmpl inst;
uint8_t partial_len;
uint8_t roundup_len;
uint8_t roundup_byte;
uint16_t max_extended_len;
};
struct cn10k_sec_session {

28
drivers/crypto/cnxk/cn10k_ipsec_la_ops.h
View File

@ -12,40 +12,21 @@
#include "cn10k_ipsec.h"
#include "cnxk_cryptodev.h"
static __rte_always_inline int32_t
ipsec_po_out_rlen_get(struct cn10k_ipsec_sa *sess, uint32_t plen)
{
uint32_t enc_payload_len;
enc_payload_len =
RTE_ALIGN_CEIL(plen + sess->roundup_len, sess->roundup_byte);
return sess->partial_len + enc_payload_len;
}
static __rte_always_inline int
process_outb_sa(struct rte_crypto_op *cop, struct cn10k_ipsec_sa *sess,
struct cpt_inst_s *inst)
{
struct rte_crypto_sym_op *sym_op = cop->sym;
struct rte_mbuf *m_src = sym_op->m_src;
uint32_t dlen, rlen, extend_tail;
char *mdata;
dlen = rte_pktmbuf_pkt_len(m_src);
rlen = ipsec_po_out_rlen_get(sess, dlen);
extend_tail = rlen - dlen;
mdata = rte_pktmbuf_append(m_src, extend_tail);
if (unlikely(mdata == NULL)) {
if (unlikely(rte_pktmbuf_tailroom(m_src) < sess->max_extended_len)) {
plt_dp_err("Not enough tail room");
return -ENOMEM;
}
/* Prepare CPT instruction */
inst->w4.u64 = sess->inst.w4;
inst->w4.s.dlen = dlen;
inst->w4.s.dlen = rte_pktmbuf_pkt_len(m_src);
inst->dptr = rte_pktmbuf_iova(m_src);
inst->rptr = inst->dptr;
@ -58,13 +39,10 @@ process_inb_sa(struct rte_crypto_op *cop, struct cn10k_ipsec_sa *sa,
{
struct rte_crypto_sym_op *sym_op = cop->sym;
struct rte_mbuf *m_src = sym_op->m_src;
uint32_t dlen;
dlen = rte_pktmbuf_pkt_len(m_src);
/* Prepare CPT instruction */
inst->w4.u64 = sa->inst.w4;
inst->w4.s.dlen = dlen;
inst->w4.s.dlen = rte_pktmbuf_pkt_len(m_src);
inst->dptr = rte_pktmbuf_iova(m_src);
inst->rptr = inst->dptr;