app/testpmd: add 6 types of L2TPv2 message

This patch adds L2TPv2 control message and 5 types of data message
support for testpmd.

The added L2TPv2 message types are listed below:
1. L2TPv2 control
2. L2TPv2
3. L2TPv2 + length option
4. L2TPv2 + sequence option
5. L2TPv2 + offset option
6. L2TPv2 + length option + sequence option

Signed-off-by: Jie Wang <jie1x.wang@intel.com>
Acked-by: Ori Kam <orika@nvidia.com>

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 7b56b1b0ff506f786630569bdaf05c6d1e2f0af3..e0c79d57a3950c66fb222bdeb750a5c540daa5ea 100644 (file)
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -323,13 +323,30 @@ enum index {
        ITEM_FLEX_ITEM_HANDLE,
        ITEM_FLEX_PATTERN_HANDLE,
        ITEM_L2TPV2,
-       ITEM_L2TPV2_COMMON,
-       ITEM_L2TPV2_COMMON_TYPE,
-       ITEM_L2TPV2_COMMON_TYPE_DATA_L,
-       ITEM_L2TPV2_COMMON_TYPE_CTRL,
+       ITEM_L2TPV2_TYPE,
+       ITEM_L2TPV2_TYPE_DATA,
+       ITEM_L2TPV2_TYPE_DATA_L,
+       ITEM_L2TPV2_TYPE_DATA_S,
+       ITEM_L2TPV2_TYPE_DATA_O,
+       ITEM_L2TPV2_TYPE_DATA_L_S,
+       ITEM_L2TPV2_TYPE_CTRL,
+       ITEM_L2TPV2_MSG_DATA_TUNNEL_ID,
+       ITEM_L2TPV2_MSG_DATA_SESSION_ID,
        ITEM_L2TPV2_MSG_DATA_L_LENGTH,
        ITEM_L2TPV2_MSG_DATA_L_TUNNEL_ID,
        ITEM_L2TPV2_MSG_DATA_L_SESSION_ID,
+       ITEM_L2TPV2_MSG_DATA_S_TUNNEL_ID,
+       ITEM_L2TPV2_MSG_DATA_S_SESSION_ID,
+       ITEM_L2TPV2_MSG_DATA_S_NS,
+       ITEM_L2TPV2_MSG_DATA_S_NR,
+       ITEM_L2TPV2_MSG_DATA_O_TUNNEL_ID,
+       ITEM_L2TPV2_MSG_DATA_O_SESSION_ID,
+       ITEM_L2TPV2_MSG_DATA_O_OFFSET,
+       ITEM_L2TPV2_MSG_DATA_L_S_LENGTH,
+       ITEM_L2TPV2_MSG_DATA_L_S_TUNNEL_ID,
+       ITEM_L2TPV2_MSG_DATA_L_S_SESSION_ID,
+       ITEM_L2TPV2_MSG_DATA_L_S_NS,
+       ITEM_L2TPV2_MSG_DATA_L_S_NR,
        ITEM_L2TPV2_MSG_CTRL_LENGTH,
        ITEM_L2TPV2_MSG_CTRL_TUNNEL_ID,
        ITEM_L2TPV2_MSG_CTRL_SESSION_ID,
@@ -1451,19 +1468,70 @@ static const enum index item_flex[] = {
 };
 
 static const enum index item_l2tpv2[] = {
-       ITEM_L2TPV2_COMMON,
+       ITEM_L2TPV2_TYPE,
        ITEM_NEXT,
        ZERO,
 };
 
-static const enum index item_l2tpv2_common[] = {
-       ITEM_L2TPV2_COMMON_TYPE,
+static const enum index item_l2tpv2_type[] = {
+       ITEM_L2TPV2_TYPE_DATA,
+       ITEM_L2TPV2_TYPE_DATA_L,
+       ITEM_L2TPV2_TYPE_DATA_S,
+       ITEM_L2TPV2_TYPE_DATA_O,
+       ITEM_L2TPV2_TYPE_DATA_L_S,
+       ITEM_L2TPV2_TYPE_CTRL,
        ZERO,
 };
 
-static const enum index item_l2tpv2_common_type[] = {
-       ITEM_L2TPV2_COMMON_TYPE_DATA_L,
-       ITEM_L2TPV2_COMMON_TYPE_CTRL,
+static const enum index item_l2tpv2_type_data[] = {
+       ITEM_L2TPV2_MSG_DATA_TUNNEL_ID,
+       ITEM_L2TPV2_MSG_DATA_SESSION_ID,
+       ITEM_NEXT,
+       ZERO,
+};
+
+static const enum index item_l2tpv2_type_data_l[] = {
+       ITEM_L2TPV2_MSG_DATA_L_LENGTH,
+       ITEM_L2TPV2_MSG_DATA_L_TUNNEL_ID,
+       ITEM_L2TPV2_MSG_DATA_L_SESSION_ID,
+       ITEM_NEXT,
+       ZERO,
+};
+
+static const enum index item_l2tpv2_type_data_s[] = {
+       ITEM_L2TPV2_MSG_DATA_S_TUNNEL_ID,
+       ITEM_L2TPV2_MSG_DATA_S_SESSION_ID,
+       ITEM_L2TPV2_MSG_DATA_S_NS,
+       ITEM_L2TPV2_MSG_DATA_S_NR,
+       ITEM_NEXT,
+       ZERO,
+};
+
+static const enum index item_l2tpv2_type_data_o[] = {
+       ITEM_L2TPV2_MSG_DATA_O_TUNNEL_ID,
+       ITEM_L2TPV2_MSG_DATA_O_SESSION_ID,
+       ITEM_L2TPV2_MSG_DATA_O_OFFSET,
+       ITEM_NEXT,
+       ZERO,
+};
+
+static const enum index item_l2tpv2_type_data_l_s[] = {
+       ITEM_L2TPV2_MSG_DATA_L_S_LENGTH,
+       ITEM_L2TPV2_MSG_DATA_L_S_TUNNEL_ID,
+       ITEM_L2TPV2_MSG_DATA_L_S_SESSION_ID,
+       ITEM_L2TPV2_MSG_DATA_L_S_NS,
+       ITEM_L2TPV2_MSG_DATA_L_S_NR,
+       ITEM_NEXT,
+       ZERO,
+};
+
+static const enum index item_l2tpv2_type_ctrl[] = {
+       ITEM_L2TPV2_MSG_CTRL_LENGTH,
+       ITEM_L2TPV2_MSG_CTRL_TUNNEL_ID,
+       ITEM_L2TPV2_MSG_CTRL_SESSION_ID,
+       ITEM_L2TPV2_MSG_CTRL_NS,
+       ITEM_L2TPV2_MSG_CTRL_NR,
+       ITEM_NEXT,
        ZERO,
 };
 
@@ -3858,31 +3926,46 @@ static const struct token token_list[] = {
                .next = NEXT(item_l2tpv2),
                .call = parse_vc,
        },
-       [ITEM_L2TPV2_COMMON] = {
-               .name = "common",
-               .help = "L2TPv2 common header",
-               .next = NEXT(item_l2tpv2_common),
-       },
-       [ITEM_L2TPV2_COMMON_TYPE] = {
+       [ITEM_L2TPV2_TYPE] = {
                .name = "type",
-               .help = "type of common header",
-               .next = NEXT(item_l2tpv2_common_type),
+               .help = "type of l2tpv2",
+               .next = NEXT(item_l2tpv2_type),
                .args = ARGS(ARG_ENTRY_HTON(struct rte_flow_item_l2tpv2)),
        },
-       [ITEM_L2TPV2_COMMON_TYPE_DATA_L] = {
+       [ITEM_L2TPV2_TYPE_DATA] = {
+               .name = "data",
+               .help = "Type #7: data message without any options",
+               .next = NEXT(item_l2tpv2_type_data),
+               .call = parse_vc_item_l2tpv2_type,
+       },
+       [ITEM_L2TPV2_MSG_DATA_TUNNEL_ID] = {
+               .name = "tunnel_id",
+               .help = "tunnel identifier",
+               .next = NEXT(item_l2tpv2_type_data,
+                            NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+                                            hdr.type7.tunnel_id)),
+       },
+       [ITEM_L2TPV2_MSG_DATA_SESSION_ID] = {
+               .name = "session_id",
+               .help = "session identifier",
+               .next = NEXT(item_l2tpv2_type_data,
+                            NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+                                            hdr.type7.session_id)),
+       },
+       [ITEM_L2TPV2_TYPE_DATA_L] = {
                .name = "data_l",
                .help = "Type #6: data message with length option",
-               .next = NEXT(NEXT_ENTRY(ITEM_L2TPV2_MSG_DATA_L_LENGTH,
-                                       ITEM_L2TPV2_MSG_DATA_L_TUNNEL_ID,
-                                       ITEM_L2TPV2_MSG_DATA_L_SESSION_ID,
-                                       ITEM_NEXT)),
+               .next = NEXT(item_l2tpv2_type_data_l),
                .call = parse_vc_item_l2tpv2_type,
        },
        [ITEM_L2TPV2_MSG_DATA_L_LENGTH] = {
                .name = "length",
                .help = "message length",
-               .next = NEXT(NEXT_ENTRY(ITEM_L2TPV2_MSG_DATA_L_LENGTH,
-                                       ITEM_L2TPV2_COMMON, ITEM_NEXT),
+               .next = NEXT(item_l2tpv2_type_data_l,
                             NEXT_ENTRY(COMMON_UNSIGNED),
                             item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
@@ -3891,8 +3974,7 @@ static const struct token token_list[] = {
        [ITEM_L2TPV2_MSG_DATA_L_TUNNEL_ID] = {
                .name = "tunnel_id",
                .help = "tunnel identifier",
-               .next = NEXT(NEXT_ENTRY(ITEM_L2TPV2_MSG_DATA_L_TUNNEL_ID,
-                                       ITEM_L2TPV2_COMMON, ITEM_NEXT),
+               .next = NEXT(item_l2tpv2_type_data_l,
                             NEXT_ENTRY(COMMON_UNSIGNED),
                             item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
@@ -3901,29 +3983,150 @@ static const struct token token_list[] = {
        [ITEM_L2TPV2_MSG_DATA_L_SESSION_ID] = {
                .name = "session_id",
                .help = "session identifier",
-               .next = NEXT(NEXT_ENTRY(ITEM_L2TPV2_MSG_DATA_L_SESSION_ID,
-                                       ITEM_L2TPV2_COMMON, ITEM_NEXT),
+               .next = NEXT(item_l2tpv2_type_data_l,
                             NEXT_ENTRY(COMMON_UNSIGNED),
                             item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
                                             hdr.type6.session_id)),
        },
-       [ITEM_L2TPV2_COMMON_TYPE_CTRL] = {
+       [ITEM_L2TPV2_TYPE_DATA_S] = {
+               .name = "data_s",
+               .help = "Type #5: data message with ns, nr option",
+               .next = NEXT(item_l2tpv2_type_data_s),
+               .call = parse_vc_item_l2tpv2_type,
+       },
+       [ITEM_L2TPV2_MSG_DATA_S_TUNNEL_ID] = {
+               .name = "tunnel_id",
+               .help = "tunnel identifier",
+               .next = NEXT(item_l2tpv2_type_data_s,
+                            NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+                                            hdr.type5.tunnel_id)),
+       },
+       [ITEM_L2TPV2_MSG_DATA_S_SESSION_ID] = {
+               .name = "session_id",
+               .help = "session identifier",
+               .next = NEXT(item_l2tpv2_type_data_s,
+                            NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+                                            hdr.type5.session_id)),
+       },
+       [ITEM_L2TPV2_MSG_DATA_S_NS] = {
+               .name = "ns",
+               .help = "sequence number for message",
+               .next = NEXT(item_l2tpv2_type_data_s,
+                            NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+                                            hdr.type5.ns)),
+       },
+       [ITEM_L2TPV2_MSG_DATA_S_NR] = {
+               .name = "nr",
+               .help = "sequence number for next receive message",
+               .next = NEXT(item_l2tpv2_type_data_s,
+                            NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+                                            hdr.type5.nr)),
+       },
+       [ITEM_L2TPV2_TYPE_DATA_O] = {
+               .name = "data_o",
+               .help = "Type #4: data message with offset option",
+               .next = NEXT(item_l2tpv2_type_data_o),
+               .call = parse_vc_item_l2tpv2_type,
+       },
+       [ITEM_L2TPV2_MSG_DATA_O_TUNNEL_ID] = {
+               .name = "tunnel_id",
+               .help = "tunnel identifier",
+               .next = NEXT(item_l2tpv2_type_data_o,
+                            NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+                                            hdr.type4.tunnel_id)),
+       },
+       [ITEM_L2TPV2_MSG_DATA_O_SESSION_ID] = {
+               .name = "session_id",
+               .help = "session identifier",
+               .next = NEXT(item_l2tpv2_type_data_o,
+                            NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+                                            hdr.type5.session_id)),
+       },
+       [ITEM_L2TPV2_MSG_DATA_O_OFFSET] = {
+               .name = "offset_size",
+               .help = "the size of offset padding",
+               .next = NEXT(item_l2tpv2_type_data_o,
+                            NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+                                            hdr.type4.offset_size)),
+       },
+       [ITEM_L2TPV2_TYPE_DATA_L_S] = {
+               .name = "data_l_s",
+               .help = "Type #3: data message contains length, ns, nr "
+                       "options",
+               .next = NEXT(item_l2tpv2_type_data_l_s),
+               .call = parse_vc_item_l2tpv2_type,
+       },
+       [ITEM_L2TPV2_MSG_DATA_L_S_LENGTH] = {
+               .name = "length",
+               .help = "message length",
+               .next = NEXT(item_l2tpv2_type_data_l_s,
+                            NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+                                            hdr.type3.length)),
+       },
+       [ITEM_L2TPV2_MSG_DATA_L_S_TUNNEL_ID] = {
+               .name = "tunnel_id",
+               .help = "tunnel identifier",
+               .next = NEXT(item_l2tpv2_type_data_l_s,
+                            NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+                                            hdr.type3.tunnel_id)),
+       },
+       [ITEM_L2TPV2_MSG_DATA_L_S_SESSION_ID] = {
+               .name = "session_id",
+               .help = "session identifier",
+               .next = NEXT(item_l2tpv2_type_data_l_s,
+                            NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+                                            hdr.type3.session_id)),
+       },
+       [ITEM_L2TPV2_MSG_DATA_L_S_NS] = {
+               .name = "ns",
+               .help = "sequence number for message",
+               .next = NEXT(item_l2tpv2_type_data_l_s,
+                            NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+                                            hdr.type3.ns)),
+       },
+       [ITEM_L2TPV2_MSG_DATA_L_S_NR] = {
+               .name = "nr",
+               .help = "sequence number for next receive message",
+               .next = NEXT(item_l2tpv2_type_data_l_s,
+                            NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+                                            hdr.type3.nr)),
+       },
+       [ITEM_L2TPV2_TYPE_CTRL] = {
                .name = "control",
-               .help = "Type #3: conrtol message contains length, ns, nr options",
-               .next = NEXT(NEXT_ENTRY(ITEM_L2TPV2_MSG_CTRL_LENGTH,
-                                       ITEM_L2TPV2_MSG_CTRL_TUNNEL_ID,
-                                       ITEM_L2TPV2_MSG_CTRL_SESSION_ID,
-                                       ITEM_L2TPV2_MSG_CTRL_NS,
-                                       ITEM_L2TPV2_MSG_CTRL_NR,
-                                       ITEM_NEXT)),
+               .help = "Type #3: conrtol message contains length, ns, nr "
+                       "options",
+               .next = NEXT(item_l2tpv2_type_ctrl),
                .call = parse_vc_item_l2tpv2_type,
        },
        [ITEM_L2TPV2_MSG_CTRL_LENGTH] = {
                .name = "length",
                .help = "message length",
-               .next = NEXT(NEXT_ENTRY(ITEM_L2TPV2_MSG_CTRL_LENGTH,
-                                       ITEM_L2TPV2_COMMON, ITEM_NEXT),
+               .next = NEXT(item_l2tpv2_type_ctrl,
                             NEXT_ENTRY(COMMON_UNSIGNED),
                             item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
@@ -3932,8 +4135,7 @@ static const struct token token_list[] = {
        [ITEM_L2TPV2_MSG_CTRL_TUNNEL_ID] = {
                .name = "tunnel_id",
                .help = "tunnel identifier",
-               .next = NEXT(NEXT_ENTRY(ITEM_L2TPV2_MSG_CTRL_TUNNEL_ID,
-                                       ITEM_L2TPV2_COMMON, ITEM_NEXT),
+               .next = NEXT(item_l2tpv2_type_ctrl,
                             NEXT_ENTRY(COMMON_UNSIGNED),
                             item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
@@ -3942,8 +4144,7 @@ static const struct token token_list[] = {
        [ITEM_L2TPV2_MSG_CTRL_SESSION_ID] = {
                .name = "session_id",
                .help = "session identifier",
-               .next = NEXT(NEXT_ENTRY(ITEM_L2TPV2_MSG_CTRL_SESSION_ID,
-                                       ITEM_L2TPV2_COMMON, ITEM_NEXT),
+               .next = NEXT(item_l2tpv2_type_ctrl,
                             NEXT_ENTRY(COMMON_UNSIGNED),
                             item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
@@ -3952,8 +4153,7 @@ static const struct token token_list[] = {
        [ITEM_L2TPV2_MSG_CTRL_NS] = {
                .name = "ns",
                .help = "sequence number for message",
-               .next = NEXT(NEXT_ENTRY(ITEM_L2TPV2_MSG_CTRL_NS,
-                                       ITEM_L2TPV2_COMMON, ITEM_NEXT),
+               .next = NEXT(item_l2tpv2_type_ctrl,
                             NEXT_ENTRY(COMMON_UNSIGNED),
                             item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
@@ -3962,8 +4162,7 @@ static const struct token token_list[] = {
        [ITEM_L2TPV2_MSG_CTRL_NR] = {
                .name = "nr",
                .help = "sequence number for next receive message",
-               .next = NEXT(NEXT_ENTRY(ITEM_L2TPV2_MSG_CTRL_NS,
-                                       ITEM_L2TPV2_COMMON, ITEM_NEXT),
+               .next = NEXT(item_l2tpv2_type_ctrl,
                             NEXT_ENTRY(COMMON_UNSIGNED),
                             item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
@@ -5904,11 +6103,23 @@ parse_vc_item_l2tpv2_type(struct context *ctx, const struct token *token,
        if (parse_default(ctx, token, str, len, NULL, 0) < 0)
                return -1;
        switch (ctx->curr) {
-       case ITEM_L2TPV2_COMMON_TYPE_DATA_L:
-               msg_type |= 0x4000;
+       case ITEM_L2TPV2_TYPE_DATA:
+               msg_type |= RTE_L2TPV2_MSG_TYPE_DATA;
+               break;
+       case ITEM_L2TPV2_TYPE_DATA_L:
+               msg_type |= RTE_L2TPV2_MSG_TYPE_DATA_L;
+               break;
+       case ITEM_L2TPV2_TYPE_DATA_S:
+               msg_type |= RTE_L2TPV2_MSG_TYPE_DATA_S;
+               break;
+       case ITEM_L2TPV2_TYPE_DATA_O:
+               msg_type |= RTE_L2TPV2_MSG_TYPE_DATA_O;
+               break;
+       case ITEM_L2TPV2_TYPE_DATA_L_S:
+               msg_type |= RTE_L2TPV2_MSG_TYPE_DATA_L_S;
                break;
-       case ITEM_L2TPV2_COMMON_TYPE_CTRL:
-               msg_type |= 0xC800;
+       case ITEM_L2TPV2_TYPE_CTRL:
+               msg_type |= RTE_L2TPV2_MSG_TYPE_CONTROL;
                break;
        default:
                return -1;

diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index f8adcb0a409e7236effe2d26a43907414536a7d4..f6884ea088945c0644c0c1b620659e09c1f4b32d 100644 (file)
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -3857,6 +3857,7 @@ This section lists supported pattern items and their attributes, if any.
   - ``session_id {unsigned}``: L2TPv2 session identifier.
   - ``ns {unsigned}``: L2TPv2 option ns.
   - ``nr {unsigned}``: L2TPv2 option nr.
+  - ``offset_size {unsigned}``: L2TPv2 option offset.
 
 - ``ppp``: match PPP header.
 
@@ -5090,19 +5091,45 @@ The meter policy action list: ``green -> green, yellow -> yellow, red -> red``.
    testpmd> create port meter 0 1 13 1 yes 0xffff 0 0
    testpmd> flow create 0 priority 0 ingress group 1 pattern eth / end actions meter mtr_id 1 / end
 
-Sample PPPoL2TPv2oUDP RSS rules
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Sample L2TPv2 RSS rules
+~~~~~~~~~~~~~~~~~~~~~~~
 
-PPPoL2TPv2oUDP RSS rules can be created by the following commands::
+L2TPv2 RSS rules can be created by the following commands::
+
+   testpmd> flow create 0 ingress pattern eth / ipv4 / udp / l2tpv2 type control
+            / end actions rss types l2tpv2 end queues end / end
+   testpmd> flow create 0 ingress pattern eth / ipv4 / udp / l2tpv2 / end
+            actions rss types eth l2-src-only end queues end / end
+   testpmd> flow create 0 ingress pattern eth / ipv4 / udp / l2tpv2 / ppp / end
+            actions rss types l2tpv2 end queues end / end
+   testpmd> flow create 0 ingress pattern eth / ipv4 / udp / l2tpv2 / ppp / ipv4
+            / end actions rss types ipv4 end queues end / end
+   testpmd> flow create 0 ingress pattern eth / ipv4 / udp / l2tpv2 / ppp / ipv6
+            / udp / end actions rss types ipv6-udp end queues end / end
+   testpmd> flow create 0 ingress pattern eth / ipv6 / udp / l2tpv2 / ppp / ipv4
+            / tcp / end actions rss types ipv4-tcp end queues end / end
+   testpmd> flow create 0 ingress pattern eth / ipv6 / udp / l2tpv2 / ppp / ipv6
+            / end actions rss types ipv6 end queues end / end
+
+Sample L2TPv2 FDIR rules
+~~~~~~~~~~~~~~~~~~~~~~~~
 
- testpmd> flow create 0 ingress pattern eth / ipv4 / udp / l2tpv2 / ppp / ipv4
-          / end actions rss types ipv4 end queues end / end
- testpmd> flow create 0 ingress pattern eth / ipv4 / udp / l2tpv2 / ppp / ipv6
-          / udp / end actions rss types ipv6-udp end queues end / end
- testpmd> flow create 0 ingress pattern eth / ipv6 / udp / l2tpv2 / ppp / ipv4
-          / tcp / end actions rss types ipv4-tcp end queues end / end
- testpmd> flow create 0 ingress pattern eth / ipv6 / udp / l2tpv2 / ppp / ipv6
-          / end actions rss types ipv6 end queues end / end
+L2TPv2 FDIR rules can be created by the following commands::
+
+   testpmd> flow create 0 ingress pattern eth / ipv4 / udp / l2tpv2 type control
+            session_id is 0x1111 / end actions queue index 3 / end
+   testpmd> flow create 0 ingress pattern eth src is 00:00:00:00:00:01 / ipv4
+            / udp / l2tpv2 type data / end actions queue index 3 / end
+   testpmd> flow create 0 ingress pattern eth / ipv4 / udp / l2tpv2 type data
+            session_id is 0x1111 / ppp / end actions queue index 3 / end
+   testpmd> flow create 0 ingress pattern eth / ipv4 / udp / l2tpv2 / ppp / ipv4
+            src is 10.0.0.1 / end actions queue index 3 / end
+   testpmd> flow create 0 ingress pattern eth / ipv6 / udp / l2tpv2 / ppp / ipv6
+            dst is ABAB:910B:6666:3457:8295:3333:1800:2929 / end actions queue index 3 / end
+   testpmd> flow create 0 ingress pattern eth / ipv4 / udp / l2tpv2 / ppp / ipv4
+            / udp src is 22 / end actions queue index 3 / end
+   testpmd> flow create 0 ingress pattern eth / ipv4 / udp / l2tpv2 / ppp / ipv4
+            / tcp dst is 23 / end actions queue index 3 / end
 
 Sample RAW rule
 ~~~~~~~~~~~~~~~

diff --git a/lib/net/rte_l2tpv2.h b/lib/net/rte_l2tpv2.h
index 1f3ad3f03cf3b42825359935e85bf2b0764e93cb..d41123a504051fc5d3eb51aebb64edeaac6de87f 100644 (file)
--- a/lib/net/rte_l2tpv2.h
+++ b/lib/net/rte_l2tpv2.h
@@ -78,6 +78,19 @@
 extern "C" {
 #endif
 
+/*
+ * L2TPv2 Message Type
+ */
+#define RTE_L2TPV2_MSG_TYPE_CONTROL    0xC802
+#define RTE_L2TPV2_MSG_TYPE_DATA       0x0002
+#define RTE_L2TPV2_MSG_TYPE_DATA_L     0x4002
+#define RTE_L2TPV2_MSG_TYPE_DATA_S     0x0802
+#define RTE_L2TPV2_MSG_TYPE_DATA_O     0x0202
+#define RTE_L2TPV2_MSG_TYPE_DATA_L_S   0x4802
+#define RTE_L2TPV2_MSG_TYPE_DATA_L_O   0x4202
+#define RTE_L2TPV2_MSG_TYPE_DATA_S_O   0x0A02
+#define RTE_L2TPV2_MSG_TYPE_DATA_L_S_O 0x4A02
+
 /**
  * L2TPv2 Common Header
  */