Patch "[PATCH 093/135] net/mlx5e: Don't modify CQ before it was created" has been added to the 4.4-stable tree
This is a note to let you know that I've just added the patch titled
[PATCH 093/135] net/mlx5e: Don't modify CQ before it was created
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
0093-net-mlx5e-Don-t-modify-CQ-before-it-was-created.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
f27c400e1e9704f855009d6f23cf4827bdb09055Mon Sep 17 00:00:00 2001
From: Gal Pressman <[email protected]>
Date: Wed, 2 Mar 2016 00:13:38 +0200
Subject: [PATCH 093/135] net/mlx5e: Don't modify CQ before it was created
[ Upstream commit 2fcb92fbd04eef26dfe7e67839da6262d83d6b65 ]
Calling mlx5e_set_coalesce while the interface is down will result in modifying CQs that don't exist.
Ethernet functionality')
--- drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +6 -0
@@ -422,11 +422,15 @@ static int mlx5e_set_coalesce(struct netif (!MLX5_CAP_GEN (mdev, cq_moderation))return -ENOTSUPP ; +mutex_lock (&priv->state_lock); priv->params.tx_cq_moderation_usec = coal->tx_coalesce_usecs; priv->params.tx_cq_moderation_pkts = coal->tx_max_coalesced_frames; priv->params.rx_cq_moderation_usec = coal->rx_coalesce_usecs; priv->params.rx_cq_moderation_pkts = coal->rx_max_coalesced_frames; +if (!test_bit (MLX5E_STATE_OPENED , &priv->state)) + goto out; +for (i =0 ; i < priv->params.num_channels; ++i) { c = priv->channel[i];
@@ -442,6 +446,8 @@ static int mlx5e_set_coalesce(struct net coal->rx_max_coalesced_frames); } +out: +mutex_unlock (&priv->state_lock);return 0 ; }
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/0093-net-mlx5e-Don-t-modify-CQ-before-it-was-created.patch queue-4.4/0092-net-mlx5e-Don-t-try-to-modify-CQ-moderation-if-it-is.patch