lkml.org 
[lkml]   [2015]   [May]   [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 001/129] mlx4: Fix tx ring affinity_mask creation
    Date
    3.16.7-ckt12 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Benjamin Poirier <bpoirier@suse.de>

    commit 42eab005a5dd5d7ea2b0328aecc4d6cc0c23c9c2 upstream.

    By default, the number of tx queues is limited by the number of online cpus
    in mlx4_en_get_profile(). However, this limit no longer holds after the
    ethtool .set_channels method has been called. In that situation, the driver
    may access invalid bits of certain cpumask variables when queue_index >=
    nr_cpu_ids.

    Signed-off-by: Benjamin Poirier <bpoirier@suse.de>
    Acked-by: Ido Shamay <idos@mellanox.com>
    Fixes: d03a68f ("net/mlx4_en: Configure the XPS queue mapping on driver load")
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/net/ethernet/mellanox/mlx4/en_tx.c | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
    index 0610c85d4371..8068b0557c5a 100644
    --- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
    +++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
    @@ -132,8 +132,10 @@ int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv,
    ring->hwtstamp_tx_type = priv->hwtstamp_config.tx_type;
    ring->queue_index = queue_index;

    - if (queue_index < priv->num_tx_rings_p_up && cpu_online(queue_index))
    - cpumask_set_cpu(queue_index, &ring->affinity_mask);
    + if (queue_index < priv->num_tx_rings_p_up)
    + cpumask_set_cpu_local_first(queue_index,
    + priv->mdev->dev->numa_node,
    + &ring->affinity_mask);

    *pring = ring;
    return 0;
    @@ -200,7 +202,7 @@ int mlx4_en_activate_tx_ring(struct mlx4_en_priv *priv,

    err = mlx4_qp_to_ready(mdev->dev, &ring->wqres.mtt, &ring->context,
    &ring->qp, &ring->qp_state);
    - if (!user_prio && cpu_online(ring->queue_index))
    + if (!cpumask_empty(&ring->affinity_mask))
    netif_set_xps_queue(priv->dev, &ring->affinity_mask,
    ring->queue_index);


    \
     
     \ /
      Last update: 2015-05-22 12:21    [W:4.123 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site