From: Akhil Goyal <gakhil@marvell.com>
To: <dev@dpdk.org>
Cc: <anoobj@marvell.com>, <thomas@monjalon.net>,
<ferruh.yigit@intel.com>, <andrew.rybchenko@oktetlabs.ru>,
<olivier.matz@6wind.com>, <rosen.xu@intel.com>,
<jerinj@marvell.com>, <vvelumuri@marvell.com>,
<ndabilpuram@marvell.com>
Subject: [PATCH 3/5] net/cnxk: support IP reassembly mbuf dynfield
Date: Mon, 3 Jan 2022 21:31:47 +0530 [thread overview]
Message-ID: <20220103160149.1715058-4-gakhil@marvell.com> (raw)
In-Reply-To: <20220103160149.1715058-1-gakhil@marvell.com>
From: Vidya Sagar Velumuri <vvelumuri@marvell.com>
Register the dynamic field for IPsec reassembly.
Attach the fragments using the dynamic field in case of incomplete
reassembly
Signed-off-by: Vidya Sagar Velumuri <vvelumuri@marvell.com>
---
drivers/net/cnxk/cn10k_ethdev_sec.c | 3 +++
drivers/net/cnxk/cn10k_rx.h | 38 +++++++++++++++++++++++------
2 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/drivers/net/cnxk/cn10k_ethdev_sec.c b/drivers/net/cnxk/cn10k_ethdev_sec.c
index 235c16840e..f20a111cd9 100644
--- a/drivers/net/cnxk/cn10k_ethdev_sec.c
+++ b/drivers/net/cnxk/cn10k_ethdev_sec.c
@@ -249,6 +249,9 @@ cn10k_eth_sec_session_create(void *device,
if (rte_security_dynfield_register() < 0)
return -ENOTSUP;
+ if (rte_eth_ip_reass_dynfield_register() < 0)
+ return -rte_errno;
+
if (rte_eal_process_type() == RTE_PROC_PRIMARY)
roc_nix_inl_cb_register(cn10k_eth_sec_sso_work_cb, NULL);
diff --git a/drivers/net/cnxk/cn10k_rx.h b/drivers/net/cnxk/cn10k_rx.h
index 5c415634a9..0ba60ed22f 100644
--- a/drivers/net/cnxk/cn10k_rx.h
+++ b/drivers/net/cnxk/cn10k_rx.h
@@ -94,7 +94,7 @@ nix_sec_attach_frags(const struct cpt_parse_hdr_s *hdr,
uint32_t offset = hdr->w2.fi_offset;
union nix_rx_parse_u *frag_rx;
struct cpt_frag_info_s *finfo;
- struct rte_mbuf *head, *mbuf;
+ struct rte_mbuf *head, *mbuf, *mbuf_prev;
uint64_t *frag_ptr;
uint16_t frag_size;
uint16_t rlen;
@@ -115,10 +115,15 @@ nix_sec_attach_frags(const struct cpt_parse_hdr_s *hdr,
mbuf = (struct rte_mbuf *)(wqe - sizeof(struct rte_mbuf));
mbuf->data_len = frag_size;
mbuf->pkt_len = frag_size;
+ mbuf->ol_flags |= RTE_MBUF_F_RX_IPREASSEMBLY_INCOMPLETE;
head = mbuf;
+ mbuf_prev = mbuf;
/* Update dynamic field with userdata */
*rte_security_dynfield(mbuf) = (uint64_t)inb_priv->userdata;
+ rte_eth_ip_reass_dynfield(head)->nb_frags = hdr->w0.num_frags - 1;
+ rte_eth_ip_reass_dynfield(head)->next_frag = NULL;
+
/* Frag-1: */
if (hdr->w0.num_frags > 1) {
wqe = (uint64_t *)(rte_be_to_cpu_64(hdr->frag1_wqe_ptr));
@@ -128,13 +133,19 @@ nix_sec_attach_frags(const struct cpt_parse_hdr_s *hdr,
frag_size = rlen + frag_rx->lcptr - frag_rx->laptr;
frag_rx->pkt_lenm1 = frag_size - 1;
- mbuf->next = (struct rte_mbuf *)(wqe - sizeof(struct rte_mbuf));
- mbuf = mbuf->next;
+ mbuf = (struct rte_mbuf *)(wqe - sizeof(struct rte_mbuf));
mbuf->data_len = frag_size;
mbuf->pkt_len = frag_size;
+ mbuf->ol_flags |= RTE_MBUF_F_RX_IPREASSEMBLY_INCOMPLETE;
/* Update dynamic field with userdata */
*rte_security_dynfield(mbuf) = (uint64_t)inb_priv->userdata;
+
+ rte_eth_ip_reass_dynfield(mbuf)->nb_frags =
+ hdr->w0.num_frags - 2;
+ rte_eth_ip_reass_dynfield(mbuf)->next_frag = NULL;
+ rte_eth_ip_reass_dynfield(mbuf_prev)->next_frag = mbuf;
+ mbuf_prev = mbuf;
}
/* Frag-2: */
@@ -147,13 +158,19 @@ nix_sec_attach_frags(const struct cpt_parse_hdr_s *hdr,
frag_size = rlen + frag_rx->lcptr - frag_rx->laptr;
frag_rx->pkt_lenm1 = frag_size - 1;
- mbuf->next = (struct rte_mbuf *)(wqe - sizeof(struct rte_mbuf));
- mbuf = mbuf->next;
+ mbuf = (struct rte_mbuf *)(wqe - sizeof(struct rte_mbuf));
mbuf->data_len = frag_size;
mbuf->pkt_len = frag_size;
+ mbuf->ol_flags |= RTE_MBUF_F_RX_IPREASSEMBLY_INCOMPLETE;
/* Update dynamic field with userdata */
*rte_security_dynfield(mbuf) = (uint64_t)inb_priv->userdata;
+
+ rte_eth_ip_reass_dynfield(mbuf)->nb_frags =
+ hdr->w0.num_frags - 3;
+ rte_eth_ip_reass_dynfield(mbuf)->next_frag = NULL;
+ rte_eth_ip_reass_dynfield(mbuf_prev)->next_frag = mbuf;
+ mbuf_prev = mbuf;
}
/* Frag-3: */
@@ -165,16 +182,21 @@ nix_sec_attach_frags(const struct cpt_parse_hdr_s *hdr,
frag_size = rlen + frag_rx->lcptr - frag_rx->laptr;
frag_rx->pkt_lenm1 = frag_size - 1;
- mbuf->next = (struct rte_mbuf *)(wqe - sizeof(struct rte_mbuf));
- mbuf = mbuf->next;
+ mbuf = (struct rte_mbuf *)(wqe - sizeof(struct rte_mbuf));
mbuf->data_len = frag_size;
mbuf->pkt_len = frag_size;
+ mbuf->ol_flags |= RTE_MBUF_F_RX_IPREASSEMBLY_INCOMPLETE;
/* Update dynamic field with userdata */
*rte_security_dynfield(mbuf) = (uint64_t)inb_priv->userdata;
+
+ rte_eth_ip_reass_dynfield(mbuf)->nb_frags =
+ hdr->w0.num_frags - 4;
+ rte_eth_ip_reass_dynfield(mbuf)->next_frag = NULL;
+ rte_eth_ip_reass_dynfield(mbuf_prev)->next_frag = mbuf;
}
+ head->next = NULL;
- mbuf->next = NULL;
return head;
}
--
2.25.1
next prev parent reply other threads:[~2022-01-03 16:02 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-03 16:01 [PATCH 0/5] net/cnxk: support IP reassembly offload Akhil Goyal
2022-01-03 16:01 ` [PATCH 1/5] common/cnxk: configure reassembly specific params Akhil Goyal
2022-01-03 16:01 ` [PATCH 2/5] net/cnxk: reassembly support Akhil Goyal
2022-01-03 16:01 ` Akhil Goyal [this message]
2022-01-03 16:01 ` [PATCH 4/5] net/cnxk: add dev args for min-max spi Akhil Goyal
2022-01-03 16:01 ` [PATCH 5/5] net/cnxk: add option to override outbound inline sa iv Akhil Goyal
2022-01-20 16:53 ` [PATCH v2 0/4] net/cnxk: support IP reassembly offload Akhil Goyal
2022-01-20 16:53 ` [PATCH v2 1/4] common/cnxk: configure reassembly specific params Akhil Goyal
2022-01-20 16:53 ` [PATCH v2 2/4] net/cnxk: support IP reassembly Akhil Goyal
2022-01-20 16:53 ` [PATCH v2 3/4] net/cnxk: add dev args for min-max spi Akhil Goyal
2022-01-20 16:53 ` [PATCH v2 4/4] net/cnxk: add option to override outbound inline sa iv Akhil Goyal
2022-02-23 12:28 ` [PATCH v3 0/2] net/cnxk: support IP reassembly offload Akhil Goyal
2022-02-23 12:28 ` [PATCH v3 1/2] common/cnxk: configure reassembly specific params Akhil Goyal
2022-02-23 16:51 ` Jerin Jacob
2022-02-23 12:28 ` [PATCH v3 2/2] net/cnxk: support IP reassembly Akhil Goyal
2022-02-23 16:57 ` Jerin Jacob
2022-02-24 17:28 ` [PATCH v4 0/2] net/cnxk: support IP reassembly offload Akhil Goyal
2022-02-24 17:28 ` [PATCH v4 1/2] common/cnxk: configure reassembly specific params Akhil Goyal
2022-02-24 17:28 ` [PATCH v4 2/2] net/cnxk: support IP reassembly Akhil Goyal
2022-02-24 17:41 ` Jerin Jacob
2022-02-24 18:28 ` [PATCH v5 0/2] net/cnxk: support IP reassembly offload Akhil Goyal
2022-02-24 18:29 ` [PATCH v5 1/2] common/cnxk: configure reassembly specific params Akhil Goyal
2022-02-24 18:29 ` [PATCH v5 2/2] net/cnxk: support IP reassembly Akhil Goyal
2022-02-24 20:40 ` [PATCH v5 0/2] net/cnxk: support IP reassembly offload Jerin Jacob
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220103160149.1715058-4-gakhil@marvell.com \
--to=gakhil@marvell.com \
--cc=andrew.rybchenko@oktetlabs.ru \
--cc=anoobj@marvell.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=jerinj@marvell.com \
--cc=ndabilpuram@marvell.com \
--cc=olivier.matz@6wind.com \
--cc=rosen.xu@intel.com \
--cc=thomas@monjalon.net \
--cc=vvelumuri@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).