[PATCH v2 23/25] net/nfp: support IPv4 NVGRE decap flow action

[Chaoyong He]

Add the offload support of decap action of IPv4 NVGRE tunnel.

Signed-off-by: Chaoyong He <chaoyong...@corigine.com>
Reviewed-by: Niklas Söderlund <niklas.soderl...@corigine.com>
---
 doc/guides/nics/features/nfp.ini | 1 +
 drivers/net/nfp/nfp_flow.c       | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini
index 2acc809..6400a7c 100644
--- a/doc/guides/nics/features/nfp.ini
+++ b/doc/guides/nics/features/nfp.ini
@@ -43,6 +43,7 @@ vxlan                = Y
 [rte_flow actions]
 count                = Y
 drop                 = Y
+nvgre_decap          = Y
 nvgre_encap          = Y
 of_pop_vlan          = Y
 of_push_vlan         = Y
diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c
index 6f21c86..c577278 100644
--- a/drivers/net/nfp/nfp_flow.c
+++ b/drivers/net/nfp/nfp_flow.c
@@ -1609,7 +1609,7 @@ struct nfp_pre_tun_entry {
 }
 
 static int
-nfp_flow_merge_gre_key(__rte_unused struct nfp_app_fw_flower *app_fw_flower,
+nfp_flow_merge_gre_key(struct nfp_app_fw_flower *app_fw_flower,
                struct rte_flow *nfp_flow,
                char **mbuf_off,
                const struct rte_flow_item *item,
@@ -1617,6 +1617,7 @@ struct nfp_pre_tun_entry {
                bool is_mask,
                __rte_unused bool is_outer_layer)
 {
+       int ret = 0;
        rte_be32_t tun_key;
        const rte_be32_t *spec;
        const rte_be32_t *mask;
@@ -1646,6 +1647,8 @@ struct nfp_pre_tun_entry {
                tun4 = (struct nfp_flower_ipv4_gre_tun *)*mbuf_off;
                tun4->tun_key = tun_key;
                tun4->tun_flags = rte_cpu_to_be_16(NFP_FL_GRE_FLAG_KEY);
+               if (!is_mask)
+                       ret = nfp_tun_add_ipv4_off(app_fw_flower, 
tun4->ipv4.dst);
        }
 
 gre_key_end:
@@ -1655,7 +1658,7 @@ struct nfp_pre_tun_entry {
        else
                *mbuf_off += sizeof(struct nfp_flower_ipv4_gre_tun);
 
-       return 0;
+       return ret;
 }
 
 const rte_be32_t nfp_flow_item_gre_key = 0xffffffff;
@@ -3831,6 +3834,7 @@ struct nfp_pre_tun_entry {
                *num_of_actions = 1;
                break;
        case RTE_FLOW_ITEM_TYPE_GENEVE:
+       case RTE_FLOW_ITEM_TYPE_GRE:
                nfp_action->type = RTE_FLOW_ACTION_TYPE_RAW_DECAP;
                *pmd_actions = nfp_action;
                *num_of_actions = 1;
-- 
1.8.3.1