d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve lock and unlock symmetry

Browse Source 
- Move destruction of per-ring locks to netmap_dtor_locked to mirror the
initialization that happens in NIOCREGIF.  Otherwise unloading a netmap-
capable interface that was never put into netmap mode would try to
mtx_destroy an uninitialized mutex, and panic.

- Destroy core_lock in netmap_detach, mirroring init in netmap_attach.

- Also comment out the knlist_destroy for now as there is currently no
knlist_init.

Sponsored by:   ADARA Networks
Reviewed by:    luigi@
This commit is contained in:
Ed Maste 2012-08-09 14:46:52 +00:00
parent e5ecae38fc
commit 2f70fca5ec
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sys/dev/netmap/netmap.c
View File

@ -356,13 +356,20 @@ netmap_dtor_locked(void *data)
lim = na->tx_rings[i].nkr_num_slots; lim = na->tx_rings[i].nkr_num_slots;
for (j = 0; j < lim; j++) for (j = 0; j < lim; j++)
netmap_free_buf(nifp, ring->slot[j].buf_idx); netmap_free_buf(nifp, ring->slot[j].buf_idx);
/* knlist_destroy(&na->tx_rings[i].si.si_note); */
mtx_destroy(&na->tx_rings[i].q_lock);
} }
for (i = 0; i < na->num_rx_rings + 1; i++) { for (i = 0; i < na->num_rx_rings + 1; i++) {
struct netmap_ring *ring = na->rx_rings[i].ring; struct netmap_ring *ring = na->rx_rings[i].ring;
lim = na->rx_rings[i].nkr_num_slots; lim = na->rx_rings[i].nkr_num_slots;
for (j = 0; j < lim; j++) for (j = 0; j < lim; j++)
netmap_free_buf(nifp, ring->slot[j].buf_idx); netmap_free_buf(nifp, ring->slot[j].buf_idx);
/* knlist_destroy(&na->rx_rings[i].si.si_note); */
mtx_destroy(&na->rx_rings[i].q_lock);
} }
/* XXX kqueue(9) needed; these will mirror knlist_init. */
/* knlist_destroy(&na->tx_si.si_note); */
/* knlist_destroy(&na->rx_si.si_note); */
NMA_UNLOCK(); NMA_UNLOCK();
netmap_free_rings(na); netmap_free_rings(na);
wakeup(na); wakeup(na);
@ -1318,13 +1325,14 @@ netmap_attach(struct netmap_adapter *na, int num_queues)
ifp->if_capabilities |= IFCAP_NETMAP; ifp->if_capabilities |= IFCAP_NETMAP;
na = buf; na = buf;
/* Core lock initialized here. Others are initialized after
* netmap_if_new.
*/
mtx_init(&na->core_lock, "netmap core lock", MTX_NETWORK_LOCK,
MTX_DEF);
if (na->nm_lock == NULL) { if (na->nm_lock == NULL) {
ND("using default locks for %s", ifp->if_xname); ND("using default locks for %s", ifp->if_xname);
na->nm_lock = netmap_lock_wrapper; na->nm_lock = netmap_lock_wrapper;
/* core lock initialized here.
* others initialized after netmap_if_new
*/
mtx_init(&na->core_lock, "netmap core lock", MTX_NETWORK_LOCK, MTX_DEF);
} }
} }
#ifdef linux #ifdef linux
@ -1348,22 +1356,13 @@ netmap_attach(struct netmap_adapter *na, int num_queues)
void void
netmap_detach(struct ifnet *ifp) netmap_detach(struct ifnet *ifp)
{ {
u_int i;
struct netmap_adapter *na = NA(ifp); struct netmap_adapter *na = NA(ifp);
if (!na) if (!na)
return; return;
for (i = 0; i < na->num_tx_rings + 1; i++) { mtx_destroy(&na->core_lock);
knlist_destroy(&na->tx_rings[i].si.si_note);
mtx_destroy(&na->tx_rings[i].q_lock);
}
for (i = 0; i < na->num_rx_rings + 1; i++) {
knlist_destroy(&na->rx_rings[i].si.si_note);
mtx_destroy(&na->rx_rings[i].q_lock);
}
knlist_destroy(&na->tx_si.si_note);
knlist_destroy(&na->rx_si.si_note);
bzero(na, sizeof(*na)); bzero(na, sizeof(*na));
WNA(ifp) = NULL; WNA(ifp) = NULL;
free(na, M_DEVBUF); free(na, M_DEVBUF);