svn commit: r242370 - stable/8/sys/dev/cxgb
Navdeep Parhar
np at FreeBSD.org
Tue Oct 30 19:24:06 UTC 2012
Author: np
Date: Tue Oct 30 19:24:05 2012
New Revision: 242370
URL: http://svn.freebsd.org/changeset/base/242370
Log:
MFC r242087:
Initialize the response queue mutex a bit earlier to avoid a panic that
occurs if t3_sge_alloc_qset fails and then t3_free_qset attempts to
destroy an uninitialized mutex.
Modified:
stable/8/sys/dev/cxgb/cxgb_sge.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/dev/ (props changed)
stable/8/sys/dev/cxgb/ (props changed)
Modified: stable/8/sys/dev/cxgb/cxgb_sge.c
==============================================================================
--- stable/8/sys/dev/cxgb/cxgb_sge.c Tue Oct 30 19:21:53 2012 (r242369)
+++ stable/8/sys/dev/cxgb/cxgb_sge.c Tue Oct 30 19:24:05 2012 (r242370)
@@ -2593,6 +2593,10 @@ t3_sge_alloc_qset(adapter_t *sc, u_int i
goto err;
}
+ snprintf(q->rspq.lockbuf, RSPQ_NAME_LEN, "t3 rspq lock %d:%d",
+ device_get_unit(sc->dev), irq_vec_idx);
+ MTX_INIT(&q->rspq.lock, q->rspq.lockbuf, NULL, MTX_DEF);
+
for (i = 0; i < ntxq; ++i) {
size_t sz = i == TXQ_CTRL ? 0 : sizeof(struct tx_sw_desc);
@@ -2708,11 +2712,7 @@ t3_sge_alloc_qset(adapter_t *sc, u_int i
goto err_unlock;
}
}
-
- snprintf(q->rspq.lockbuf, RSPQ_NAME_LEN, "t3 rspq lock %d:%d",
- device_get_unit(sc->dev), irq_vec_idx);
- MTX_INIT(&q->rspq.lock, q->rspq.lockbuf, NULL, MTX_DEF);
-
+
mtx_unlock_spin(&sc->sge.reg_lock);
t3_update_qset_coalesce(q, p);
q->port = pi;
More information about the svn-src-stable-8
mailing list