From: Harman Kalra <hkalra@marvell.com>
To: 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>, <jerinj@marvell.com>,
Harman Kalra <hkalra@marvell.com>, <stable@dpdk.org>
Subject: [PATCH 2/2] common/cnxk: fix VLAN check for inner header
Date: Thu, 21 Dec 2023 12:08:11 +0530 [thread overview]
Message-ID: <20231221063811.17376-2-hkalra@marvell.com> (raw)
In-Reply-To: <20231221063811.17376-1-hkalra@marvell.com>
Adding the has vlan check in inner headers i.e in LF layer. If
has_vlan is 0 it should be masked out while installing flow rule.
Fixes: c34ea71b878d ("common/cnxk: add NPC parsing API")
Cc: stable@dpdk.org
Signed-off-by: Harman Kalra <hkalra@marvell.com>
---
drivers/common/cnxk/roc_npc_parse.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/common/cnxk/roc_npc_parse.c b/drivers/common/cnxk/roc_npc_parse.c
index 9ceb707ebb..571d6b8e5d 100644
--- a/drivers/common/cnxk/roc_npc_parse.c
+++ b/drivers/common/cnxk/roc_npc_parse.c
@@ -1097,6 +1097,7 @@ npc_parse_lf(struct npc_parse_state *pst)
{
const struct roc_npc_item_info *pattern, *last_pattern;
char hw_mask[NPC_MAX_EXTRACT_HW_LEN];
+ const struct roc_npc_flow_item_eth *eth_item;
struct npc_parse_item_info info;
int lid, lt, lflags;
int nr_vlans = 0;
@@ -1113,10 +1114,12 @@ npc_parse_lf(struct npc_parse_state *pst)
lt = NPC_LT_LF_TU_ETHER;
lflags = 0;
+ eth_item = pst->pattern->spec;
+
/* No match support for vlan tags */
info.def_mask = NULL;
info.hw_mask = NULL;
- info.len = pst->pattern->size;
+ info.len = sizeof(eth_item->hdr);
info.spec = NULL;
info.mask = NULL;
info.hw_hdr_len = 0;
@@ -1147,12 +1150,15 @@ npc_parse_lf(struct npc_parse_state *pst)
}
info.hw_mask = &hw_mask;
- info.len = pst->pattern->size;
+ info.len = sizeof(eth_item->hdr);
info.hw_hdr_len = 0;
npc_get_hw_supp_mask(pst, &info, lid, lt);
info.spec = NULL;
info.mask = NULL;
+ if (eth_item && eth_item->has_vlan)
+ pst->set_vlan_ltype_mask = true;
+
rc = npc_parse_item_basic(pst->pattern, &info);
if (rc != 0)
return rc;
--
2.18.0
next prev parent reply other threads:[~2023-12-21 6:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-21 6:38 [PATCH 1/2] common/cnxk: fix mbox region copy Harman Kalra
2023-12-21 6:38 ` Harman Kalra [this message]
2024-01-03 10:12 ` [PATCH 2/2] common/cnxk: fix VLAN check for inner header 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=20231221063811.17376-2-hkalra@marvell.com \
--to=hkalra@marvell.com \
--cc=dev@dpdk.org \
--cc=jerinj@marvell.com \
--cc=kirankumark@marvell.com \
--cc=ndabilpuram@marvell.com \
--cc=skori@marvell.com \
--cc=skoteshwar@marvell.com \
--cc=stable@dpdk.org \
/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).