Author: hselasky
Date: Fri Mar 30 19:26:45 2018
New Revision: 331818
URL: https://svnweb.freebsd.org/changeset/base/331818
Log:
MFC r331456:
Don't wait for completions when a mlx5en(4) device is in internal
error state.
If the device is in internal error state the hardware will not
generate completions. Just move on to destroy the resources.
Submitted by: slavash@
Sponsored by: Mellanox Technologies
Modified:
stable/11/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
==============================================================================
--- stable/11/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Fri Mar 30 19:25:40
2018 (r331817)
+++ stable/11/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Fri Mar 30 19:26:45
2018 (r331818)
@@ -802,8 +802,7 @@ mlx5e_destroy_rq(struct mlx5e_rq *rq)
wq_sz = mlx5_wq_ll_get_size(&rq->wq);
for (i = 0; i != wq_sz; i++) {
if (rq->mbuf[i].mbuf != NULL) {
- bus_dmamap_unload(rq->dma_tag,
- rq->mbuf[i].dma_map);
+ bus_dmamap_unload(rq->dma_tag, rq->mbuf[i].dma_map);
m_freem(rq->mbuf[i].mbuf);
}
bus_dmamap_destroy(rq->dma_tag, rq->mbuf[i].dma_map);
@@ -959,8 +958,11 @@ mlx5e_close_rq(struct mlx5e_rq *rq)
static void
mlx5e_close_rq_wait(struct mlx5e_rq *rq)
{
+ struct mlx5_core_dev *mdev = rq->channel->priv->mdev;
+
/* wait till RQ is empty */
- while (!mlx5_wq_ll_is_empty(&rq->wq)) {
+ while (!mlx5_wq_ll_is_empty(&rq->wq) &&
+ (mdev->state != MLX5_DEVICE_STATE_INTERNAL_ERROR)) {
msleep(4);
rq->cq.mcq.comp(&rq->cq.mcq);
}
@@ -1299,6 +1301,7 @@ void
mlx5e_drain_sq(struct mlx5e_sq *sq)
{
int error;
+ struct mlx5_core_dev *mdev= sq->priv->mdev;
/*
* Check if already stopped.
@@ -1331,7 +1334,8 @@ mlx5e_drain_sq(struct mlx5e_sq *sq)
/* wait till SQ is empty or link is down */
mtx_lock(&sq->lock);
while (sq->cc != sq->pc &&
- (sq->priv->media_status_last & IFM_ACTIVE) != 0) {
+ (sq->priv->media_status_last & IFM_ACTIVE) != 0 &&
+ mdev->state != MLX5_DEVICE_STATE_INTERNAL_ERROR) {
mtx_unlock(&sq->lock);
msleep(1);
sq->cq.mcq.comp(&sq->cq.mcq);
@@ -1348,7 +1352,8 @@ mlx5e_drain_sq(struct mlx5e_sq *sq)
/* wait till SQ is empty */
mtx_lock(&sq->lock);
- while (sq->cc != sq->pc) {
+ while (sq->cc != sq->pc &&
+ mdev->state != MLX5_DEVICE_STATE_INTERNAL_ERROR) {
mtx_unlock(&sq->lock);
msleep(1);
sq->cq.mcq.comp(&sq->cq.mcq);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
