2018-12-07 08:31:55

by Tarick Bedeir

Subject: [PATCH] net/mlx4_core: Correctly set PFC param if global pause is turned off.

rx_ppp and tx_ppp can be set between 0 and 255, so don't clamp to 1.

Fixes: 6e8814ceb7e8 ("net/mlx4_en: Fix mixed PFC and Global pause user control requests")
Signed-off-by: Tarick Bedeir <[email protected]>
---
drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
index f11b45001cad..d290f0787dfb 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
@@ -1084,8 +1084,8 @@ static int mlx4_en_set_pauseparam(struct net_device *dev,

tx_pause = !!(pause->tx_pause);
rx_pause = !!(pause->rx_pause);
- rx_ppp = priv->prof->rx_ppp && !(tx_pause || rx_pause);
- tx_ppp = priv->prof->tx_ppp && !(tx_pause || rx_pause);
+ rx_ppp = (tx_pause || rx_pause) ? 0 : priv->prof->rx_ppp;
+ tx_ppp = (tx_pause || rx_pause) ? 0 : priv->prof->tx_ppp;

err = mlx4_SET_PORT_general(mdev->dev, priv->port,
priv->rx_skb_size + ETH_FCS_LEN,
--
2.20.0.rc2.403.gdbc3b29805-goog

2018-12-07 20:42:05

by David Miller

Subject: Re: [PATCH] net/mlx4_core: Correctly set PFC param if global pause is turned off.

From: Tarick Bedeir <[email protected]>
Date: Fri, 7 Dec 2018 00:30:26 -0800

> rx_ppp and tx_ppp can be set between 0 and 255, so don't clamp to 1.
>
> Fixes: 6e8814ceb7e8 ("net/mlx4_en: Fix mixed PFC and Global pause user control requests")
> Signed-off-by: Tarick Bedeir <[email protected]>

Tariq and co., please review.

2018-12-08 08:43:52

by Eran Ben Elisha

Subject: Re: [PATCH] net/mlx4_core: Correctly set PFC param if global pause is turned off.

On 12/7/2018 10:30 AM, Tarick Bedeir wrote:
> rx_ppp and tx_ppp can be set between 0 and 255, so don't clamp to 1.
>
> Fixes: 6e8814ceb7e8 ("net/mlx4_en: Fix mixed PFC and Global pause user control requests")
> Signed-off-by: Tarick Bedeir <[email protected]>
> ---
> drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
> index f11b45001cad..d290f0787dfb 100644
> --- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
> +++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
> @@ -1084,8 +1084,8 @@ static int mlx4_en_set_pauseparam(struct net_device *dev,
>
> tx_pause = !!(pause->tx_pause);
> rx_pause = !!(pause->rx_pause);
> - rx_ppp = priv->prof->rx_ppp && !(tx_pause || rx_pause);
> - tx_ppp = priv->prof->tx_ppp && !(tx_pause || rx_pause);
> + rx_ppp = (tx_pause || rx_pause) ? 0 : priv->prof->rx_ppp;
> + tx_ppp = (tx_pause || rx_pause) ? 0 : priv->prof->tx_ppp;
>
> err = mlx4_SET_PORT_general(mdev->dev, priv->port,
> priv->rx_skb_size + ETH_FCS_LEN,
>

thanks for the Tarick.

Reviewed-by: Eran Ben Elisha <[email protected]>

2018-12-09 05:28:18

by David Miller

Subject: Re: [PATCH] net/mlx4_core: Correctly set PFC param if global pause is turned off.

From: Tarick Bedeir <[email protected]>
Date: Fri, 7 Dec 2018 00:30:26 -0800

> rx_ppp and tx_ppp can be set between 0 and 255, so don't clamp to 1.
>
> Fixes: 6e8814ceb7e8 ("net/mlx4_en: Fix mixed PFC and Global pause user control requests")
> Signed-off-by: Tarick Bedeir <[email protected]>

Applied and queued up for -stable.