app/testpmd: add protocol fields to flow command

This commit exposes the following item fields through the flow command:

- VLAN priority code point, drop eligible indicator and VLAN identifier
  (all part of TCI).
- IPv4 type of service, time to live and protocol.
- IPv6 traffic class, flow label, next header and hop limit.
- SCTP tag and checksum.

Signed-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index db680c6..7760c2d 100644 (file)
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -126,10 +126,20 @@ enum index {
        ITEM_VLAN,
        ITEM_VLAN_TPID,
        ITEM_VLAN_TCI,
+       ITEM_VLAN_PCP,
+       ITEM_VLAN_DEI,
+       ITEM_VLAN_VID,
        ITEM_IPV4,
+       ITEM_IPV4_TOS,
+       ITEM_IPV4_TTL,
+       ITEM_IPV4_PROTO,
        ITEM_IPV4_SRC,
        ITEM_IPV4_DST,
        ITEM_IPV6,
+       ITEM_IPV6_TC,
+       ITEM_IPV6_FLOW,
+       ITEM_IPV6_PROTO,
+       ITEM_IPV6_HOP,
        ITEM_IPV6_SRC,
        ITEM_IPV6_DST,
        ITEM_ICMP,
@@ -144,6 +154,8 @@ enum index {
        ITEM_SCTP,
        ITEM_SCTP_SRC,
        ITEM_SCTP_DST,
+       ITEM_SCTP_TAG,
+       ITEM_SCTP_CKSUM,
        ITEM_VXLAN,
        ITEM_VXLAN_VNI,
 
@@ -281,6 +293,23 @@ struct token {
                .mask = (const void *)&(const s){ .f = (1 << (b)) - 1 }, \
        })
 
+/** Static initializer for ARGS() to target an arbitrary bit-mask. */
+#define ARGS_ENTRY_MASK(s, f, m) \
+       (&(const struct arg){ \
+               .offset = offsetof(s, f), \
+               .size = sizeof(((s *)0)->f), \
+               .mask = (const void *)(m), \
+       })
+
+/** Same as ARGS_ENTRY_MASK() using network byte ordering for the value. */
+#define ARGS_ENTRY_MASK_HTON(s, f, m) \
+       (&(const struct arg){ \
+               .hton = 1, \
+               .offset = offsetof(s, f), \
+               .size = sizeof(((s *)0)->f), \
+               .mask = (const void *)(m), \
+       })
+
 /** Static initializer for ARGS() to target a pointer. */
 #define ARGS_ENTRY_PTR(s, f) \
        (&(const struct arg){ \
@@ -444,11 +473,17 @@ static const enum index item_eth[] = {
 static const enum index item_vlan[] = {
        ITEM_VLAN_TPID,
        ITEM_VLAN_TCI,
+       ITEM_VLAN_PCP,
+       ITEM_VLAN_DEI,
+       ITEM_VLAN_VID,
        ITEM_NEXT,
        ZERO,
 };
 
 static const enum index item_ipv4[] = {
+       ITEM_IPV4_TOS,
+       ITEM_IPV4_TTL,
+       ITEM_IPV4_PROTO,
        ITEM_IPV4_SRC,
        ITEM_IPV4_DST,
        ITEM_NEXT,
@@ -456,6 +491,10 @@ static const enum index item_ipv4[] = {
 };
 
 static const enum index item_ipv6[] = {
+       ITEM_IPV6_TC,
+       ITEM_IPV6_FLOW,
+       ITEM_IPV6_PROTO,
+       ITEM_IPV6_HOP,
        ITEM_IPV6_SRC,
        ITEM_IPV6_DST,
        ITEM_NEXT,
@@ -486,6 +525,8 @@ static const enum index item_tcp[] = {
 static const enum index item_sctp[] = {
        ITEM_SCTP_SRC,
        ITEM_SCTP_DST,
+       ITEM_SCTP_TAG,
+       ITEM_SCTP_CKSUM,
        ITEM_NEXT,
        ZERO,
 };
@@ -1012,6 +1053,27 @@ static const struct token token_list[] = {
                .next = NEXT(item_vlan, NEXT_ENTRY(UNSIGNED), item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_vlan, tci)),
        },
+       [ITEM_VLAN_PCP] = {
+               .name = "pcp",
+               .help = "priority code point",
+               .next = NEXT(item_vlan, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_MASK_HTON(struct rte_flow_item_vlan,
+                                                 tci, "\xe0\x00")),
+       },
+       [ITEM_VLAN_DEI] = {
+               .name = "dei",
+               .help = "drop eligible indicator",
+               .next = NEXT(item_vlan, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_MASK_HTON(struct rte_flow_item_vlan,
+                                                 tci, "\x10\x00")),
+       },
+       [ITEM_VLAN_VID] = {
+               .name = "vid",
+               .help = "VLAN identifier",
+               .next = NEXT(item_vlan, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_MASK_HTON(struct rte_flow_item_vlan,
+                                                 tci, "\x0f\xff")),
+       },
        [ITEM_IPV4] = {
                .name = "ipv4",
                .help = "match IPv4 header",
@@ -1019,6 +1081,27 @@ static const struct token token_list[] = {
                .next = NEXT(item_ipv4),
                .call = parse_vc,
        },
+       [ITEM_IPV4_TOS] = {
+               .name = "tos",
+               .help = "type of service",
+               .next = NEXT(item_ipv4, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ipv4,
+                                            hdr.type_of_service)),
+       },
+       [ITEM_IPV4_TTL] = {
+               .name = "ttl",
+               .help = "time to live",
+               .next = NEXT(item_ipv4, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ipv4,
+                                            hdr.time_to_live)),
+       },
+       [ITEM_IPV4_PROTO] = {
+               .name = "proto",
+               .help = "next protocol ID",
+               .next = NEXT(item_ipv4, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ipv4,
+                                            hdr.next_proto_id)),
+       },
        [ITEM_IPV4_SRC] = {
                .name = "src",
                .help = "source address",
@@ -1040,6 +1123,36 @@ static const struct token token_list[] = {
                .next = NEXT(item_ipv6),
                .call = parse_vc,
        },
+       [ITEM_IPV6_TC] = {
+               .name = "tc",
+               .help = "traffic class",
+               .next = NEXT(item_ipv6, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_MASK_HTON(struct rte_flow_item_ipv6,
+                                                 hdr.vtc_flow,
+                                                 "\x0f\xf0\x00\x00")),
+       },
+       [ITEM_IPV6_FLOW] = {
+               .name = "flow",
+               .help = "flow label",
+               .next = NEXT(item_ipv6, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_MASK_HTON(struct rte_flow_item_ipv6,
+                                                 hdr.vtc_flow,
+                                                 "\x00\x0f\xff\xff")),
+       },
+       [ITEM_IPV6_PROTO] = {
+               .name = "proto",
+               .help = "protocol (next header)",
+               .next = NEXT(item_ipv6, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ipv6,
+                                            hdr.proto)),
+       },
+       [ITEM_IPV6_HOP] = {
+               .name = "hop",
+               .help = "hop limit",
+               .next = NEXT(item_ipv6, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ipv6,
+                                            hdr.hop_limits)),
+       },
        [ITEM_IPV6_SRC] = {
                .name = "src",
                .help = "source address",
@@ -1138,6 +1251,20 @@ static const struct token token_list[] = {
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_sctp,
                                             hdr.dst_port)),
        },
+       [ITEM_SCTP_TAG] = {
+               .name = "tag",
+               .help = "validation tag",
+               .next = NEXT(item_sctp, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_sctp,
+                                            hdr.tag)),
+       },
+       [ITEM_SCTP_CKSUM] = {
+               .name = "cksum",
+               .help = "checksum",
+               .next = NEXT(item_sctp, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_sctp,
+                                            hdr.cksum)),
+       },
        [ITEM_VXLAN] = {
                .name = "vxlan",
                .help = "match VXLAN header",

diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 03b6fa9..cacdef1 100644 (file)
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -2333,14 +2333,24 @@ This section lists supported pattern items and their attributes, if any.
 
   - ``tpid {unsigned}``: tag protocol identifier.
   - ``tci {unsigned}``: tag control information.
+  - ``pcp {unsigned}``: priority code point.
+  - ``dei {unsigned}``: drop eligible indicator.
+  - ``vid {unsigned}``: VLAN identifier.
 
 - ``ipv4``: match IPv4 header.
 
+  - ``tos {unsigned}``: type of service.
+  - ``ttl {unsigned}``: time to live.
+  - ``proto {unsigned}``: next protocol ID.
   - ``src {ipv4 address}``: source address.
   - ``dst {ipv4 address}``: destination address.
 
 - ``ipv6``: match IPv6 header.
 
+  - ``tc {unsigned}``: traffic class.
+  - ``flow {unsigned}``: flow label.
+  - ``proto {unsigned}``: protocol (next header).
+  - ``hop {unsigned}``: hop limit.
   - ``src {ipv6 address}``: source address.
   - ``dst {ipv6 address}``: destination address.
 
@@ -2363,6 +2373,8 @@ This section lists supported pattern items and their attributes, if any.
 
   - ``src {unsigned}``: SCTP source port.
   - ``dst {unsigned}``: SCTP destination port.
+  - ``tag {unsigned}``: validation tag.
+  - ``cksum {unsigned}``: checksum.
 
 - ``vxlan``: match VXLAN header.