net/bnxt: update HSI structure

[dpdk.git] / app / test-pmd / cmdline_flow.c

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index e99e24c..e6ab8ff 100644 (file)
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -170,6 +170,7 @@ enum index {
        ITEM_FUZZY,
        ITEM_FUZZY_THRESH,
        ITEM_GTP,
+       ITEM_GTP_FLAGS,
        ITEM_GTP_MSG_TYPE,
        ITEM_GTP_TEID,
        ITEM_GTPC,
@@ -220,6 +221,11 @@ enum index {
        ITEM_L2TPV3OIP_SESSION_ID,
        ITEM_ESP,
        ITEM_ESP_SPI,
+       ITEM_AH,
+       ITEM_AH_SPI,
+       ITEM_PFCP,
+       ITEM_PFCP_S_FIELD,
+       ITEM_PFCP_SEID,
 
        /* Validate/create actions. */
        ACTIONS,
@@ -768,6 +774,8 @@ static const enum index next_item[] = {
        ITEM_TAG,
        ITEM_L2TPV3OIP,
        ITEM_ESP,
+       ITEM_AH,
+       ITEM_PFCP,
        END_SET,
        ZERO,
 };
@@ -931,6 +939,7 @@ static const enum index item_gre_key[] = {
 };
 
 static const enum index item_gtp[] = {
+       ITEM_GTP_FLAGS,
        ITEM_GTP_MSG_TYPE,
        ITEM_GTP_TEID,
        ITEM_NEXT,
@@ -1028,7 +1037,6 @@ static const enum index item_pppoes[] = {
 };
 
 static const enum index item_pppoe_proto_id[] = {
-       ITEM_PPPOE_PROTO_ID,
        ITEM_NEXT,
        ZERO,
 };
@@ -1046,6 +1054,19 @@ static const enum index item_esp[] = {
        ZERO,
 };
 
+static const enum index item_ah[] = {
+       ITEM_AH_SPI,
+       ITEM_NEXT,
+       ZERO,
+};
+
+static const enum index item_pfcp[] = {
+       ITEM_PFCP_S_FIELD,
+       ITEM_PFCP_SEID,
+       ITEM_NEXT,
+       ZERO,
+};
+
 static const enum index next_set_raw[] = {
        SET_RAW_INDEX,
        ITEM_ETH,
@@ -2327,12 +2348,18 @@ static const struct token token_list[] = {
                .next = NEXT(item_gtp),
                .call = parse_vc,
        },
+       [ITEM_GTP_FLAGS] = {
+               .name = "v_pt_rsv_flags",
+               .help = "GTP flags",
+               .next = NEXT(item_gtp, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY(struct rte_flow_item_gtp,
+                                       v_pt_rsv_flags)),
+       },
        [ITEM_GTP_MSG_TYPE] = {
                .name = "msg_type",
                .help = "GTP message type",
                .next = NEXT(item_gtp, NEXT_ENTRY(UNSIGNED), item_param),
-               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_gtp,
-                                            msg_type)),
+               .args = ARGS(ARGS_ENTRY(struct rte_flow_item_gtp, msg_type)),
        },
        [ITEM_GTP_TEID] = {
                .name = "teid",
@@ -2621,11 +2648,14 @@ static const struct token token_list[] = {
                                        session_id)),
        },
        [ITEM_PPPOE_PROTO_ID] = {
-               .name = "proto_id",
+               .name = "pppoe_proto_id",
                .help = "match PPPoE session protocol identifier",
                .priv = PRIV_ITEM(PPPOE_PROTO_ID,
                                sizeof(struct rte_flow_item_pppoe_proto_id)),
-               .next = NEXT(item_pppoe_proto_id),
+               .next = NEXT(item_pppoe_proto_id, NEXT_ENTRY(UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON
+                            (struct rte_flow_item_pppoe_proto_id, proto_id)),
                .call = parse_vc,
        },
        [ITEM_HIGIG2] = {
@@ -2699,6 +2729,39 @@ static const struct token token_list[] = {
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_esp,
                                hdr.spi)),
        },
+       [ITEM_AH] = {
+               .name = "ah",
+               .help = "match AH header",
+               .priv = PRIV_ITEM(AH, sizeof(struct rte_flow_item_ah)),
+               .next = NEXT(item_ah),
+               .call = parse_vc,
+       },
+       [ITEM_AH_SPI] = {
+               .name = "spi",
+               .help = "security parameters index",
+               .next = NEXT(item_ah, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ah, spi)),
+       },
+       [ITEM_PFCP] = {
+               .name = "pfcp",
+               .help = "match pfcp header",
+               .priv = PRIV_ITEM(PFCP, sizeof(struct rte_flow_item_pfcp)),
+               .next = NEXT(item_pfcp),
+               .call = parse_vc,
+       },
+       [ITEM_PFCP_S_FIELD] = {
+               .name = "s_field",
+               .help = "S field",
+               .next = NEXT(item_pfcp, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_pfcp,
+                               s_field)),
+       },
+       [ITEM_PFCP_SEID] = {
+               .name = "seid",
+               .help = "session endpoint identifier",
+               .next = NEXT(item_pfcp, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_pfcp, seid)),
+       },
        /* Validate/create actions. */
        [ACTIONS] = {
                .name = "actions",
@@ -4576,7 +4639,9 @@ parse_vc_action_mplsogre_encap(struct context *ctx, const struct token *token,
        struct rte_flow_item_gre gre = {
                .protocol = rte_cpu_to_be_16(ETHER_TYPE_MPLS_UNICAST),
        };
-       struct rte_flow_item_mpls mpls;
+       struct rte_flow_item_mpls mpls = {
+               .ttl = 0,
+       };
        uint8_t *header;
        int ret;
 
@@ -6442,6 +6507,12 @@ flow_item_default_mask(const struct rte_flow_item *item)
        case RTE_FLOW_ITEM_TYPE_ESP:
                mask = &rte_flow_item_esp_mask;
                break;
+       case RTE_FLOW_ITEM_TYPE_AH:
+               mask = &rte_flow_item_ah_mask;
+               break;
+       case RTE_FLOW_ITEM_TYPE_PFCP:
+               mask = &rte_flow_item_pfcp_mask;
+               break;
        default:
                break;
        }
@@ -6539,6 +6610,16 @@ cmd_set_raw_parsed(const struct buffer *in)
                        size = sizeof(struct rte_flow_item_esp);
                        proto = 0x32;
                        break;
+               case RTE_FLOW_ITEM_TYPE_AH:
+                       size = sizeof(struct rte_flow_item_ah);
+                       proto = 0x33;
+                       break;
+               case RTE_FLOW_ITEM_TYPE_GTP:
+                       size = sizeof(struct rte_flow_item_gtp);
+                       break;
+               case RTE_FLOW_ITEM_TYPE_PFCP:
+                       size = sizeof(struct rte_flow_item_pfcp);
+                       break;
                default:
                        printf("Error - Not supported item\n");
                        *total_size = 0;