lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 222/563] Revert "net/mlx5e: Block offload of outer header csum for UDP tunnels"
    Date
    From: Aya Levin <ayal@nvidia.com>

    [ Upstream commit 64050cdad0983ad8060e33c3f4b5aee2366bcebd ]

    This reverts commit 6d6727dddc7f93fcc155cb8d0c49c29ae0e71122.

    Although the NIC doesn't support offload of outer header CSUM, using
    gso_partial_features allows offloading the tunnel's segmentation. The
    driver relies on the stack CSUM calculation of the outer header. For
    this, NETIF_F_GSO_UDP_TUNNEL_CSUM must be a member of the device's
    features.

    Fixes: 6d6727dddc7f ("net/mlx5e: Block offload of outer header csum for UDP tunnels")
    Signed-off-by: Aya Levin <ayal@nvidia.com>
    Reviewed-by: Gal Pressman <gal@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 | 10 +++++++---
    1 file changed, 7 insertions(+), 3 deletions(-)

    diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
    index 2f6c3a5813ed1..16e98ac47624c 100644
    --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
    +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
    @@ -5024,9 +5024,13 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev)
    }

    if (mlx5_vxlan_allowed(mdev->vxlan) || mlx5_geneve_tx_allowed(mdev)) {
    - netdev->hw_features |= NETIF_F_GSO_UDP_TUNNEL;
    - netdev->hw_enc_features |= NETIF_F_GSO_UDP_TUNNEL;
    - netdev->vlan_features |= NETIF_F_GSO_UDP_TUNNEL;
    + netdev->hw_features |= NETIF_F_GSO_UDP_TUNNEL |
    + NETIF_F_GSO_UDP_TUNNEL_CSUM;
    + netdev->hw_enc_features |= NETIF_F_GSO_UDP_TUNNEL |
    + NETIF_F_GSO_UDP_TUNNEL_CSUM;
    + netdev->gso_partial_features = NETIF_F_GSO_UDP_TUNNEL_CSUM;
    + netdev->vlan_features |= NETIF_F_GSO_UDP_TUNNEL |
    + NETIF_F_GSO_UDP_TUNNEL_CSUM;
    }

    if (mlx5e_tunnel_proto_supported(mdev, IPPROTO_GRE)) {
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 21:13    [W:2.738 / U:0.776 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site