The new flow item allows PMD to offload IPv4 IHL field for matching,
if hardware supports that operation.

Signed-off-by: Gregory Etelson <getel...@nvidia.com>
---
 app/test-pmd/cmdline_flow.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 1c587bb7b8..c1c7b9a9f9 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -173,6 +173,7 @@ enum index {
        ITEM_VLAN_INNER_TYPE,
        ITEM_VLAN_HAS_MORE_VLAN,
        ITEM_IPV4,
+       ITEM_IPV4_VER_IHL,
        ITEM_IPV4_TOS,
        ITEM_IPV4_ID,
        ITEM_IPV4_FRAGMENT_OFFSET,
@@ -1071,6 +1072,7 @@ static const enum index item_vlan[] = {
 };
 
 static const enum index item_ipv4[] = {
+       ITEM_IPV4_VER_IHL,
        ITEM_IPV4_TOS,
        ITEM_IPV4_ID,
        ITEM_IPV4_FRAGMENT_OFFSET,
@@ -2567,6 +2569,13 @@ static const struct token token_list[] = {
                .next = NEXT(item_ipv4),
                .call = parse_vc,
        },
+       [ITEM_IPV4_VER_IHL] = {
+               .name = "version_ihl",
+               .help = "match header length",
+               .next = NEXT(item_ipv4, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY(struct rte_flow_item_ipv4,
+                                    hdr.version_ihl)),
+       },
        [ITEM_IPV4_TOS] = {
                .name = "tos",
                .help = "type of service",
@@ -8123,7 +8132,8 @@ update_fields(uint8_t *buf, struct rte_flow_item *item, 
uint16_t next_proto)
                break;
        case RTE_FLOW_ITEM_TYPE_IPV4:
                ipv4 = (struct rte_ipv4_hdr *)buf;
-               ipv4->version_ihl = 0x45;
+               if (!ipv4->version_ihl)
+                       ipv4->version_ihl = RTE_IPV4_VHL_DEF;
                if (next_proto && ipv4->next_proto_id == 0)
                        ipv4->next_proto_id = (uint8_t)next_proto;
                break;
-- 
2.31.1

Reply via email to