[PATCH 31/54] net/bnxt/tf_ulp: ulp parser support to handle gre key
Manish Kurup
manish.kurup at broadcom.com
Tue Sep 30 02:35:41 CEST 2025
From: Shahaji Bhosle <shahaji.bhosle at 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 at broadcom.com>
Reviewed-by: Kishore Padmanabha <kishore.padmanabha at 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)
More information about the dev
mailing list