From: Manish Kurup <manish.kurup@broadcom.com>
To: dev@dpdk.org
Cc: ajit.khaparde@broadcom.com,
Shahaji Bhosle <shahaji.bhosle@broadcom.com>,
Kishore Padmanabha <kishore.padmanabha@broadcom.com>
Subject: [PATCH v4 34/57] net/bnxt/tf_ulp: ulp parser support to handle gre key
Date: Tue, 21 Oct 2025 14:56:38 -0400 [thread overview]
Message-ID: <20251021185701.71881-3-manish.kurup@broadcom.com> (raw)
In-Reply-To: <20251021185701.71881-1-manish.kurup@broadcom.com>
From: Shahaji Bhosle <shahaji.bhosle@broadcom.com>
1. Added a new handler to GRE key input from the parser
2. Add a new pattern to match on GRE with KEY id.
Signed-off-by: Shahaji Bhosle <shahaji.bhosle@broadcom.com>
Reviewed-by: Kishore Padmanabha <kishore.padmanabha@broadcom.com>
---
drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c | 4 +-
drivers/net/bnxt/tf_ulp/ulp_rte_parser.c | 45 ++++++++++++++++++-
drivers/net/bnxt/tf_ulp/ulp_rte_parser.h | 5 +++
.../net/bnxt/tf_ulp/ulp_template_db_enum.h | 3 +-
drivers/net/bnxt/tf_ulp/ulp_template_struct.h | 2 +
5 files changed, 55 insertions(+), 4 deletions(-)
diff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c b/drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c
index 6e1115b985..4a7c7e437c 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c
@@ -373,8 +373,8 @@ struct bnxt_ulp_rte_hdr_info ulp_hdr_info[] = {
.proto_hdr_func = NULL
},
[RTE_FLOW_ITEM_TYPE_GRE_KEY] = {
- .hdr_type = BNXT_ULP_HDR_TYPE_NOT_SUPPORTED,
- .proto_hdr_func = NULL
+ .hdr_type = BNXT_ULP_HDR_TYPE_SUPPORTED,
+ .proto_hdr_func = ulp_rte_gre_key_hdr_handler
},
[RTE_FLOW_ITEM_TYPE_GTP_PSC] = {
.hdr_type = BNXT_ULP_HDR_TYPE_NOT_SUPPORTED,
diff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
index af7f8b7ab4..ceda1ff5ef 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
@@ -31,6 +31,9 @@
#define ULP_UDP_PORT_GENEVE 6081
#define ULP_UDP_PORT_GENEVE_MASK 0xFFFF
+/* GRE cks_rsvd0_ver bits */
+#define ULP_GRE_CKS_RSVD0_VER_HDR_KEY_BIT 0x2000
+
/**
* Geneve header first 16Bit
* Version (2b), length of the options fields (6b), OAM packet (1b),
@@ -1887,14 +1890,51 @@ ulp_rte_geneve_hdr_handler(const struct rte_flow_item *item,
return BNXT_TF_RC_SUCCESS;
}
+/* Function to handle the parsing of RTE Flow item GRE Key Header. */
+int32_t
+ulp_rte_gre_key_hdr_handler(const struct rte_flow_item *item,
+ struct ulp_rte_parser_params *params)
+{
+ const rte_be32_t *gre_key_spec = item->spec;
+ const rte_be32_t *gre_key_mask = item->mask;
+ rte_be32_t gre_key_full_mask = RTE_BE32(UINT32_MAX);
+ struct ulp_rte_hdr_bitmap *hdr_bitmap = ¶ms->hdr_bitmap;
+ uint32_t idx = 0;
+ uint32_t size;
+
+ if (unlikely(ulp_rte_prsr_fld_size_validate(params, &idx,
+ BNXT_ULP_PROTO_HDR_GRE_KEY_NUM))) {
+ BNXT_DRV_DBG(ERR, "Error parsing protocol header");
+ return BNXT_TF_RC_ERROR;
+ }
+
+ if (unlikely(!(params->gre_cks_rsvd0_ver & RTE_BE16(ULP_GRE_CKS_RSVD0_VER_HDR_KEY_BIT)))) {
+ BNXT_DRV_DBG(ERR, "Error GRE K bit is not set");
+ return BNXT_TF_RC_ERROR;
+ }
+
+ if (gre_key_spec && !gre_key_mask)
+ gre_key_mask = &gre_key_full_mask;
+
+ size = sizeof(uint32_t);
+ ulp_rte_prsr_fld_mask(params, &idx, size,
+ gre_key_spec,
+ gre_key_mask,
+ ULP_PRSR_ACT_DEFAULT);
+
+ /* Update the hdr_bitmap with GRE */
+ ULP_BITMAP_SET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_T_GRE_OPT);
+ return BNXT_TF_RC_SUCCESS;
+}
+
/* Function to handle the parsing of RTE Flow item GRE Header. */
int32_t
ulp_rte_gre_hdr_handler(const struct rte_flow_item *item,
struct ulp_rte_parser_params *params)
{
+ struct ulp_rte_hdr_bitmap *hdr_bitmap = ¶ms->hdr_bitmap;
const struct rte_flow_item_gre *gre_spec = item->spec;
const struct rte_flow_item_gre *gre_mask = item->mask;
- struct ulp_rte_hdr_bitmap *hdr_bitmap = ¶ms->hdr_bitmap;
uint32_t idx = 0;
uint32_t size;
@@ -1907,6 +1947,9 @@ ulp_rte_gre_hdr_handler(const struct rte_flow_item *item,
if (gre_spec && !gre_mask)
gre_mask = &rte_flow_item_gre_mask;
+ params->gre_cks_rsvd0_ver = (gre_spec && gre_mask) ?
+ (gre_spec->c_rsvd0_ver & gre_mask->c_rsvd0_ver) : 0;
+
size = sizeof(((struct rte_flow_item_gre *)NULL)->c_rsvd0_ver);
ulp_rte_prsr_fld_mask(params, &idx, size,
ulp_deference_struct(gre_spec, c_rsvd0_ver),
diff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h
index 5f451ba404..92c34394ae 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h
@@ -140,6 +140,11 @@ int32_t
ulp_rte_geneve_hdr_handler(const struct rte_flow_item *item,
struct ulp_rte_parser_params *params);
+/* Function to handle the parsing of RTE Flow item GRE KEY Header. */
+int32_t
+ulp_rte_gre_key_hdr_handler(const struct rte_flow_item *item,
+ struct ulp_rte_parser_params *params);
+
/* Function to handle the parsing of RTE Flow item GRE Header. */
int32_t
ulp_rte_gre_hdr_handler(const struct rte_flow_item *item,
diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h b/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h
index c30a43568b..3ce43f4c92 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h
@@ -119,7 +119,8 @@ enum bnxt_ulp_hdr_bit {
BNXT_ULP_HDR_BIT_NON_GENERIC = 0x0000000400000000,
BNXT_ULP_HDR_BIT_GENERIC = 0x0000000800000000,
BNXT_ULP_HDR_BIT_T_MPLS = 0x0000001000000000,
- BNXT_ULP_HDR_BIT_LAST = 0x0000002000000000
+ BNXT_ULP_HDR_BIT_T_GRE_OPT = 0x0000002000000000,
+ BNXT_ULP_HDR_BIT_LAST = 0x0000004000000000
};
enum bnxt_ulp_accept_opc {
diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h
index 5b3e82f336..f38ebcea9a 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h
@@ -32,6 +32,7 @@
#define BNXT_ULP_PROTO_HDR_VXLAN_GPE_NUM 5
#define BNXT_ULP_PROTO_HDR_GENEVE_NUM 4
#define BNXT_ULP_PROTO_HDR_GRE_NUM 2
+#define BNXT_ULP_PROTO_HDR_GRE_KEY_NUM 1
#define BNXT_ULP_PROTO_HDR_ICMP_NUM 5
#define BNXT_ULP_PROTO_HDR_ECPRI_NUM 2
#define BNXT_ULP_PROTO_HDR_IPV6_EXT_NUM 1
@@ -100,6 +101,7 @@ struct ulp_rte_parser_params {
uint32_t act_pattern_id;
uint8_t app_id;
uint8_t tun_idx;
+ uint16_t gre_cks_rsvd0_ver; /* GRE C, K, S bits and version */
uint16_t class_info_idx;
uint64_t wc_field_bitmap;
uint64_t cf_bitmap;
--
2.39.5 (Apple Git-154)
next prev parent reply other threads:[~2025-10-21 18:57 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-21 18:56 [PATCH v4 32/57] net/bnxt/tf_core: add backing store debug to dpdk Manish Kurup
2025-10-21 18:56 ` [PATCH v4 33/57] net/bnxt/tf_core: truflow global table scope Manish Kurup
2025-10-21 18:56 ` Manish Kurup [this message]
2025-10-21 18:56 ` [PATCH v4 35/57] net/bnxt/tf_core: handle out of order MPC completions Manish Kurup
2025-10-21 18:56 ` [PATCH v4 36/57] net/bnxt/tf_ulp: socket direct enable Manish Kurup
2025-10-21 18:56 ` [PATCH v4 37/57] net/bnxt: fix adding udp_tunnel_port Manish Kurup
2025-10-21 18:56 ` [PATCH v4 38/57] net/bnxt/tf_ulp: add non vfr mode capability Manish Kurup
2025-10-21 18:56 ` [PATCH v4 39/57] net/bnxt: avoid iova range check when external memory is used Manish Kurup
2025-10-21 18:56 ` [PATCH v4 40/57] net/bnxt: avoid potential segfault in VFR handling Manish Kurup
2025-10-21 18:56 ` [PATCH v4 41/57] net/bnxt/tf_ulp: change rte_mem_virt2iova to rte_mem_virt2phys Manish Kurup
2025-10-21 18:56 ` [PATCH v4 42/57] net/bnxt: thor2 truflow memory manager bug Manish Kurup
2025-10-21 18:56 ` [PATCH v4 43/57] net/bnxt: fix stats collection when rx queue is not set Manish Kurup
2025-10-21 18:56 ` [PATCH v4 44/57] net/bnxt: fix rss configuration when set to none Manish Kurup
2025-10-21 18:56 ` [PATCH v4 45/57] net/bnxt: packet drop after port stop and start Manish Kurup
2025-10-21 18:56 ` [PATCH v4 46/57] net/bnxt/tf_core: fix truflow crash on memory allocation failure Manish Kurup
2025-10-21 18:56 ` [PATCH v4 47/57] net/bnxt: truflow remove RTE devarg processing for mpc=1 Manish Kurup
2025-10-21 18:56 ` [PATCH v4 48/57] net/bnxt: add meson build options for TruFlow Manish Kurup
2025-10-21 18:56 ` [PATCH v4 49/57] net/bnxt: truflow HSI struct fixes Manish Kurup
2025-10-21 18:56 ` [PATCH v4 50/57] net/bnxt/tf_ulp: truflow add pf action handler Manish Kurup
2025-10-21 18:56 ` [PATCH v4 51/57] net/bnxt/tf_ulp: add support for unicast only feature Manish Kurup
2025-10-21 18:56 ` [PATCH v4 52/57] net/bnxt/tf_core: remove excessive debug logging Manish Kurup
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=20251021185701.71881-3-manish.kurup@broadcom.com \
--to=manish.kurup@broadcom.com \
--cc=ajit.khaparde@broadcom.com \
--cc=dev@dpdk.org \
--cc=kishore.padmanabha@broadcom.com \
--cc=shahaji.bhosle@broadcom.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).