net/bnxt: fix tunnel stateless offloads

The HW only supports tunnel header parsing globally for supported tunnel
types. When a function uses one default VNIC to receive both the tunnel
and non-tunnel packets, applying the same stateless offload operation to
both tunnel and non-tunnel packets can cause problems in certain scenarios.
To workaround these problems, the firmware advertises no tunnel header
parsing capabilities to the driver using the HWRM_FUNC_QCAPS.
The driver must check this flag setting and accordingly not advertise
tunnel packet stateless offload capabilities to the stack.

If the device supports VXLAN, GRE, IPIP and GENEVE tunnel parsing,
then reports RX_OFFLOAD_OUTER_IPV4_CKSUM, RX_OFFLOAD_OUTER_UDP_CKSUM
and TX_OFFLOAD_OUTER_IPV4_CKSUM in the Rx/Tx offload capabilities of
the device.
Also, advertise tunnel TSO capabilities based on FW support.

Fixes: 0a6d2a720078 ("net/bnxt: get device infos")
Cc: stable@dpdk.org
Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 9e5ff7496e1f85fe84a22e78e4a69b95efcfde56..e4e8e8ecf81d2aebf12086d34a36d0ab73bb5c13 100644 (file)
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -871,6 +871,7 @@ struct bnxt {
        uint32_t                max_mcast_addr; /* maximum number of mcast filters supported */
 
        struct rte_eth_rss_conf rss_conf; /* RSS configuration. */
+       uint16_t                tunnel_disable_flag; /* tunnel stateless offloads status */
 };
 
 static

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index b4aeec593eeef03c728a9b9aa2141e4c7054dcb4..1b94e3c1461c0c59943474d9e136c1da134382aa 100644 (file)
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -939,6 +939,11 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp)
                bp->fw_cap |= BNXT_FW_CAP_VLAN_TX_INSERT;
                PMD_DRV_LOG(DEBUG, "VLAN acceleration for TX is enabled\n");
        }
+
+       bp->tunnel_disable_flag = rte_le_to_cpu_16(resp->tunnel_disable_flag);
+       if (bp->tunnel_disable_flag)
+               PMD_DRV_LOG(DEBUG, "Tunnel parsing capability is disabled, flags : %#x\n",
+                           bp->tunnel_disable_flag);
 unlock:
        HWRM_UNLOCK();
 

diff --git a/drivers/net/bnxt/bnxt_hwrm.h b/drivers/net/bnxt/bnxt_hwrm.h
index 63f8d8ceabddb15cb2e6861f1bb4d88841542c30..77f8521406359f66a96315e5f1b4b67c2c526e5a 100644 (file)
--- a/drivers/net/bnxt/bnxt_hwrm.h
+++ b/drivers/net/bnxt/bnxt_hwrm.h
@@ -121,6 +121,26 @@ struct bnxt_pf_resource_info {
 
 #define BNXT_CTX_VAL_INVAL     0xFFFF
 
+#define BNXT_TUNNELED_OFFLOADS_CAP_VXLAN_EN(bp)                \
+       (!((bp)->tunnel_disable_flag & HWRM_FUNC_QCAPS_OUTPUT_TUNNEL_DISABLE_FLAG_DISABLE_VXLAN))
+#define BNXT_TUNNELED_OFFLOADS_CAP_NGE_EN(bp)          \
+       (!((bp)->tunnel_disable_flag & HWRM_FUNC_QCAPS_OUTPUT_TUNNEL_DISABLE_FLAG_DISABLE_NGE))
+#define BNXT_TUNNELED_OFFLOADS_CAP_GRE_EN(bp)          \
+       (!((bp)->tunnel_disable_flag & HWRM_FUNC_QCAPS_OUTPUT_TUNNEL_DISABLE_FLAG_DISABLE_GRE))
+#define BNXT_TUNNELED_OFFLOADS_CAP_IPINIP_EN(bp)       \
+       (!((bp)->tunnel_disable_flag & HWRM_FUNC_QCAPS_OUTPUT_TUNNEL_DISABLE_FLAG_DISABLE_IPINIP))
+
+/*
+ * If the device supports VXLAN, GRE, IPIP and GENEVE tunnel parsing, then report
+ * RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM, RTE_ETH_RX_OFFLOAD_OUTER_UDP_CKSUM and
+ * RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM in the Rx/Tx offload capabilities of the device.
+ */
+#define BNXT_TUNNELED_OFFLOADS_CAP_ALL_EN(bp)                  \
+       (BNXT_TUNNELED_OFFLOADS_CAP_VXLAN_EN(bp) &&             \
+        BNXT_TUNNELED_OFFLOADS_CAP_NGE_EN(bp)   &&             \
+        BNXT_TUNNELED_OFFLOADS_CAP_GRE_EN(bp)   &&             \
+        BNXT_TUNNELED_OFFLOADS_CAP_IPINIP_EN(bp))
+
 int bnxt_hwrm_cfa_l2_clear_rx_mask(struct bnxt *bp,
                                   struct bnxt_vnic_info *vnic);
 int bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt *bp, struct bnxt_vnic_info *vnic,

diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c
index 8977138012ca77bc1c037c862c62dad493c8abb0..8147404d9c776a408cedd7a07f7dd9fb10cb4f5f 100644 (file)
--- a/drivers/net/bnxt/bnxt_rxq.c
+++ b/drivers/net/bnxt/bnxt_rxq.c
@@ -34,14 +34,15 @@ uint64_t bnxt_get_rx_port_offloads(struct bnxt *bp)
                          RTE_ETH_RX_OFFLOAD_SCATTER |
                          RTE_ETH_RX_OFFLOAD_RSS_HASH;
 
-       rx_offload_capa |= RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM |
-                          RTE_ETH_RX_OFFLOAD_OUTER_UDP_CKSUM;
-
        if (bp->flags & BNXT_FLAG_PTP_SUPPORTED)
                rx_offload_capa |= RTE_ETH_RX_OFFLOAD_TIMESTAMP;
        if (bp->vnic_cap_flags & BNXT_VNIC_CAP_VLAN_RX_STRIP)
                rx_offload_capa |= RTE_ETH_RX_OFFLOAD_VLAN_STRIP;
 
+       if (BNXT_TUNNELED_OFFLOADS_CAP_ALL_EN(bp))
+               rx_offload_capa |= RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM |
+                                       RTE_ETH_RX_OFFLOAD_OUTER_UDP_CKSUM;
+
        return rx_offload_capa;
 }
 

diff --git a/drivers/net/bnxt/bnxt_txq.c b/drivers/net/bnxt/bnxt_txq.c
index 86073a505ec4c4bf293a13dbc1edbcb733116aae..c8745add5e80a3c14e9cc59aa4013d787c0f19b0 100644 (file)
--- a/drivers/net/bnxt/bnxt_txq.c
+++ b/drivers/net/bnxt/bnxt_txq.c
@@ -28,15 +28,21 @@ uint64_t bnxt_get_tx_port_offloads(struct bnxt *bp)
                          RTE_ETH_TX_OFFLOAD_QINQ_INSERT |
                          RTE_ETH_TX_OFFLOAD_MULTI_SEGS;
 
-       tx_offload_capa |= RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM |
-                          RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO |
-                          RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO |
-                          RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO |
-                          RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO;
-
        if (bp->fw_cap & BNXT_FW_CAP_VLAN_TX_INSERT)
                tx_offload_capa |= RTE_ETH_TX_OFFLOAD_VLAN_INSERT;
 
+       if (BNXT_TUNNELED_OFFLOADS_CAP_ALL_EN(bp))
+               tx_offload_capa |= RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM;
+
+       if (BNXT_TUNNELED_OFFLOADS_CAP_VXLAN_EN(bp))
+               tx_offload_capa |= RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO;
+       if (BNXT_TUNNELED_OFFLOADS_CAP_GRE_EN(bp))
+               tx_offload_capa |= RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO;
+       if (BNXT_TUNNELED_OFFLOADS_CAP_NGE_EN(bp))
+               tx_offload_capa |= RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO;
+       if (BNXT_TUNNELED_OFFLOADS_CAP_IPINIP_EN(bp))
+               tx_offload_capa |= RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO;
+
        return tx_offload_capa;
 }