lkml.org 
[lkml]   [2018]   [Oct]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.18 089/100] be2net: don't flip hw_features when VXLANs are added/deleted
    Date
    From: Davide Caratti <dcaratti@redhat.com>

    [ Upstream commit 2d52527e80c2dc0c5f43f50adf183781262ec565 ]

    the be2net implementation of .ndo_tunnel_{add,del}() changes the value of
    NETIF_F_GSO_UDP_TUNNEL bit in 'features' and 'hw_features', but it forgets
    to call netdev_features_change(). Moreover, ethtool setting for that bit
    can potentially be reverted after a tunnel is added or removed.

    GSO already does software segmentation when 'hw_enc_features' is 0, even
    if VXLAN offload is turned on. In addition, commit 096de2f83ebc ("benet:
    stricter vxlan offloading check in be_features_check") avoids hardware
    segmentation of non-VXLAN tunneled packets, or VXLAN packets having wrong
    destination port. So, it's safe to avoid flipping the above feature on
    addition/deletion of VXLAN tunnels.

    Fixes: 630f4b70567f ("be2net: Export tunnel offloads only when a VxLAN tunnel is created")
    Signed-off-by: Davide Caratti <dcaratti@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/emulex/benet/be_main.c | 5 +----
    1 file changed, 1 insertion(+), 4 deletions(-)

    diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
    index 8f755009ff38..c8445a4135a9 100644
    --- a/drivers/net/ethernet/emulex/benet/be_main.c
    +++ b/drivers/net/ethernet/emulex/benet/be_main.c
    @@ -3915,8 +3915,6 @@ static int be_enable_vxlan_offloads(struct be_adapter *adapter)
    netdev->hw_enc_features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
    NETIF_F_TSO | NETIF_F_TSO6 |
    NETIF_F_GSO_UDP_TUNNEL;
    - netdev->hw_features |= NETIF_F_GSO_UDP_TUNNEL;
    - netdev->features |= NETIF_F_GSO_UDP_TUNNEL;

    dev_info(dev, "Enabled VxLAN offloads for UDP port %d\n",
    be16_to_cpu(port));
    @@ -3938,8 +3936,6 @@ static void be_disable_vxlan_offloads(struct be_adapter *adapter)
    adapter->vxlan_port = 0;

    netdev->hw_enc_features = 0;
    - netdev->hw_features &= ~(NETIF_F_GSO_UDP_TUNNEL);
    - netdev->features &= ~(NETIF_F_GSO_UDP_TUNNEL);
    }

    static void be_calculate_vf_res(struct be_adapter *adapter, u16 num_vfs,
    @@ -5232,6 +5228,7 @@ static void be_netdev_init(struct net_device *netdev)
    struct be_adapter *adapter = netdev_priv(netdev);

    netdev->hw_features |= NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6 |
    + NETIF_F_GSO_UDP_TUNNEL |
    NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM |
    NETIF_F_HW_VLAN_CTAG_TX;
    if ((be_if_cap_flags(adapter) & BE_IF_FLAGS_RSS))
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-10-16 06:30    [W:4.021 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site