lkml.org 
[lkml]   [2021]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 109/236] net/mlx5e: Block LRO if firmware asks for tunneled LRO
    Date
    From: Maxim Mikityanskiy <maximmi@nvidia.com>

    [ Upstream commit 26ab7b384525ccfa678c518577f7f0d841209c8b ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 15 +++++++++++++++
    include/linux/mlx5/mlx5_ifc.h | 3 ++-
    2 files changed, 17 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
    index 6b4a3d90c9f7..6974090a7efa 100644
    --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
    +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
    @@ -2803,6 +2803,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++) {
    @@ -4928,7 +4936,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 af8f4e2cf21d..70a3664785f8 100644
    --- a/include/linux/mlx5/mlx5_ifc.h
    +++ b/include/linux/mlx5/mlx5_ifc.h
    @@ -876,7 +876,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];

    --
    2.30.2


    \
     
     \ /
      Last update: 2021-09-13 15:40    [W:3.331 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site