net/mlx5e: Block LRO if firmware asks for tunneled LRO

This commit does a cleanup in LRO configuration.

LRO is a parameter of an RQ, but its state is changed by modifying a TIR
related to the RQ.

The current status: LRO for tunneled packets is not supported in the
driver, inner TIRs may enable LRO on creation, but LRO status of inner
TIRs isn't changed in mlx5e_modify_tirs_lro(). This is inconsistent, but
as long as the firmware doesn't declare support for tunneled LRO, it
works, because the same RQs are shared between the inner and outer TIRs.

This commit does two fixes:

1. If the firmware has the tunneled LRO capability, LRO is blocked
altogether, because it's not possible to block it for inner TIRs only,
when the same RQs are shared between inner and outer TIRs, and the
driver won't be able to handle tunneled LRO traffic.

2. mlx5e_modify_tirs_lro() is patched to modify LRO state for all TIRs,
including inner ones, because all TIRs related to an RQ should agree on
their LRO state.

Fixes: 7b3722fa9ef6 ("net/mlx5e: Support RSS for GRE tunneled packets")
Signed-off-by: Maxim Mikityanskiy <maximmi@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index d09e65557e75578ca61bf9267a68d52758f42030..b651134b0f6bb94245ecf76dbf3a4d22e424eb9d 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -2576,6 +2576,14 @@ static int mlx5e_modify_tirs_lro(struct mlx5e_priv *priv)
                err = mlx5_core_modify_tir(mdev, priv->indir_tir[tt].tirn, in);
                if (err)
                        goto free_in;
+
+               /* Verify inner tirs resources allocated */
+               if (!priv->inner_indir_tir[0].tirn)
+                       continue;
+
+               err = mlx5_core_modify_tir(mdev, priv->inner_indir_tir[tt].tirn, in);
+               if (err)
+                       goto free_in;
        }
 
        for (ix = 0; ix < priv->max_nch; ix++) {
@@ -4808,7 +4816,14 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev)
        netdev->hw_enc_features  |= NETIF_F_HW_VLAN_CTAG_TX;
        netdev->hw_enc_features  |= NETIF_F_HW_VLAN_CTAG_RX;
 
+       /* Tunneled LRO is not supported in the driver, and the same RQs are
+        * shared between inner and outer TIRs, so the driver can't disable LRO
+        * for inner TIRs while having it enabled for outer TIRs. Due to this,
+        * block LRO altogether if the firmware declares tunneled LRO support.
+        */
        if (!!MLX5_CAP_ETH(mdev, lro_cap) &&
+           !MLX5_CAP_ETH(mdev, tunnel_lro_vxlan) &&
+           !MLX5_CAP_ETH(mdev, tunnel_lro_gre) &&
            mlx5e_check_fragmented_striding_rq_cap(mdev))
                netdev->vlan_features    |= NETIF_F_LRO;
 

diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index b0009aa3647f4c60f0d013cb3bc1944a9ecc616e..6bbae0c3bc0b9920d1cc04bd8135077fd4c5a1fc 100644 (file)
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -921,7 +921,8 @@ struct mlx5_ifc_per_protocol_networking_offload_caps_bits {
        u8         scatter_fcs[0x1];
        u8         enhanced_multi_pkt_send_wqe[0x1];
        u8         tunnel_lso_const_out_ip_id[0x1];
-       u8         reserved_at_1c[0x2];
+       u8         tunnel_lro_gre[0x1];
+       u8         tunnel_lro_vxlan[0x1];
        u8         tunnel_stateless_gre[0x1];
        u8         tunnel_stateless_vxlan[0x1];