[PATCH 10/25] net/nfp: add the offload support of IPv6 VXLAN decap action

[Chaoyong He]

Add the offload support of decap action for IPv6 VXLAN tunnel.

Signed-off-by: Chaoyong He <chaoyong...@corigine.com>
Reviewed-by: Niklas Söderlund <niklas.soderl...@corigine.com>
---
 doc/guides/rel_notes/release_22_11.rst |  2 +-
 drivers/net/nfp/nfp_flow.c             | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/doc/guides/rel_notes/release_22_11.rst 
b/doc/guides/rel_notes/release_22_11.rst
index 351fb02..49e92cc 100644
--- a/doc/guides/rel_notes/release_22_11.rst
+++ b/doc/guides/rel_notes/release_22_11.rst
@@ -184,7 +184,7 @@ New Features
     * Set the port number
     * Set the TTL
     * Set the DSCP of IPv4 and IPv6
-    * Encap of VXLAN tunnel
+    * Encap and decap of VXLAN tunnel
 
 * **Updated NXP dpaa2 driver.**
 
diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c
index 0578679..e212e96 100644
--- a/drivers/net/nfp/nfp_flow.c
+++ b/drivers/net/nfp/nfp_flow.c
@@ -487,7 +487,7 @@ struct nfp_pre_tun_entry {
        return 0;
 }
 
-__rte_unused static int
+static int
 nfp_tun_add_ipv6_off(struct nfp_app_fw_flower *app_fw_flower,
                uint8_t ipv6[])
 {
@@ -1370,6 +1370,8 @@ struct nfp_pre_tun_entry {
                        NFP_FLOWER_LAYER2_TUN_IPV6)) {
                tun6 = (struct nfp_flower_ipv6_udp_tun *)*mbuf_off;
                tun6->tun_id = hdr->vx_vni;
+               if (!is_mask)
+                       ret = nfp_tun_add_ipv6_off(app_fw_flower, 
tun6->ipv6.ipv6_dst);
        } else {
                tun4 = (struct nfp_flower_ipv4_udp_tun *)*mbuf_off;
                tun4->tun_id = hdr->vx_vni;
@@ -2181,7 +2183,7 @@ struct nfp_pre_tun_entry {
        return nfp_flower_cmsg_tun_neigh_v6_rule(app_fw_flower, &payload);
 }
 
-__rte_unused static int
+static int
 nfp_flower_add_tun_neigh_v6_decap(struct nfp_app_fw_flower *app_fw_flower,
                struct rte_flow *nfp_flow)
 {
@@ -2595,7 +2597,7 @@ struct nfp_pre_tun_entry {
 
 static int
 nfp_flow_action_tunnel_decap(struct nfp_flower_representor *repr,
-               __rte_unused const struct rte_flow_action *action,
+               const struct rte_flow_action *action,
                struct nfp_fl_rule_metadata *nfp_flow_meta,
                struct rte_flow *nfp_flow)
 {
@@ -2613,6 +2615,8 @@ struct nfp_pre_tun_entry {
        nfp_mac_idx = (nfp_mac_idx << 8) |
                        NFP_FLOWER_CMSG_PORT_TYPE_OTHER_PORT |
                        NFP_TUN_PRE_TUN_IDX_BIT;
+       if (action->conf != NULL)
+               nfp_mac_idx |= NFP_TUN_PRE_TUN_IPV6_BIT;
 
        app_fw_flower = repr->app_fw_flower;
        ret = nfp_flower_cmsg_tun_mac_rule(app_fw_flower, &repr->mac_addr,
@@ -2633,7 +2637,7 @@ struct nfp_pre_tun_entry {
        if (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_IPV4)
                return nfp_flower_add_tun_neigh_v4_decap(app_fw_flower, 
nfp_flow);
        else
-               return -ENOTSUP;
+               return nfp_flower_add_tun_neigh_v6_decap(app_fw_flower, 
nfp_flow);
 }
 
 static int
@@ -2827,6 +2831,8 @@ struct nfp_pre_tun_entry {
                        }
                        nfp_flow->type = NFP_FLOW_DECAP;
                        nfp_flow->install_flag = false;
+                       if (action->conf != NULL)
+                               nfp_flow->tun.payload.v6_flag = 1;
                        break;
                default:
                        PMD_DRV_LOG(ERR, "Unsupported action type: %d", 
action->type);
@@ -3277,6 +3283,9 @@ struct nfp_pre_tun_entry {
                return -ENOMEM;
        }
 
+       if (tunnel->is_ipv6)
+               nfp_action->conf = (void *)~0;
+
        switch (tunnel->type) {
        case RTE_FLOW_ITEM_TYPE_VXLAN:
                nfp_action->type = RTE_FLOW_ACTION_TYPE_VXLAN_DECAP;
@@ -3304,6 +3313,7 @@ struct nfp_pre_tun_entry {
 
        for (i = 0; i < num_of_actions; i++) {
                nfp_action = &pmd_actions[i];
+               nfp_action->conf = NULL;
                rte_free(nfp_action);
        }
 
-- 
1.8.3.1