net/bnxt: support tunneling

Add support for udp_tunnel_port_add/del dev_ops to configure a UDP port
for VXLAN and Geneve Tunnel protocols.

The HWRM supports only one global destination port for a tunnel type,
use a reference counter to keep track of its usage.
Cache the configured VXLAN/Geneve ports and use that value to check
if the right UDP port is being freed up.
Skip calling bnxt_hwrm_tunnel_dst_port_alloc if the same UDP port is
being programmed.
Skip calling bnxt_hwrm_tunnel_dst_port_free if no UDP port has been
configured.

Also update tx offload capabilities

Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 0c59c66..3bc3f99 100644 (file)
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -188,6 +188,12 @@ struct bnxt {
        struct bnxt_pf_info             pf;
        uint8_t                 port_partition_type;
        uint8_t                 dev_stopped;
+       uint8_t                 vxlan_port_cnt;
+       uint8_t                 geneve_port_cnt;
+       uint16_t                vxlan_port;
+       uint16_t                geneve_port;
+       uint16_t                vxlan_fw_dst_port_id;
+       uint16_t                geneve_fw_dst_port_id;
        uint32_t                fw_ver;
 };
 

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 8574696..121c29e 100644 (file)
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -363,7 +363,12 @@ static void bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
        dev_info->tx_offload_capa = DEV_TX_OFFLOAD_IPV4_CKSUM |
                                        DEV_TX_OFFLOAD_TCP_CKSUM |
                                        DEV_TX_OFFLOAD_UDP_CKSUM |
-                                       DEV_TX_OFFLOAD_TCP_TSO;
+                                       DEV_TX_OFFLOAD_TCP_TSO |
+                                       DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM |
+                                       DEV_TX_OFFLOAD_VXLAN_TNL_TSO |
+                                       DEV_TX_OFFLOAD_GRE_TNL_TSO |
+                                       DEV_TX_OFFLOAD_IPIP_TNL_TSO |
+                                       DEV_TX_OFFLOAD_GENEVE_TNL_TSO;
 
        /* *INDENT-OFF* */
        dev_info->default_rxconf = (struct rte_eth_rxconf) {
@@ -975,6 +980,116 @@ static int bnxt_flow_ctrl_set_op(struct rte_eth_dev *dev,
        return bnxt_set_hwrm_link_config(bp, true);
 }
 
+/* Add UDP tunneling port */
+static int
+bnxt_udp_tunnel_port_add_op(struct rte_eth_dev *eth_dev,
+                        struct rte_eth_udp_tunnel *udp_tunnel)
+{
+       struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
+       uint16_t tunnel_type = 0;
+       int rc = 0;
+
+       switch (udp_tunnel->prot_type) {
+       case RTE_TUNNEL_TYPE_VXLAN:
+               if (bp->vxlan_port_cnt) {
+                       RTE_LOG(ERR, PMD, "Tunnel Port %d already programmed\n",
+                               udp_tunnel->udp_port);
+                       if (bp->vxlan_port != udp_tunnel->udp_port) {
+                               RTE_LOG(ERR, PMD, "Only one port allowed\n");
+                               return -ENOSPC;
+                       }
+                       bp->vxlan_port_cnt++;
+                       return 0;
+               }
+               tunnel_type =
+                       HWRM_TUNNEL_DST_PORT_ALLOC_INPUT_TUNNEL_TYPE_VXLAN;
+               bp->vxlan_port_cnt++;
+               break;
+       case RTE_TUNNEL_TYPE_GENEVE:
+               if (bp->geneve_port_cnt) {
+                       RTE_LOG(ERR, PMD, "Tunnel Port %d already programmed\n",
+                               udp_tunnel->udp_port);
+                       if (bp->geneve_port != udp_tunnel->udp_port) {
+                               RTE_LOG(ERR, PMD, "Only one port allowed\n");
+                               return -ENOSPC;
+                       }
+                       bp->geneve_port_cnt++;
+                       return 0;
+               }
+               tunnel_type =
+                       HWRM_TUNNEL_DST_PORT_ALLOC_INPUT_TUNNEL_TYPE_GENEVE;
+               bp->geneve_port_cnt++;
+               break;
+       default:
+               RTE_LOG(ERR, PMD, "Tunnel type is not supported\n");
+               return -ENOTSUP;
+       }
+       rc = bnxt_hwrm_tunnel_dst_port_alloc(bp, udp_tunnel->udp_port,
+                                            tunnel_type);
+       return rc;
+}
+
+static int
+bnxt_udp_tunnel_port_del_op(struct rte_eth_dev *eth_dev,
+                        struct rte_eth_udp_tunnel *udp_tunnel)
+{
+       struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
+       uint16_t tunnel_type = 0;
+       uint16_t port = 0;
+       int rc = 0;
+
+       switch (udp_tunnel->prot_type) {
+       case RTE_TUNNEL_TYPE_VXLAN:
+               if (!bp->vxlan_port_cnt) {
+                       RTE_LOG(ERR, PMD, "No Tunnel port configured yet\n");
+                       return -EINVAL;
+               }
+               if (bp->vxlan_port != udp_tunnel->udp_port) {
+                       RTE_LOG(ERR, PMD, "Req Port: %d. Configured port: %d\n",
+                               udp_tunnel->udp_port, bp->vxlan_port);
+                       return -EINVAL;
+               }
+               if (--bp->vxlan_port_cnt)
+                       return 0;
+
+               tunnel_type =
+                       HWRM_TUNNEL_DST_PORT_FREE_INPUT_TUNNEL_TYPE_VXLAN;
+               port = bp->vxlan_fw_dst_port_id;
+               break;
+       case RTE_TUNNEL_TYPE_GENEVE:
+               if (!bp->geneve_port_cnt) {
+                       RTE_LOG(ERR, PMD, "No Tunnel port configured yet\n");
+                       return -EINVAL;
+               }
+               if (bp->geneve_port != udp_tunnel->udp_port) {
+                       RTE_LOG(ERR, PMD, "Req Port: %d. Configured port: %d\n",
+                               udp_tunnel->udp_port, bp->geneve_port);
+                       return -EINVAL;
+               }
+               if (--bp->geneve_port_cnt)
+                       return 0;
+
+               tunnel_type =
+                       HWRM_TUNNEL_DST_PORT_FREE_INPUT_TUNNEL_TYPE_GENEVE;
+               port = bp->geneve_fw_dst_port_id;
+               break;
+       default:
+               RTE_LOG(ERR, PMD, "Tunnel type is not supported\n");
+               return -ENOTSUP;
+       }
+
+       rc = bnxt_hwrm_tunnel_dst_port_free(bp, port, tunnel_type);
+       if (!rc) {
+               if (tunnel_type ==
+                   HWRM_TUNNEL_DST_PORT_FREE_INPUT_TUNNEL_TYPE_VXLAN)
+                       bp->vxlan_port = 0;
+               if (tunnel_type ==
+                   HWRM_TUNNEL_DST_PORT_FREE_INPUT_TUNNEL_TYPE_GENEVE)
+                       bp->geneve_port = 0;
+       }
+       return rc;
+}
+
 /*
  * Initialization
  */
@@ -1006,6 +1121,8 @@ static const struct eth_dev_ops bnxt_dev_ops = {
        .mac_addr_remove = bnxt_mac_addr_remove_op,
        .flow_ctrl_get = bnxt_flow_ctrl_get_op,
        .flow_ctrl_set = bnxt_flow_ctrl_set_op,
+       .udp_tunnel_port_add  = bnxt_udp_tunnel_port_add_op,
+       .udp_tunnel_port_del  = bnxt_udp_tunnel_port_del_op,
 };
 
 static bool bnxt_vf_pciid(uint16_t id)

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 3c2f148..dab4171 100644 (file)
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -1426,6 +1426,18 @@ int bnxt_set_hwrm_vnic_filters(struct bnxt *bp, struct bnxt_vnic_info *vnic)
        return rc;
 }
 
+void bnxt_free_tunnel_ports(struct bnxt *bp)
+{
+       if (bp->vxlan_port_cnt)
+               bnxt_hwrm_tunnel_dst_port_free(bp, bp->vxlan_fw_dst_port_id,
+                       HWRM_TUNNEL_DST_PORT_FREE_INPUT_TUNNEL_TYPE_VXLAN);
+       bp->vxlan_port = 0;
+       if (bp->geneve_port_cnt)
+               bnxt_hwrm_tunnel_dst_port_free(bp, bp->geneve_fw_dst_port_id,
+                       HWRM_TUNNEL_DST_PORT_FREE_INPUT_TUNNEL_TYPE_GENEVE);
+       bp->geneve_port = 0;
+}
+
 void bnxt_free_all_hwrm_resources(struct bnxt *bp)
 {
        struct bnxt_vnic_info *vnic;
@@ -1451,6 +1463,7 @@ void bnxt_free_all_hwrm_resources(struct bnxt *bp)
        bnxt_free_all_hwrm_rings(bp);
        bnxt_free_all_hwrm_ring_grps(bp);
        bnxt_free_all_hwrm_stat_ctxs(bp);
+       bnxt_free_tunnel_ports(bp);
 }
 
 static uint16_t bnxt_parse_eth_link_duplex(uint32_t conf_link_speed)
@@ -2051,6 +2064,49 @@ error_free:
        return rc;
 }
 
+int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp, uint16_t port,
+                               uint8_t tunnel_type)
+{
+       struct hwrm_tunnel_dst_port_alloc_input req = {0};
+       struct hwrm_tunnel_dst_port_alloc_output *resp = bp->hwrm_cmd_resp_addr;
+       int rc = 0;
+
+       HWRM_PREP(req, TUNNEL_DST_PORT_ALLOC, -1, resp);
+       req.tunnel_type = tunnel_type;
+       req.tunnel_dst_port_val = port;
+       rc = bnxt_hwrm_send_message(bp, &req, sizeof(req));
+       HWRM_CHECK_RESULT;
+
+       switch (tunnel_type) {
+       case HWRM_TUNNEL_DST_PORT_ALLOC_INPUT_TUNNEL_TYPE_VXLAN:
+               bp->vxlan_fw_dst_port_id = resp->tunnel_dst_port_id;
+               bp->vxlan_port = port;
+               break;
+       case HWRM_TUNNEL_DST_PORT_ALLOC_INPUT_TUNNEL_TYPE_GENEVE:
+               bp->geneve_fw_dst_port_id = resp->tunnel_dst_port_id;
+               bp->geneve_port = port;
+               break;
+       default:
+               break;
+       }
+       return rc;
+}
+
+int bnxt_hwrm_tunnel_dst_port_free(struct bnxt *bp, uint16_t port,
+                               uint8_t tunnel_type)
+{
+       struct hwrm_tunnel_dst_port_free_input req = {0};
+       struct hwrm_tunnel_dst_port_free_output *resp = bp->hwrm_cmd_resp_addr;
+       int rc = 0;
+
+       HWRM_PREP(req, TUNNEL_DST_PORT_FREE, -1, resp);
+       req.tunnel_type = tunnel_type;
+       req.tunnel_dst_port_id = rte_cpu_to_be_16(port);
+       rc = bnxt_hwrm_send_message(bp, &req, sizeof(req));
+       HWRM_CHECK_RESULT;
+
+       return rc;
+}
 
 int bnxt_hwrm_func_buf_rgtr(struct bnxt *bp)
 {

diff --git a/drivers/net/bnxt/bnxt_hwrm.h b/drivers/net/bnxt/bnxt_hwrm.h
index 1ea78b2..cee8fca 100644 (file)
--- a/drivers/net/bnxt/bnxt_hwrm.h
+++ b/drivers/net/bnxt/bnxt_hwrm.h
@@ -114,5 +114,10 @@ int bnxt_hwrm_func_vf_mac(struct bnxt *bp, uint16_t vf,
                          const uint8_t *mac_addr);
 int bnxt_hwrm_func_qcfg_vf_default_mac(struct bnxt *bp, uint16_t vf,
                                       struct ether_addr *mac);
+int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp, uint16_t port,
+                               uint8_t tunnel_type);
+int bnxt_hwrm_tunnel_dst_port_free(struct bnxt *bp, uint16_t port,
+                               uint8_t tunnel_type);
+void bnxt_free_tunnel_ports(struct bnxt *bp);
 
 #endif

diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c
index 0d15bb1..6870b16 100644 (file)
--- a/drivers/net/bnxt/bnxt_txr.c
+++ b/drivers/net/bnxt/bnxt_txr.c
@@ -213,7 +213,8 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
                        /* TSO */
                        txbd1->lflags = TX_BD_LONG_LFLAGS_LSO;
                        txbd1->hdr_size = tx_pkt->l2_len + tx_pkt->l3_len +
-                                       tx_pkt->l4_len;
+                                       tx_pkt->l4_len + tx_pkt->outer_l2_len +
+                                       tx_pkt->outer_l3_len;
                        txbd1->mss = tx_pkt->tso_segsz;
 
                } else if (tx_pkt->ol_flags & (PKT_TX_TCP_CKSUM |