test/bonding: fix LSC related cases

[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 cdaabcc..b26b8bf 100644 (file)
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -199,6 +199,10 @@ enum index {
        ITEM_GTP_PSC,
        ITEM_GTP_PSC_QFI,
        ITEM_GTP_PSC_PDU_T,
+       ITEM_PPPOES,
+       ITEM_PPPOED,
+       ITEM_PPPOE_SEID,
+       ITEM_PPPOE_PROTO_ID,
 
        /* Validate/create actions. */
        ACTIONS,
@@ -223,6 +227,7 @@ enum index {
        ACTION_RSS_FUNC_DEFAULT,
        ACTION_RSS_FUNC_TOEPLITZ,
        ACTION_RSS_FUNC_SIMPLE_XOR,
+       ACTION_RSS_FUNC_SYMMETRIC_TOEPLITZ,
        ACTION_RSS_TYPES,
        ACTION_RSS_TYPE,
        ACTION_RSS_KEY,
@@ -667,6 +672,9 @@ static const enum index next_item[] = {
        ITEM_META,
        ITEM_GRE_KEY,
        ITEM_GTP_PSC,
+       ITEM_PPPOES,
+       ITEM_PPPOED,
+       ITEM_PPPOE_PROTO_ID,
        END_SET,
        ZERO,
 };
@@ -913,6 +921,24 @@ static const enum index item_gtp_psc[] = {
        ZERO,
 };
 
+static const enum index item_pppoed[] = {
+       ITEM_PPPOE_SEID,
+       ITEM_NEXT,
+       ZERO,
+};
+
+static const enum index item_pppoes[] = {
+       ITEM_PPPOE_SEID,
+       ITEM_NEXT,
+       ZERO,
+};
+
+static const enum index item_pppoe_proto_id[] = {
+       ITEM_PPPOE_PROTO_ID,
+       ITEM_NEXT,
+       ZERO,
+};
+
 static const enum index next_action[] = {
        ACTION_END,
        ACTION_VOID,
@@ -2364,7 +2390,35 @@ static const struct token token_list[] = {
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_gtp_psc,
                                        pdu_type)),
        },
-
+       [ITEM_PPPOES] = {
+               .name = "pppoes",
+               .help = "match PPPoE session header",
+               .priv = PRIV_ITEM(PPPOES, sizeof(struct rte_flow_item_pppoe)),
+               .next = NEXT(item_pppoes),
+               .call = parse_vc,
+       },
+       [ITEM_PPPOED] = {
+               .name = "pppoed",
+               .help = "match PPPoE discovery header",
+               .priv = PRIV_ITEM(PPPOED, sizeof(struct rte_flow_item_pppoe)),
+               .next = NEXT(item_pppoed),
+               .call = parse_vc,
+       },
+       [ITEM_PPPOE_SEID] = {
+               .name = "seid",
+               .help = "session identifier",
+               .next = NEXT(item_pppoes, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_pppoe,
+                                       session_id)),
+       },
+       [ITEM_PPPOE_PROTO_ID] = {
+               .name = "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),
+               .call = parse_vc,
+       },
        /* Validate/create actions. */
        [ACTIONS] = {
                .name = "actions",
@@ -2490,7 +2544,8 @@ static const struct token token_list[] = {
                .next = NEXT(action_rss,
                             NEXT_ENTRY(ACTION_RSS_FUNC_DEFAULT,
                                        ACTION_RSS_FUNC_TOEPLITZ,
-                                       ACTION_RSS_FUNC_SIMPLE_XOR)),
+                                       ACTION_RSS_FUNC_SIMPLE_XOR,
+                                       ACTION_RSS_FUNC_SYMMETRIC_TOEPLITZ)),
        },
        [ACTION_RSS_FUNC_DEFAULT] = {
                .name = "default",
@@ -2507,6 +2562,11 @@ static const struct token token_list[] = {
                .help = "simple XOR hash function",
                .call = parse_vc_action_rss_func,
        },
+       [ACTION_RSS_FUNC_SYMMETRIC_TOEPLITZ] = {
+               .name = "symmetric_toeplitz",
+               .help = "Symmetric Toeplitz hash function",
+               .call = parse_vc_action_rss_func,
+       },
        [ACTION_RSS_LEVEL] = {
                .name = "level",
                .help = "encapsulation level for \"types\"",
@@ -3625,6 +3685,9 @@ parse_vc_action_rss_func(struct context *ctx, const struct token *token,
        case ACTION_RSS_FUNC_SIMPLE_XOR:
                func = RTE_ETH_HASH_FUNCTION_SIMPLE_XOR;
                break;
+       case ACTION_RSS_FUNC_SYMMETRIC_TOEPLITZ:
+               func = RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ;
+               break;
        default:
                return -1;
        }
@@ -5796,6 +5859,8 @@ flow_item_default_mask(const struct rte_flow_item *item)
        case RTE_FLOW_ITEM_TYPE_GTP_PSC:
                mask = &rte_flow_item_gtp_psc_mask;
                break;
+       case RTE_FLOW_ITEM_TYPE_PPPOE_PROTO_ID:
+               mask = &rte_flow_item_pppoe_proto_id_mask;
        default:
                break;
        }