[PATCH v3 16/26] net/nfp: support IPv4 GENEVE decap flow action

[Chaoyong He]

Add the offload support of decap action for IPv4 GENEVE 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       | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini
index 2e215bb324..fe1cb971f1 100644
--- a/doc/guides/nics/features/nfp.ini
+++ b/doc/guides/nics/features/nfp.ini
@@ -46,6 +46,7 @@ of_pop_vlan          = Y
 of_push_vlan         = Y
 of_set_vlan_pcp      = Y
 of_set_vlan_vid      = Y
+raw_decap            = Y
 raw_encap            = Y
 port_id              = Y
 set_ipv4_dscp        = Y
diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c
index 50e5131f54..46a047cd7b 100644
--- a/drivers/net/nfp/nfp_flow.c
+++ b/drivers/net/nfp/nfp_flow.c
@@ -955,6 +955,9 @@ nfp_flow_key_layers_calculate_actions(const struct 
rte_flow_action actions[],
                case RTE_FLOW_ACTION_TYPE_VXLAN_DECAP:
                        PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_VXLAN_DECAP 
detected");
                        break;
+               case RTE_FLOW_ACTION_TYPE_RAW_DECAP:
+                       PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_RAW_DECAP 
detected");
+                       break;
                default:
                        PMD_DRV_LOG(ERR, "Action type %d not supported.", 
action->type);
                        return -ENOTSUP;
@@ -1426,7 +1429,7 @@ nfp_flow_merge_vxlan(struct nfp_app_fw_flower 
*app_fw_flower,
 }
 
 static int
-nfp_flow_merge_geneve(__rte_unused struct nfp_app_fw_flower *app_fw_flower,
+nfp_flow_merge_geneve(struct nfp_app_fw_flower *app_fw_flower,
                struct rte_flow *nfp_flow,
                char **mbuf_off,
                const struct rte_flow_item *item,
@@ -1434,6 +1437,7 @@ nfp_flow_merge_geneve(__rte_unused struct 
nfp_app_fw_flower *app_fw_flower,
                bool is_mask,
                __rte_unused bool is_outer_layer)
 {
+       int ret = 0;
        struct nfp_flower_ipv4_udp_tun *tun4;
        struct nfp_flower_ipv6_udp_tun *tun6;
        struct nfp_flower_meta_tci *meta_tci;
@@ -1464,6 +1468,8 @@ nfp_flow_merge_geneve(__rte_unused struct 
nfp_app_fw_flower *app_fw_flower,
                tun4 = (struct nfp_flower_ipv4_udp_tun *)*mbuf_off;
                tun4->tun_id = rte_cpu_to_be_32((geneve->vni[0] << 16) |
                                (geneve->vni[1] << 8) | (geneve->vni[2]));
+               if (!is_mask)
+                       ret = nfp_tun_add_ipv4_off(app_fw_flower, 
tun4->ipv4.dst);
        }
 
 geneve_end:
@@ -1474,7 +1480,7 @@ nfp_flow_merge_geneve(__rte_unused struct 
nfp_app_fw_flower *app_fw_flower,
                *mbuf_off += sizeof(struct nfp_flower_ipv4_udp_tun);
        }
 
-       return 0;
+       return ret;
 }
 
 /* Graph of supported items and associated process function */
@@ -3056,6 +3062,7 @@ nfp_flow_compile_action(struct nfp_flower_representor 
*representor,
                        nfp_flow->type = NFP_FLOW_ENCAP;
                        break;
                case RTE_FLOW_ACTION_TYPE_VXLAN_DECAP:
+               case RTE_FLOW_ACTION_TYPE_RAW_DECAP:
                        PMD_DRV_LOG(DEBUG, "process action tunnel decap");
                        ret = nfp_flow_action_tunnel_decap(representor, action,
                                        nfp_flow_meta, nfp_flow);
@@ -3546,6 +3553,11 @@ nfp_flow_tunnel_decap_set(__rte_unused struct 
rte_eth_dev *dev,
                *pmd_actions = nfp_action;
                *num_of_actions = 1;
                break;
+       case RTE_FLOW_ITEM_TYPE_GENEVE:
+               nfp_action->type = RTE_FLOW_ACTION_TYPE_RAW_DECAP;
+               *pmd_actions = nfp_action;
+               *num_of_actions = 1;
+               break;
        default:
                *pmd_actions = NULL;
                *num_of_actions = 0;
-- 
2.29.3