Browse files

Do not hold the vtnet Rx queue lock when calling up into the stack

This matches other similar drivers and avoids various LOR warnings.

Approved by:	re (marius)
  • Loading branch information...
1 parent e19bd87 commit 181aa517b67152fddacaf403324243217fa46ca0 @bryanv bryanv committed Oct 5, 2013
Showing with 6 additions and 2 deletions.
  1. +6 −2 sys/dev/virtio/network/if_vtnet.c
View
8 sys/dev/virtio/network/if_vtnet.c
@@ -1700,9 +1700,9 @@ vtnet_rxq_input(struct vtnet_rxq *rxq, struct mbuf *m,
rxq->vtnrx_stats.vrxs_ipackets++;
rxq->vtnrx_stats.vrxs_ibytes += m->m_pkthdr.len;
- /* VTNET_RXQ_UNLOCK(rxq); */
+ VTNET_RXQ_UNLOCK(rxq);
(*ifp->if_input)(ifp, m);
- /* VTNET_RXQ_LOCK(rxq); */
+ VTNET_RXQ_LOCK(rxq);
}
static int
@@ -1782,6 +1782,10 @@ vtnet_rxq_eof(struct vtnet_rxq *rxq)
m_adj(m, adjsz);
vtnet_rxq_input(rxq, m, hdr);
+
+ /* Must recheck after dropping the Rx lock. */
+ if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
+ break;
}
if (deq > 0)

0 comments on commit 181aa51

Please sign in to comment.