netdev - Re: [PATCH net-next] mlx4_en: Change BQL reset TX queue call point

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Sun, 3 Feb 2013 08:39:22 +0200
From:	Amir Vadai <amirv@...lanox.com>
To:	Tom Herbert <therbert@...gle.com>
CC:	<yevgenyp@...lanox.com>, <davem@...emloft.net>,
	<netdev@...r.kernel.org>
Subject: Re: [PATCH net-next] mlx4_en: Change BQL reset TX queue call point

On 02/02/2013 03:02, 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@...gle.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 b467513..075fdff 100644
> --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
> +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
> @@ -1284,15 +1284,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);
> -		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 c579311..3c17732 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@...lanox.com>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html