Date: Mon, 26 Jul 2021 16:13:53 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: c41403c5cae2 - stable/13 - mlx5en: Check for pci_channel_offline() when draining sendqueue. Message-ID: <202107261613.16QGDrLB006038@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=c41403c5cae251f0a531c3d3491a1401368c5cfd commit c41403c5cae251f0a531c3d3491a1401368c5cfd Author: Hans Petter Selasky <hselasky@FreeBSD.org> AuthorDate: 2021-06-16 13:01:56 +0000 Commit: Hans Petter Selasky <hselasky@FreeBSD.org> CommitDate: 2021-07-26 16:04:32 +0000 mlx5en: Check for pci_channel_offline() when draining sendqueue. This speeds up detach in hypervisor environments. Reviewed by: kib Sponsored by: Mellanox Technologies // NVIDIA Networking (cherry picked from commit 4692d9808e61958675d91ec595b5732c8d1fa700) --- sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index fc9ffc01a0df..97438de3bc2a 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -1875,7 +1875,8 @@ mlx5e_drain_sq(struct mlx5e_sq *sq) mtx_lock(&sq->lock); while (sq->cc != sq->pc && (sq->priv->media_status_last & IFM_ACTIVE) != 0 && - mdev->state != MLX5_DEVICE_STATE_INTERNAL_ERROR) { + mdev->state != MLX5_DEVICE_STATE_INTERNAL_ERROR && + pci_channel_offline(mdev->pdev) == 0) { mtx_unlock(&sq->lock); msleep(1); sq->cq.mcq.comp(&sq->cq.mcq, NULL); @@ -1893,7 +1894,8 @@ mlx5e_drain_sq(struct mlx5e_sq *sq) /* wait till SQ is empty */ mtx_lock(&sq->lock); while (sq->cc != sq->pc && - mdev->state != MLX5_DEVICE_STATE_INTERNAL_ERROR) { + mdev->state != MLX5_DEVICE_STATE_INTERNAL_ERROR && + pci_channel_offline(mdev->pdev) == 0) { mtx_unlock(&sq->lock); msleep(1); sq->cq.mcq.comp(&sq->cq.mcq, NULL);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107261613.16QGDrLB006038>