diff mbox

[dpdk-dev] net/mlx5: fix xstats functions unlock missing

Message ID 1502710344-28013-1-git-send-email-matan@mellanox.com (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Matan Azrad Aug. 14, 2017, 11:32 a.m. UTC 
  The corrupted code didn't unlock the spinlock in xstats
get and reset functions error flow.

Hence, if these errors happaned, the device spinlock was
left locked and many mlx5 device functionalities were blocked.

The fix unlocks the spinlock in the missed places.

Fixes: e62bc9e70608 ("net/mlx5: fix extended statistics")

Signed-off-by: Matan Azrad <matan@mellanox.com>
Cc: stable@dpdk.org
---
 drivers/net/mlx5/mlx5_stats.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Comments

Nélio Laranjeiro Aug. 23, 2017, 3:09 p.m. UTC | #1 
On Mon, Aug 14, 2017 at 02:32:24PM +0300, Matan Azrad wrote:
> The corrupted code didn't unlock the spinlock in xstats
> get and reset functions error flow.
> 
> Hence, if these errors happaned, the device spinlock was
> left locked and many mlx5 device functionalities were blocked.
> 
> The fix unlocks the spinlock in the missed places.
> 
> Fixes: e62bc9e70608 ("net/mlx5: fix extended statistics")
> 
> Signed-off-by: Matan Azrad <matan@mellanox.com>
> Cc: stable@dpdk.org
> ---
>  drivers/net/mlx5/mlx5_stats.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_stats.c b/drivers/net/mlx5/mlx5_stats.c
> index 703f48c..33997af 100644
> --- a/drivers/net/mlx5/mlx5_stats.c
> +++ b/drivers/net/mlx5/mlx5_stats.c
> @@ -442,8 +442,10 @@ mlx5_xstats_get(struct rte_eth_dev *dev,
>  
>  		priv_lock(priv);
>  		stats_n = priv_ethtool_get_stats_n(priv);
> -		if (stats_n < 0)
> +		if (stats_n < 0) {
> +			priv_unlock(priv);
>  			return -1;
> +		}
>  		if (xstats_ctrl->stats_n != stats_n)
>  			priv_xstats_init(priv);
>  		ret = priv_xstats_get(priv, stats);
> @@ -468,10 +470,11 @@ mlx5_xstats_reset(struct rte_eth_dev *dev)
>  	priv_lock(priv);
>  	stats_n = priv_ethtool_get_stats_n(priv);
>  	if (stats_n < 0)
> -		return;
> +		goto unlock;
>  	if (xstats_ctrl->stats_n != stats_n)
>  		priv_xstats_init(priv);
>  	priv_xstats_reset(priv);
> +unlock:
>  	priv_unlock(priv);
>  }
>  
> -- 
> 2.7.4
> 

Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
Ferruh Yigit Aug. 24, 2017, 12:13 p.m. UTC | #2 
On 8/23/2017 4:09 PM, Nélio Laranjeiro wrote:
> On Mon, Aug 14, 2017 at 02:32:24PM +0300, Matan Azrad wrote:
>> The corrupted code didn't unlock the spinlock in xstats
>> get and reset functions error flow.
>>
>> Hence, if these errors happaned, the device spinlock was
>> left locked and many mlx5 device functionalities were blocked.
>>
>> The fix unlocks the spinlock in the missed places.
>>
>> Fixes: e62bc9e70608 ("net/mlx5: fix extended statistics")
>> Cc: stable@dpdk.org
>>
>> Signed-off-by: Matan Azrad <matan@mellanox.com>

> Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>

Applied to dpdk-next-net/master, thanks.
diff mbox

Patch

diff --git a/drivers/net/mlx5/mlx5_stats.c b/drivers/net/mlx5/mlx5_stats.c
index 703f48c..33997af 100644
--- a/drivers/net/mlx5/mlx5_stats.c
+++ b/drivers/net/mlx5/mlx5_stats.c
@@ -442,8 +442,10 @@  mlx5_xstats_get(struct rte_eth_dev *dev,
 
 		priv_lock(priv);
 		stats_n = priv_ethtool_get_stats_n(priv);
-		if (stats_n < 0)
+		if (stats_n < 0) {
+			priv_unlock(priv);
 			return -1;
+		}
 		if (xstats_ctrl->stats_n != stats_n)
 			priv_xstats_init(priv);
 		ret = priv_xstats_get(priv, stats);
@@ -468,10 +470,11 @@  mlx5_xstats_reset(struct rte_eth_dev *dev)
 	priv_lock(priv);
 	stats_n = priv_ethtool_get_stats_n(priv);
 	if (stats_n < 0)
-		return;
+		goto unlock;
 	if (xstats_ctrl->stats_n != stats_n)
 		priv_xstats_init(priv);
 	priv_xstats_reset(priv);
+unlock:
 	priv_unlock(priv);
 }