* [PATCH v2] mlx4_en: Fix BQL reset TX queue call point
@ 2013-02-06 17:58 Tom Herbert
2013-02-06 21:11 ` David Miller
2013-02-07 6:52 ` Amir Vadai
0 siblings, 2 replies; 4+ messages in thread
From: Tom Herbert @ 2013-02-06 17:58 UTC (permalink / raw)
To: davem, yevgenyp, netdev, amirv
Fix issue in Mellanox driver related to BQL. netdev_tx_reset_queue
was not being called in certain situations where the device was
being start and stopped. Moved netdev_tx_reset_queue from the reset
device path to mlx4_en_free_tx_buf which is where the rings are
cleaned in a reset (specifically from device being stopped).
Signed-off-by: Tom Herbert <therbert@google.com>
---
drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 3 ---
drivers/net/ethernet/mellanox/mlx4/en_tx.c | 2 ++
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index ac1c14f..94042f6 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -1323,15 +1323,12 @@ static void mlx4_en_restart(struct work_struct *work)
watchdog_task);
struct mlx4_en_dev *mdev = priv->mdev;
struct net_device *dev = priv->dev;
- int i;
en_dbg(DRV, priv, "Watchdog task called for port %d\n", priv->port);
mutex_lock(&mdev->state_lock);
if (priv->port_up) {
mlx4_en_stop_port(dev, 1);
- for (i = 0; i < priv->tx_ring_num; i++)
- netdev_tx_reset_queue(priv->tx_ring[i].tx_queue);
if (mlx4_en_start_port(dev))
en_err(priv, "Failed restarting port %d\n", priv->port);
}
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
index 30724d8..e06fce7 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
@@ -294,6 +294,8 @@ int mlx4_en_free_tx_buf(struct net_device *dev, struct mlx4_en_tx_ring *ring)
cnt++;
}
+ netdev_tx_reset_queue(ring->tx_queue);
+
if (cnt)
en_dbg(DRV, priv, "Freed %d uncompleted tx descriptors\n", cnt);
--
1.8.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] mlx4_en: Fix BQL reset TX queue call point
2013-02-06 17:58 [PATCH v2] mlx4_en: Fix BQL reset TX queue call point Tom Herbert
@ 2013-02-06 21:11 ` David Miller
2013-02-07 6:52 ` Amir Vadai
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2013-02-06 21:11 UTC (permalink / raw)
To: therbert; +Cc: yevgenyp, netdev, amirv
From: Tom Herbert <therbert@google.com>
Date: Wed, 6 Feb 2013 09:58:41 -0800 (PST)
> Fix issue in Mellanox driver related to BQL. netdev_tx_reset_queue
> was not being called in certain situations where the device was
> being start and stopped. Moved netdev_tx_reset_queue from the reset
> device path to mlx4_en_free_tx_buf which is where the rings are
> cleaned in a reset (specifically from device being stopped).
>
> Signed-off-by: Tom Herbert <therbert@google.com>
Mellanox folks, please review.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] mlx4_en: Fix BQL reset TX queue call point
2013-02-06 17:58 [PATCH v2] mlx4_en: Fix BQL reset TX queue call point Tom Herbert
2013-02-06 21:11 ` David Miller
@ 2013-02-07 6:52 ` Amir Vadai
2013-02-08 4:34 ` David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Amir Vadai @ 2013-02-07 6:52 UTC (permalink / raw)
To: Tom Herbert; +Cc: davem, yevgenyp, netdev
On 06/02/2013 19:58, Tom Herbert wrote:
> Fix issue in Mellanox driver related to BQL. netdev_tx_reset_queue
> was not being called in certain situations where the device was
> being start and stopped. Moved netdev_tx_reset_queue from the reset
> device path to mlx4_en_free_tx_buf which is where the rings are
> cleaned in a reset (specifically from device being stopped).
>
> Signed-off-by: Tom Herbert <therbert@google.com>
> ---
> drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 3 ---
> drivers/net/ethernet/mellanox/mlx4/en_tx.c | 2 ++
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
> index ac1c14f..94042f6 100644
> --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
> +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
> @@ -1323,15 +1323,12 @@ static void mlx4_en_restart(struct work_struct *work)
> watchdog_task);
> struct mlx4_en_dev *mdev = priv->mdev;
> struct net_device *dev = priv->dev;
> - int i;
>
> en_dbg(DRV, priv, "Watchdog task called for port %d\n", priv->port);
>
> mutex_lock(&mdev->state_lock);
> if (priv->port_up) {
> mlx4_en_stop_port(dev, 1);
> - for (i = 0; i < priv->tx_ring_num; i++)
> - netdev_tx_reset_queue(priv->tx_ring[i].tx_queue);
> if (mlx4_en_start_port(dev))
> en_err(priv, "Failed restarting port %d\n", priv->port);
> }
> diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
> index 30724d8..e06fce7 100644
> --- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
> +++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
> @@ -294,6 +294,8 @@ int mlx4_en_free_tx_buf(struct net_device *dev, struct mlx4_en_tx_ring *ring)
> cnt++;
> }
>
> + netdev_tx_reset_queue(ring->tx_queue);
> +
> if (cnt)
> en_dbg(DRV, priv, "Freed %d uncompleted tx descriptors\n", cnt);
>
>
Acked-By: Amir Vadai <amirv@mellanox.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] mlx4_en: Fix BQL reset TX queue call point
2013-02-07 6:52 ` Amir Vadai
@ 2013-02-08 4:34 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2013-02-08 4:34 UTC (permalink / raw)
To: amirv; +Cc: therbert, yevgenyp, netdev
From: Amir Vadai <amirv@mellanox.com>
Date: Thu, 7 Feb 2013 08:52:35 +0200
> On 06/02/2013 19:58, Tom Herbert wrote:
>> Fix issue in Mellanox driver related to BQL. netdev_tx_reset_queue
>> was not being called in certain situations where the device was
>> being start and stopped. Moved netdev_tx_reset_queue from the reset
>> device path to mlx4_en_free_tx_buf which is where the rings are
>> cleaned in a reset (specifically from device being stopped).
>>
>> Signed-off-by: Tom Herbert <therbert@google.com>
...
> Acked-By: Amir Vadai <amirv@mellanox.com>
Applied to net-next, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-02-08 4:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-06 17:58 [PATCH v2] mlx4_en: Fix BQL reset TX queue call point Tom Herbert
2013-02-06 21:11 ` David Miller
2013-02-07 6:52 ` Amir Vadai
2013-02-08 4:34 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.