lkml.org 
[lkml]   [2016]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 056/142] net/mlx4_en: Avoid changing dev->features directly in run-time
    Date
    3.16.7-ckt26 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Eugenia Emantayev <eugenia@mellanox.com>

    commit 925ab1aa9394bbaeac47ee5b65d3fdf0fb8135cf upstream.

    It's forbidden to manually change dev->features in run-time. Currently, this is
    done in the driver to make sure that GSO_UDP_TUNNEL is advertized only when
    VXLAN tunnel is set. However, since the stack actually does features intersection
    with hw_enc_features, we can safely revert to advertizing features early when
    registering the netdevice.

    Fixes: f4a1edd56120 ('net/mlx4_en: Advertize encapsulation offloads [...]')
    Signed-off-by: Eugenia Emantayev <eugenia@mellanox.com>
    Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    [ luis: backported to 3.16: adjusted context ]
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
    index bf3878823c96..1f588195fe9f 100644
    --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
    +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
    @@ -2324,8 +2324,6 @@ out:
    /* set offloads */
    priv->dev->hw_enc_features |= NETIF_F_IP_CSUM | NETIF_F_RXCSUM |
    NETIF_F_TSO | NETIF_F_GSO_UDP_TUNNEL;
    - priv->dev->hw_features |= NETIF_F_GSO_UDP_TUNNEL;
    - priv->dev->features |= NETIF_F_GSO_UDP_TUNNEL;
    }

    static void mlx4_en_del_vxlan_offloads(struct work_struct *work)
    @@ -2336,8 +2334,6 @@ static void mlx4_en_del_vxlan_offloads(struct work_struct *work)
    /* unset offloads */
    priv->dev->hw_enc_features &= ~(NETIF_F_IP_CSUM | NETIF_F_RXCSUM |
    NETIF_F_TSO | NETIF_F_GSO_UDP_TUNNEL);
    - priv->dev->hw_features &= ~NETIF_F_GSO_UDP_TUNNEL;
    - priv->dev->features &= ~NETIF_F_GSO_UDP_TUNNEL;

    ret = mlx4_SET_PORT_VXLAN(priv->mdev->dev, priv->port,
    VXLAN_STEER_BY_OUTER_MAC, 0);
    @@ -2618,6 +2614,11 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
    if (mdev->dev->caps.steering_mode != MLX4_STEERING_MODE_A0)
    dev->priv_flags |= IFF_UNICAST_FLT;

    + if (mdev->dev->caps.tunnel_offload_mode == MLX4_TUNNEL_OFFLOAD_MODE_VXLAN) {
    + dev->hw_features |= NETIF_F_GSO_UDP_TUNNEL;
    + dev->features |= NETIF_F_GSO_UDP_TUNNEL;
    + }
    +
    mdev->pndev[port] = dev;

    netif_carrier_off(dev);
    \
     
     \ /
      Last update: 2016-03-22 13:01    [W:4.062 / U:0.196 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site