lkml.org 
[lkml]   [2015]   [Jul]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.0 16/55] net/mlx4_en: Release TX QP when destroying TX ring
    Date
    4.0-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Eran Ben Elisha <eranbe@mellanox.com>

    [ Upstream commit 0eb08514fdbdcd16fd6870680cd638f203662e9d ]

    TX ring QP wasn't released at mlx4_en_destroy_tx_ring. Instead, the code
    used the deprecated base_tx_qpn field. Move TX QP release to
    mlx4_en_destroy_tx_ring and remove the base_tx_qpn field.

    Fixes: ddae0349fdb7 ('net/mlx4: Change QP allocation scheme')
    Signed-off-by: Eran Ben Elisha <eranbe@mellanox.com>
    Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 4 ----
    drivers/net/ethernet/mellanox/mlx4/en_tx.c | 1 +
    drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 1 -
    3 files changed, 1 insertion(+), 5 deletions(-)

    --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
    +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
    @@ -1971,10 +1971,6 @@ void mlx4_en_free_resources(struct mlx4_
    mlx4_en_destroy_cq(priv, &priv->rx_cq[i]);
    }

    - if (priv->base_tx_qpn) {
    - mlx4_qp_release_range(priv->mdev->dev, priv->base_tx_qpn, priv->tx_ring_num);
    - priv->base_tx_qpn = 0;
    - }
    }

    int mlx4_en_alloc_resources(struct mlx4_en_priv *priv)
    --- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
    +++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
    @@ -180,6 +180,7 @@ void mlx4_en_destroy_tx_ring(struct mlx4
    mlx4_bf_free(mdev->dev, &ring->bf);
    mlx4_qp_remove(mdev->dev, &ring->qp);
    mlx4_qp_free(mdev->dev, &ring->qp);
    + mlx4_qp_release_range(priv->mdev->dev, ring->qpn, 1);
    mlx4_en_unmap_buffer(&ring->wqres.buf);
    mlx4_free_hwq_res(mdev->dev, &ring->wqres, ring->buf_size);
    kfree(ring->bounce_buf);
    --- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
    +++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
    @@ -601,7 +601,6 @@ struct mlx4_en_priv {
    int vids[128];
    bool wol;
    struct device *ddev;
    - int base_tx_qpn;
    struct hlist_head mac_hash[MLX4_EN_MAC_HASH_SIZE];
    struct hwtstamp_config hwtstamp_config;




    \
     
     \ /
      Last update: 2015-07-08 10:01    [W:4.094 / U:1.704 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site