diff mbox series

[v2,12/21] net/cnxk: fix inline device RQ tag mask

Message ID	20220222193512.19292-12-ndabilpuram@marvell.com (mailing list archive)
State	Accepted, archived
Delegated to:	Jerin Jacob
Headers	From: Nithin Dabilpuram <ndabilpuram@marvell.com> To: <jerinj@marvell.com>, Nithin Dabilpuram <ndabilpuram@marvell.com>, "Kiran Kumar K" <kirankumark@marvell.com>, Sunil Kumar Kori <skori@marvell.com>, Satha Rao <skoteshwar@marvell.com> CC: <dev@dpdk.org>, <stable@dpdk.org> Subject: [PATCH v2 12/21] net/cnxk: fix inline device RQ tag mask Date: Wed, 23 Feb 2022 01:05:03 +0530 Message-ID: <20220222193512.19292-12-ndabilpuram@marvell.com> In-Reply-To: <20220222193512.19292-1-ndabilpuram@marvell.com> References: <20220207072932.22409-1-ndabilpuram@marvell.com> <20220222193512.19292-1-ndabilpuram@marvell.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: list Errors-To: dev-bounces@dpdk.org
Series	[v2,01/21] common/cnxk: increase SMQ resource count \| [v2,01/21] common/cnxk: increase SMQ resource count [v2,02/21] common/cnxk: realloc inline device XAQ AURA [v2,03/21] common/cnxk: adjust shaper rates to lower boundaries [v2,04/21] common/cnxk: support inline device API without ROC NIX [v2,05/21] common/cnxk: use common SA init API for default options [v2,06/21] common/cnxk: enable l3hdr write back in SA [v2,07/21] common/cnxk: support to enable AURA tail drop for RQ [v2,08/21] common/cnxk: use SSO time counter threshold for IRQ [v2,09/21] common/cnxk: allow force use of SSO pffunc for outb inline [v2,10/21] net/cnxk: added Rx metadata negotiate operation [v2,11/21] common/cnxk: remove tracking of mark actions [v2,12/21] net/cnxk: fix inline device RQ tag mask [v2,13/21] net/cnxk: register callback early to handle initial packets [v2,14/21] net/cnxk: realloc inline dev XAQ for security [v2,15/21] net/cnxk: fix inline IPsec security error handling [v2,16/21] net/cnxk: use NPA batch burst free for meta buffers [v2,17/21] net/cnxk: enable packet pool tail drop [v2,18/21] net/cnxk: enable flow control by default on device configure [v2,19/21] net/cnxk: add dev args for min-max spi [v2,20/21] net/cnxk: add option to override outbound inline SA IV [v2,21/21] doc: add table for environment variables used by cnxk

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Nithin Dabilpuram Feb. 22, 2022, 7:35 p.m. UTC

  Fix inline device rq tagmask to get packets with receive errors
as type ETHDEV packets to callback handler so that packet buffers
can get freed. Currently only ipsec denied packets get the right
tag mask.

Fixes: ee48f711f3b0 ("common/cnxk: support NIX inline inbound and outbound setup")
Cc: stable@dpdk.org

Signed-off-by: Nithin Dabilpuram <ndabilpuram@marvell.com>
---
 drivers/common/cnxk/roc_nix_inl.c | 2 +-
 drivers/net/cnxk/cnxk_ethdev.c    | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/drivers/common/cnxk/roc_nix_inl.c b/drivers/common/cnxk/roc_nix_inl.c
index 003f972..11a1691 100644
--- a/drivers/common/cnxk/roc_nix_inl.c
+++ b/drivers/common/cnxk/roc_nix_inl.c
@@ -584,7 +584,7 @@  roc_nix_inl_dev_rq_get(struct roc_nix_rq *rq)
 
 	inl_rq->flow_tag_width = 20;
 	/* Special tag mask */
-	inl_rq->tag_mask = 0xFFF00000;
+	inl_rq->tag_mask = rq->tag_mask;
 	inl_rq->tt = SSO_TT_ORDERED;
 	inl_rq->hwgrp = 0;
 	inl_rq->wqe_skip = inl_dev->wqe_skip;
diff --git a/drivers/net/cnxk/cnxk_ethdev.c b/drivers/net/cnxk/cnxk_ethdev.c
index 3468aab..b272ede 100644
--- a/drivers/net/cnxk/cnxk_ethdev.c
+++ b/drivers/net/cnxk/cnxk_ethdev.c
@@ -3,6 +3,8 @@ 
  */
 #include <cnxk_ethdev.h>
 
+#include <rte_eventdev.h>
+
 static inline uint64_t
 nix_get_rx_offload_capa(struct cnxk_eth_dev *dev)
 {
@@ -597,6 +599,13 @@  cnxk_nix_rx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t qid,
 	rxq_sp->qconf.mp = mp;
 
 	if (dev->rx_offloads & RTE_ETH_RX_OFFLOAD_SECURITY) {
+		/* Pass a tagmask used to handle error packets in inline device.
+		 * Ethdev rq's tag_mask field will be overwritten later
+		 * when sso is setup.
+		 */
+		rq->tag_mask =
+			0x0FF00000 | ((uint32_t)RTE_EVENT_TYPE_ETHDEV << 28);
+
 		/* Setup rq reference for inline dev if present */
 		rc = roc_nix_inl_dev_rq_get(rq);
 		if (rc)