From: Somnath Kotur <somnath.kotur@broadcom.com>
To: dev@dpdk.org
Cc: ferruh.yigit@intel.com
Subject: [dpdk-dev] [PATCH 09/20] net/bnxt: add support for vlan push and vlan pop actions
Date: Mon, 6 Jul 2020 13:54:51 +0530 [thread overview]
Message-ID: <20200706082502.26935-10-somnath.kotur@broadcom.com> (raw)
In-Reply-To: <20200706082502.26935-1-somnath.kotur@broadcom.com>
From: Kishore Padmanabha <kishore.padmanabha@broadcom.com>
Add support for the vlan push and vlan pop actions
Signed-off-by: Kishore Padmanabha <kishore.padmanabha@broadcom.com>
Reviewed-by: Ajit Kumar Khaparde <ajit.khaparde@broadcom.com>
Reviewed-by: Michael Baucom <michael.baucom@broadcom.com>
Signed-off-by: Somnath Kotur <somnath.kotur@broadcom.com>
Signed-off-by: Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>
---
drivers/net/bnxt/tf_ulp/ulp_rte_parser.c | 84 ++++++++++++++++++++++++++
drivers/net/bnxt/tf_ulp/ulp_rte_parser.h | 20 ++++++
drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h | 56 ++++++++---------
drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c | 28 ++++-----
4 files changed, 146 insertions(+), 42 deletions(-)
diff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
index b8146c8..8d35429 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
@@ -1415,3 +1415,87 @@ ulp_rte_phy_port_act_handler(const struct rte_flow_action *action_item,
ULP_BITMAP_SET(prm->act_bitmap.bits, BNXT_ULP_ACTION_BIT_VPORT);
return BNXT_TF_RC_SUCCESS;
}
+
+/* Function to handle the parsing of RTE Flow action pop vlan. */
+int32_t
+ulp_rte_of_pop_vlan_act_handler(const struct rte_flow_action *a __rte_unused,
+ struct ulp_rte_parser_params *params)
+{
+ /* Update the act_bitmap with pop */
+ ULP_BITMAP_SET(params->act_bitmap.bits, BNXT_ULP_ACTION_BIT_POP_VLAN);
+ return BNXT_TF_RC_SUCCESS;
+}
+
+/* Function to handle the parsing of RTE Flow action push vlan. */
+int32_t
+ulp_rte_of_push_vlan_act_handler(const struct rte_flow_action *action_item,
+ struct ulp_rte_parser_params *params)
+{
+ const struct rte_flow_action_of_push_vlan *push_vlan;
+ uint16_t ethertype;
+ struct ulp_rte_act_prop *act = ¶ms->act_prop;
+
+ push_vlan = action_item->conf;
+ if (push_vlan) {
+ ethertype = push_vlan->ethertype;
+ if (tfp_cpu_to_be_16(ethertype) != RTE_ETHER_TYPE_VLAN) {
+ BNXT_TF_DBG(ERR,
+ "Parse Err: Ethertype not supported\n");
+ return BNXT_TF_RC_PARSE_ERR;
+ }
+ memcpy(&act->act_details[BNXT_ULP_ACT_PROP_IDX_PUSH_VLAN],
+ ðertype, BNXT_ULP_ACT_PROP_SZ_PUSH_VLAN);
+ /* Update the hdr_bitmap with push vlan */
+ ULP_BITMAP_SET(params->act_bitmap.bits,
+ BNXT_ULP_ACTION_BIT_PUSH_VLAN);
+ return BNXT_TF_RC_SUCCESS;
+ }
+ BNXT_TF_DBG(ERR, "Parse Error: Push vlan arg is invalid\n");
+ return BNXT_TF_RC_ERROR;
+}
+
+/* Function to handle the parsing of RTE Flow action set vlan id. */
+int32_t
+ulp_rte_of_set_vlan_vid_act_handler(const struct rte_flow_action *action_item,
+ struct ulp_rte_parser_params *params)
+{
+ const struct rte_flow_action_of_set_vlan_vid *vlan_vid;
+ uint32_t vid;
+ struct ulp_rte_act_prop *act = ¶ms->act_prop;
+
+ vlan_vid = action_item->conf;
+ if (vlan_vid && vlan_vid->vlan_vid) {
+ vid = vlan_vid->vlan_vid;
+ memcpy(&act->act_details[BNXT_ULP_ACT_PROP_IDX_SET_VLAN_VID],
+ &vid, BNXT_ULP_ACT_PROP_SZ_SET_VLAN_VID);
+ /* Update the hdr_bitmap with vlan vid */
+ ULP_BITMAP_SET(params->act_bitmap.bits,
+ BNXT_ULP_ACTION_BIT_SET_VLAN_VID);
+ return BNXT_TF_RC_SUCCESS;
+ }
+ BNXT_TF_DBG(ERR, "Parse Error: Vlan vid arg is invalid\n");
+ return BNXT_TF_RC_ERROR;
+}
+
+/* Function to handle the parsing of RTE Flow action set vlan pcp. */
+int32_t
+ulp_rte_of_set_vlan_pcp_act_handler(const struct rte_flow_action *action_item,
+ struct ulp_rte_parser_params *params)
+{
+ const struct rte_flow_action_of_set_vlan_pcp *vlan_pcp;
+ uint8_t pcp;
+ struct ulp_rte_act_prop *act = ¶ms->act_prop;
+
+ vlan_pcp = action_item->conf;
+ if (vlan_pcp) {
+ pcp = vlan_pcp->vlan_pcp;
+ memcpy(&act->act_details[BNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP],
+ &pcp, BNXT_ULP_ACT_PROP_SZ_SET_VLAN_PCP);
+ /* Update the hdr_bitmap with vlan vid */
+ ULP_BITMAP_SET(params->act_bitmap.bits,
+ BNXT_ULP_ACTION_BIT_SET_VLAN_PCP);
+ return BNXT_TF_RC_SUCCESS;
+ }
+ BNXT_TF_DBG(ERR, "Parse Error: Vlan pcp arg is invalid\n");
+ return BNXT_TF_RC_ERROR;
+}
diff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h
index 8788431..1bb4721 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h
@@ -170,4 +170,24 @@ int32_t
ulp_rte_phy_port_act_handler(const struct rte_flow_action *action_item,
struct ulp_rte_parser_params *params);
+/* Function to handle the parsing of RTE Flow action pop vlan. */
+int32_t
+ulp_rte_of_pop_vlan_act_handler(const struct rte_flow_action *action_item,
+ struct ulp_rte_parser_params *params);
+
+/* Function to handle the parsing of RTE Flow action push vlan. */
+int32_t
+ulp_rte_of_push_vlan_act_handler(const struct rte_flow_action *action_item,
+ struct ulp_rte_parser_params *params);
+
+/* Function to handle the parsing of RTE Flow action set vlan id. */
+int32_t
+ulp_rte_of_set_vlan_vid_act_handler(const struct rte_flow_action *action_item,
+ struct ulp_rte_parser_params *params);
+
+/* Function to handle the parsing of RTE Flow action set vlan pcp. */
+int32_t
+ulp_rte_of_set_vlan_pcp_act_handler(const struct rte_flow_action *action_item,
+ struct ulp_rte_parser_params *params);
+
#endif /* _ULP_RTE_PARSER_H_ */
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 892d8ea..f232bdb 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h
@@ -539,9 +539,9 @@ enum bnxt_ulp_act_prop_sz {
BNXT_ULP_ACT_PROP_SZ_METER = 4,
BNXT_ULP_ACT_PROP_SZ_SET_MAC_SRC = 8,
BNXT_ULP_ACT_PROP_SZ_SET_MAC_DST = 8,
- BNXT_ULP_ACT_PROP_SZ_OF_PUSH_VLAN = 4,
- BNXT_ULP_ACT_PROP_SZ_OF_SET_VLAN_PCP = 4,
- BNXT_ULP_ACT_PROP_SZ_OF_SET_VLAN_VID = 4,
+ BNXT_ULP_ACT_PROP_SZ_PUSH_VLAN = 2,
+ BNXT_ULP_ACT_PROP_SZ_SET_VLAN_PCP = 1,
+ BNXT_ULP_ACT_PROP_SZ_SET_VLAN_VID = 2,
BNXT_ULP_ACT_PROP_SZ_SET_IPV4_SRC = 4,
BNXT_ULP_ACT_PROP_SZ_SET_IPV4_DST = 4,
BNXT_ULP_ACT_PROP_SZ_SET_IPV6_SRC = 16,
@@ -583,31 +583,31 @@ enum bnxt_ulp_act_prop_idx {
BNXT_ULP_ACT_PROP_IDX_METER = 52,
BNXT_ULP_ACT_PROP_IDX_SET_MAC_SRC = 56,
BNXT_ULP_ACT_PROP_IDX_SET_MAC_DST = 64,
- BNXT_ULP_ACT_PROP_IDX_OF_PUSH_VLAN = 72,
- BNXT_ULP_ACT_PROP_IDX_OF_SET_VLAN_PCP = 76,
- BNXT_ULP_ACT_PROP_IDX_OF_SET_VLAN_VID = 80,
- BNXT_ULP_ACT_PROP_IDX_SET_IPV4_SRC = 84,
- BNXT_ULP_ACT_PROP_IDX_SET_IPV4_DST = 88,
- BNXT_ULP_ACT_PROP_IDX_SET_IPV6_SRC = 92,
- BNXT_ULP_ACT_PROP_IDX_SET_IPV6_DST = 108,
- BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC = 124,
- BNXT_ULP_ACT_PROP_IDX_SET_TP_DST = 128,
- BNXT_ULP_ACT_PROP_IDX_OF_PUSH_MPLS_0 = 132,
- BNXT_ULP_ACT_PROP_IDX_OF_PUSH_MPLS_1 = 136,
- BNXT_ULP_ACT_PROP_IDX_OF_PUSH_MPLS_2 = 140,
- BNXT_ULP_ACT_PROP_IDX_OF_PUSH_MPLS_3 = 144,
- BNXT_ULP_ACT_PROP_IDX_OF_PUSH_MPLS_4 = 148,
- BNXT_ULP_ACT_PROP_IDX_OF_PUSH_MPLS_5 = 152,
- BNXT_ULP_ACT_PROP_IDX_OF_PUSH_MPLS_6 = 156,
- BNXT_ULP_ACT_PROP_IDX_OF_PUSH_MPLS_7 = 160,
- BNXT_ULP_ACT_PROP_IDX_ENCAP_L2_DMAC = 164,
- BNXT_ULP_ACT_PROP_IDX_ENCAP_L2_SMAC = 170,
- BNXT_ULP_ACT_PROP_IDX_ENCAP_VTAG = 176,
- BNXT_ULP_ACT_PROP_IDX_ENCAP_IP = 184,
- BNXT_ULP_ACT_PROP_IDX_ENCAP_IP_SRC = 216,
- BNXT_ULP_ACT_PROP_IDX_ENCAP_UDP = 232,
- BNXT_ULP_ACT_PROP_IDX_ENCAP_TUN = 236,
- BNXT_ULP_ACT_PROP_IDX_LAST = 268
+ BNXT_ULP_ACT_PROP_IDX_PUSH_VLAN = 72,
+ BNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP = 74,
+ BNXT_ULP_ACT_PROP_IDX_SET_VLAN_VID = 75,
+ BNXT_ULP_ACT_PROP_IDX_SET_IPV4_SRC = 77,
+ BNXT_ULP_ACT_PROP_IDX_SET_IPV4_DST = 81,
+ BNXT_ULP_ACT_PROP_IDX_SET_IPV6_SRC = 85,
+ BNXT_ULP_ACT_PROP_IDX_SET_IPV6_DST = 101,
+ BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC = 117,
+ BNXT_ULP_ACT_PROP_IDX_SET_TP_DST = 121,
+ BNXT_ULP_ACT_PROP_IDX_OF_PUSH_MPLS_0 = 125,
+ BNXT_ULP_ACT_PROP_IDX_OF_PUSH_MPLS_1 = 129,
+ BNXT_ULP_ACT_PROP_IDX_OF_PUSH_MPLS_2 = 133,
+ BNXT_ULP_ACT_PROP_IDX_OF_PUSH_MPLS_3 = 137,
+ BNXT_ULP_ACT_PROP_IDX_OF_PUSH_MPLS_4 = 141,
+ BNXT_ULP_ACT_PROP_IDX_OF_PUSH_MPLS_5 = 145,
+ BNXT_ULP_ACT_PROP_IDX_OF_PUSH_MPLS_6 = 149,
+ BNXT_ULP_ACT_PROP_IDX_OF_PUSH_MPLS_7 = 153,
+ BNXT_ULP_ACT_PROP_IDX_ENCAP_L2_DMAC = 157,
+ BNXT_ULP_ACT_PROP_IDX_ENCAP_L2_SMAC = 163,
+ BNXT_ULP_ACT_PROP_IDX_ENCAP_VTAG = 169,
+ BNXT_ULP_ACT_PROP_IDX_ENCAP_IP = 177,
+ BNXT_ULP_ACT_PROP_IDX_ENCAP_IP_SRC = 209,
+ BNXT_ULP_ACT_PROP_IDX_ENCAP_UDP = 225,
+ BNXT_ULP_ACT_PROP_IDX_ENCAP_TUN = 229,
+ BNXT_ULP_ACT_PROP_IDX_LAST = 261
};
enum bnxt_ulp_class_hid {
diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c
index f0a57cf..2cc3458 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c
@@ -41,12 +41,12 @@ uint32_t ulp_act_prop_map_table[] = {
BNXT_ULP_ACT_PROP_SZ_SET_MAC_SRC,
[BNXT_ULP_ACT_PROP_IDX_SET_MAC_DST] =
BNXT_ULP_ACT_PROP_SZ_SET_MAC_DST,
- [BNXT_ULP_ACT_PROP_IDX_OF_PUSH_VLAN] =
- BNXT_ULP_ACT_PROP_SZ_OF_PUSH_VLAN,
- [BNXT_ULP_ACT_PROP_IDX_OF_SET_VLAN_PCP] =
- BNXT_ULP_ACT_PROP_SZ_OF_SET_VLAN_PCP,
- [BNXT_ULP_ACT_PROP_IDX_OF_SET_VLAN_VID] =
- BNXT_ULP_ACT_PROP_SZ_OF_SET_VLAN_VID,
+ [BNXT_ULP_ACT_PROP_IDX_PUSH_VLAN] =
+ BNXT_ULP_ACT_PROP_SZ_PUSH_VLAN,
+ [BNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP] =
+ BNXT_ULP_ACT_PROP_SZ_SET_VLAN_PCP,
+ [BNXT_ULP_ACT_PROP_IDX_SET_VLAN_VID] =
+ BNXT_ULP_ACT_PROP_SZ_SET_VLAN_VID,
[BNXT_ULP_ACT_PROP_IDX_SET_IPV4_SRC] =
BNXT_ULP_ACT_PROP_SZ_SET_IPV4_SRC,
[BNXT_ULP_ACT_PROP_IDX_SET_IPV4_DST] =
@@ -183,20 +183,20 @@ struct bnxt_ulp_rte_act_info ulp_act_info[] = {
.proto_act_func = NULL
},
[RTE_FLOW_ACTION_TYPE_OF_POP_VLAN] = {
- .act_type = BNXT_ULP_ACT_TYPE_NOT_SUPPORTED,
- .proto_act_func = NULL
+ .act_type = BNXT_ULP_ACT_TYPE_SUPPORTED,
+ .proto_act_func = ulp_rte_of_pop_vlan_act_handler
},
[RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN] = {
- .act_type = BNXT_ULP_ACT_TYPE_NOT_SUPPORTED,
- .proto_act_func = NULL
+ .act_type = BNXT_ULP_ACT_TYPE_SUPPORTED,
+ .proto_act_func = ulp_rte_of_push_vlan_act_handler
},
[RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID] = {
- .act_type = BNXT_ULP_ACT_TYPE_NOT_SUPPORTED,
- .proto_act_func = NULL
+ .act_type = BNXT_ULP_ACT_TYPE_SUPPORTED,
+ .proto_act_func = ulp_rte_of_set_vlan_vid_act_handler
},
[RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP] = {
- .act_type = BNXT_ULP_ACT_TYPE_NOT_SUPPORTED,
- .proto_act_func = NULL
+ .act_type = BNXT_ULP_ACT_TYPE_SUPPORTED,
+ .proto_act_func = ulp_rte_of_set_vlan_pcp_act_handler
},
[RTE_FLOW_ACTION_TYPE_OF_POP_MPLS] = {
.act_type = BNXT_ULP_ACT_TYPE_NOT_SUPPORTED,
--
2.7.4
next prev parent reply other threads:[~2020-07-06 8:31 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-06 8:24 [dpdk-dev] [PATCH 00/20] bnxt patches Somnath Kotur
2020-07-06 8:24 ` [dpdk-dev] [PATCH 01/20] net/bnxt: vxlan encap and decap with src property enabled Somnath Kotur
2020-07-06 8:24 ` [dpdk-dev] [PATCH 02/20] net/bnxt: add support vlan header bitmap Somnath Kotur
2020-07-06 8:24 ` [dpdk-dev] [PATCH 03/20] net/bnxt: add support for negative conditional opcodes Somnath Kotur
2020-07-06 8:24 ` [dpdk-dev] [PATCH 04/20] net/bnxt: add validations to dpdk port id and phy port parsing Somnath Kotur
2020-07-06 8:24 ` [dpdk-dev] [PATCH 05/20] net/bnxt: add support for index opcode constant Somnath Kotur
2020-07-06 8:24 ` [dpdk-dev] [PATCH 06/20] net/bnxt: updated hsi_struct_def_dpdk.h Somnath Kotur
2020-07-06 8:24 ` [dpdk-dev] [PATCH 07/20] nxt/bnxt: added HWRM support for global cfg Somnath Kotur
2020-07-06 8:24 ` [dpdk-dev] [PATCH 08/20] net/bnxt: cleanup and refactoring Somnath Kotur
2020-07-06 8:24 ` Somnath Kotur [this message]
2020-07-06 8:24 ` [dpdk-dev] [PATCH 10/20] net/bnxt: remove vnic and vport act bits from template matching Somnath Kotur
2020-07-06 8:24 ` [dpdk-dev] [PATCH 11/20] net/bnxt: fix vxlan outer ip protocol id encapsulation Somnath Kotur
2020-07-06 8:24 ` [dpdk-dev] [PATCH 12/20] net/bnxt: add number of vlan tags in the computed field list Somnath Kotur
2020-07-06 8:24 ` [dpdk-dev] [PATCH 13/20] net/bnxt: enable support for PF and VF port action items Somnath Kotur
2020-07-06 8:24 ` [dpdk-dev] [PATCH 14/20] net/bnxt: port configuration changes to support full offload Somnath Kotur
2020-07-06 8:24 ` [dpdk-dev] [PATCH 15/20] net/bnxt: add support for conditional opcodes for mapper result table Somnath Kotur
2020-07-06 8:24 ` [dpdk-dev] [PATCH 16/20] net/bnxt: add support for nat rte action items Somnath Kotur
2020-07-06 8:24 ` [dpdk-dev] [PATCH 17/20] net/bnxt: add support for tp src/dst " Somnath Kotur
2020-07-06 8:25 ` [dpdk-dev] [PATCH 18/20] net/bnxt: use VF vnic when port action is for a VF rep port Somnath Kotur
2020-07-06 8:25 ` [dpdk-dev] [PATCH 19/20] net/bnxt: enable flow ctrl ops for the VF-rep device Somnath Kotur
2020-07-06 8:25 ` [dpdk-dev] [PATCH 20/20] net/bnxt: use byte/pkt count shift/masks from the device template Somnath Kotur
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=20200706082502.26935-10-somnath.kotur@broadcom.com \
--to=somnath.kotur@broadcom.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.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).