Two fixes:
- Run send queue down to completion, not just one packet. It has been observed to cause a stall queue otherwise. - Prevent queueing multiple function calls to a node. MFC after: 3 days
This commit is contained in:
parent
83154c48d6
commit
e497d0cdba
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=155388
@ -217,43 +217,37 @@ ng_eiface_start2(node_p node, hook_p hook, void *arg1, int arg2)
|
||||
(ifp->if_drv_flags & IFF_DRV_RUNNING)))
|
||||
return;
|
||||
|
||||
/* Don't do anything if output is active */
|
||||
if (ifp->if_drv_flags & IFF_DRV_OACTIVE)
|
||||
return;
|
||||
for (;;) {
|
||||
/*
|
||||
* Grab a packet to transmit.
|
||||
*/
|
||||
IF_DEQUEUE(&ifp->if_snd, m);
|
||||
|
||||
ifp->if_drv_flags |= IFF_DRV_OACTIVE;
|
||||
/* If there's nothing to send, break. */
|
||||
if (m == NULL)
|
||||
break;
|
||||
|
||||
/*
|
||||
* Grab a packet to transmit.
|
||||
*/
|
||||
IF_DEQUEUE(&ifp->if_snd, m);
|
||||
/*
|
||||
* Berkeley packet filter.
|
||||
* Pass packet to bpf if there is a listener.
|
||||
* XXX is this safe? locking?
|
||||
*/
|
||||
BPF_MTAP(ifp, m);
|
||||
|
||||
/* If there's nothing to send, return. */
|
||||
if (m == NULL) {
|
||||
ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
|
||||
return;
|
||||
}
|
||||
/* Copy length before the mbuf gets invalidated */
|
||||
len = m->m_pkthdr.len;
|
||||
|
||||
/*
|
||||
* Berkeley packet filter.
|
||||
* Pass packet to bpf if there is a listener.
|
||||
* XXX is this safe? locking?
|
||||
*/
|
||||
BPF_MTAP(ifp, m);
|
||||
/*
|
||||
* Send packet; if hook is not connected, mbuf will get
|
||||
* freed.
|
||||
*/
|
||||
NG_SEND_DATA_ONLY(error, priv->ether, m);
|
||||
|
||||
/* Copy length before the mbuf gets invalidated */
|
||||
len = m->m_pkthdr.len;
|
||||
|
||||
/*
|
||||
* Send packet; if hook is not connected, mbuf will get
|
||||
* freed.
|
||||
*/
|
||||
NG_SEND_DATA_ONLY(error, priv->ether, m);
|
||||
|
||||
/* Update stats */
|
||||
if (error == 0) {
|
||||
ifp->if_obytes += len;
|
||||
ifp->if_opackets++;
|
||||
/* Update stats */
|
||||
if (error == 0) {
|
||||
ifp->if_obytes += len;
|
||||
ifp->if_opackets++;
|
||||
}
|
||||
}
|
||||
|
||||
ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
|
||||
@ -280,6 +274,12 @@ ng_eiface_start(struct ifnet *ifp)
|
||||
|
||||
const priv_p priv = (priv_p)ifp->if_softc;
|
||||
|
||||
/* Don't do anything if output is active */
|
||||
if (ifp->if_drv_flags & IFF_DRV_OACTIVE)
|
||||
return;
|
||||
|
||||
ifp->if_drv_flags |= IFF_DRV_OACTIVE;
|
||||
|
||||
ng_send_fn(priv->node, NULL, &ng_eiface_start2, ifp, 0);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user