From owner-freebsd-net@FreeBSD.ORG Tue Feb 5 17:44:09 2013 Return-Path: Delivered-To: freebsd-net@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id C8130A0E; Tue, 5 Feb 2013 17:44:09 +0000 (UTC) (envelope-from rrs@lakerest.net) Received: from lakerest.net (lakerest.net [70.155.160.98]) by mx1.freebsd.org (Postfix) with ESMTP id EB918C2C; Tue, 5 Feb 2013 17:44:08 +0000 (UTC) Received: from [10.1.1.101] (bsd4.lakerest.net [70.155.160.102]) (authenticated bits=0) by lakerest.net (8.14.4/8.14.3) with ESMTP id r15HiIPr042847 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Tue, 5 Feb 2013 12:44:18 -0500 (EST) (envelope-from rrs@lakerest.net) Subject: Re: Driver patch to look at... Mime-Version: 1.0 (Apple Message framework v1283) Content-Type: multipart/mixed; boundary="Apple-Mail=_653FCD68-7101-4A93-A68D-4D518FFFEDD1" From: Randall Stewart In-Reply-To: <201302051213.51401.jhb@freebsd.org> Date: Tue, 5 Feb 2013 12:44:01 -0500 Message-Id: <0D421326-9A80-4E21-A18E-E717F5C02164@lakerest.net> References: <39571D84-A8C0-46A4-8EFA-CF74D862EAAE@lakerest.net> <201302051213.51401.jhb@freebsd.org> To: John Baldwin X-Mailer: Apple Mail (2.1283) Cc: freebsd-net@freebsd.org, Robert Watson , Jack Vogel , Kip Macy X-BeenThere: freebsd-net@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Networking and TCP/IP with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Feb 2013 17:44:09 -0000 --Apple-Mail=_653FCD68-7101-4A93-A68D-4D518FFFEDD1 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii Actually, no it is used. If you look in if_var.h int he drbr_putback() function, it does a buf_ring_swap when the old mbuf pointer does not equal the new mbuf pointer. This *does* happen, I crashed at least once yesterday when the igb driver did something to free the original mbuf and return a new mbuf with the data (prepend or some such). I also have found several issues that I have fixed this morning.. its = been crash city on my test beds.. Here is the latest patch with all fixes and suggested changes from = emaste (thanks Ed) R --Apple-Mail=_653FCD68-7101-4A93-A68D-4D518FFFEDD1 Content-Disposition: attachment; filename=driver_patch.txt Content-Type: text/plain; name="driver_patch.txt" Content-Transfer-Encoding: quoted-printable Index: dev/e1000/if_em.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- dev/e1000/if_em.c (revision 246357) +++ dev/e1000/if_em.c (working copy) @@ -894,7 +894,7 @@ static int em_mq_start_locked(struct ifnet *ifp, struct tx_ring *txr, struct mbuf = *m) { struct adapter *adapter =3D txr->adapter; - struct mbuf *next; + struct mbuf *next, *snext; int err =3D 0, enq =3D 0; =20 if ((ifp->if_drv_flags & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) !=3D= @@ -905,22 +905,25 @@ em_mq_start_locked(struct ifnet *ifp, struct tx_ri } =20 enq =3D 0; - if (m =3D=3D NULL) { - next =3D drbr_dequeue(ifp, txr->br); - } else if (drbr_needs_enqueue(ifp, txr->br)) { - if ((err =3D drbr_enqueue(ifp, txr->br, m)) !=3D 0) + if (m !=3D NULL) { + err =3D drbr_enqueue(ifp, txr->br, m); + if (err) { return (err); - next =3D drbr_dequeue(ifp, txr->br); - } else - next =3D m; + } + }=20 =20 /* Process the queue */ - while (next !=3D NULL) { + while ((next =3D drbr_peek(ifp, txr->br)) !=3D NULL) { + snext =3D next; if ((err =3D em_xmit(txr, &next)) !=3D 0) { - if (next !=3D NULL) - err =3D drbr_enqueue(ifp, txr->br, = next); - break; + if (next =3D=3D NULL) { + drbr_advance(ifp, txr->br); + } else { + drbr_putback(ifp, txr->br, next, snext); + } + break; } + drbr_advance(ifp, txr->br); enq++; ifp->if_obytes +=3D next->m_pkthdr.len; if (next->m_flags & M_MCAST) @@ -928,7 +931,6 @@ em_mq_start_locked(struct ifnet *ifp, struct tx_ri ETHER_BPF_MTAP(ifp, next); if ((ifp->if_drv_flags & IFF_DRV_RUNNING) =3D=3D 0) break; - next =3D drbr_dequeue(ifp, txr->br); } =20 if (enq > 0) { Index: dev/e1000/if_igb.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- dev/e1000/if_igb.c (revision 246357) +++ dev/e1000/if_igb.c (working copy) @@ -965,12 +965,13 @@ igb_mq_start(struct ifnet *ifp, struct mbuf *m) ** out-of-order delivery, but=20 ** settle for it if that fails */ - if (m) + if (m !=3D NULL) drbr_enqueue(ifp, txr->br, m); err =3D igb_mq_start_locked(ifp, txr); IGB_TX_UNLOCK(txr); } else { - err =3D drbr_enqueue(ifp, txr->br, m); + if (m !=3D NULL) + err =3D drbr_enqueue(ifp, txr->br, m); taskqueue_enqueue(que->tq, &txr->txq_task); } =20 @@ -981,7 +982,7 @@ static int igb_mq_start_locked(struct ifnet *ifp, struct tx_ring *txr) { struct adapter *adapter =3D txr->adapter; - struct mbuf *next; + struct mbuf *next, *snext; int err =3D 0, enq; =20 IGB_TX_LOCK_ASSERT(txr); @@ -994,12 +995,23 @@ igb_mq_start_locked(struct ifnet *ifp, struct tx_r enq =3D 0; =20 /* Process the queue */ - while ((next =3D drbr_dequeue(ifp, txr->br)) !=3D NULL) { + while ((next =3D drbr_peek(ifp, txr->br)) !=3D NULL) { + snext =3D next; if ((err =3D igb_xmit(txr, &next)) !=3D 0) { - if (next !=3D NULL) - err =3D drbr_enqueue(ifp, txr->br, = next); + if (next =3D=3D NULL) { + /* It was freed, move forward */ + drbr_advance(ifp, txr->br); + } else { + /*=20 + * Still have one left, it may not be + * the same since the transmit function + * may have changed it. + */ + drbr_putback(ifp, txr->br, next, snext); + } break; } + drbr_advance(ifp, txr->br); enq++; ifp->if_obytes +=3D next->m_pkthdr.len; if (next->m_flags & M_MCAST) Index: dev/oce/oce_if.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- dev/oce/oce_if.c (revision 246357) +++ dev/oce/oce_if.c (working copy) @@ -1154,6 +1154,7 @@ oce_multiq_transmit(struct ifnet *ifp, struct mbuf POCE_SOFTC sc =3D ifp->if_softc; int status =3D 0, queue_index =3D 0; struct mbuf *next =3D NULL; + struct mbuf *snext; struct buf_ring *br =3D NULL; =20 br =3D wq->br; @@ -1166,29 +1167,28 @@ oce_multiq_transmit(struct ifnet *ifp, struct = mbuf return status; } =20 - if (m =3D=3D NULL) - next =3D drbr_dequeue(ifp, br); =09 - else if (drbr_needs_enqueue(ifp, br)) { + if (m !=3D NULL) { if ((status =3D drbr_enqueue(ifp, br, m)) !=3D 0) return status; - next =3D drbr_dequeue(ifp, br); - } else - next =3D m; - - while (next !=3D NULL) { + }=20 + while ((next =3D drbr_peek(ifp, br)) !=3D NULL) { + snext =3D next; if (oce_tx(sc, &next, queue_index)) { - if (next !=3D NULL) { + if (next =3D=3D NULL) { + drbr_advance(ifp, br); + } else { + drbr_putback(ifp, br, next, snext); wq->tx_stats.tx_stops ++; ifp->if_drv_flags |=3D IFF_DRV_OACTIVE; status =3D drbr_enqueue(ifp, br, next); } =20 break; } + drbr_advance(ifp, br); ifp->if_obytes +=3D next->m_pkthdr.len; if (next->m_flags & M_MCAST) ifp->if_omcasts++; ETHER_BPF_MTAP(ifp, next); - next =3D drbr_dequeue(ifp, br); } =20 return status; Index: dev/ixgbe/ixgbe.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- dev/ixgbe/ixgbe.c (revision 246357) +++ dev/ixgbe/ixgbe.c (working copy) @@ -821,7 +821,7 @@ static int ixgbe_mq_start_locked(struct ifnet *ifp, struct tx_ring *txr, struct = mbuf *m) { struct adapter *adapter =3D txr->adapter; - struct mbuf *next; + struct mbuf *next, *snext; int enqueued, err =3D 0; =20 if (((ifp->if_drv_flags & IFF_DRV_RUNNING) =3D=3D 0) || @@ -832,22 +832,25 @@ ixgbe_mq_start_locked(struct ifnet *ifp, struct tx } =20 enqueued =3D 0; - if (m =3D=3D NULL) { - next =3D drbr_dequeue(ifp, txr->br); - } else if (drbr_needs_enqueue(ifp, txr->br)) { - if ((err =3D drbr_enqueue(ifp, txr->br, m)) !=3D 0) + if (m !=3D NULL) { + err =3D drbr_enqueue(ifp, txr->br, m); + if (err) { return (err); - next =3D drbr_dequeue(ifp, txr->br); - } else - next =3D m; + } + } =20 /* Process the queue */ - while (next !=3D NULL) { + while ((next =3D drbr_peek(ifp, txr->br)) !=3D NULL) { + snext =3D next; if ((err =3D ixgbe_xmit(txr, &next)) !=3D 0) { - if (next !=3D NULL) - err =3D drbr_enqueue(ifp, txr->br, = next); + if (next =3D=3D NULL) { + drbr_advance(ifp, txr->br); + } else { + drbr_putback(ifp, txr->br, next, snext); + } break; } + drbr_advance(ifp, txr->br); enqueued++; /* Send a copy of the frame to the BPF listener */ ETHER_BPF_MTAP(ifp, next); @@ -855,7 +858,6 @@ ixgbe_mq_start_locked(struct ifnet *ifp, struct tx break; if (txr->tx_avail < IXGBE_TX_OP_THRESHOLD) ixgbe_txeof(txr); - next =3D drbr_dequeue(ifp, txr->br); } =20 if (enqueued > 0) { Index: dev/ixgbe/ixv.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- dev/ixgbe/ixv.c (revision 246357) +++ dev/ixgbe/ixv.c (working copy) @@ -605,7 +605,7 @@ static int ixv_mq_start_locked(struct ifnet *ifp, struct tx_ring *txr, struct mbuf = *m) { struct adapter *adapter =3D txr->adapter; - struct mbuf *next; + struct mbuf *next, *snext; int enqueued, err =3D 0; =20 if ((ifp->if_drv_flags & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) !=3D= @@ -620,22 +620,24 @@ ixv_mq_start_locked(struct ifnet *ifp, struct tx_r ixv_txeof(txr); =20 enqueued =3D 0; - if (m =3D=3D NULL) { - next =3D drbr_dequeue(ifp, txr->br); - } else if (drbr_needs_enqueue(ifp, txr->br)) { - if ((err =3D drbr_enqueue(ifp, txr->br, m)) !=3D 0) + if (m !=3D NULL) { + err =3D drbr_enqueue(ifp, txr->br, m); + if (err) { return (err); - next =3D drbr_dequeue(ifp, txr->br); - } else - next =3D m; - + } + } /* Process the queue */ - while (next !=3D NULL) { + while ((next =3D drbr_peek(ifp, txr->br)) !=3D NULL) { + snext =3D next; if ((err =3D ixv_xmit(txr, &next)) !=3D 0) { - if (next !=3D NULL) - err =3D drbr_enqueue(ifp, txr->br, = next); + if (next =3D=3D NULL) { + drbr_advance(ifp, txr->br); + } else { + drbr_putback(ifp, txr->br, next, snext); + } break; } + drbr_advance(ifp, txr->br); enqueued++; ifp->if_obytes +=3D next->m_pkthdr.len; if (next->m_flags & M_MCAST) @@ -648,7 +650,6 @@ ixv_mq_start_locked(struct ifnet *ifp, struct tx_r ifp->if_drv_flags |=3D IFF_DRV_OACTIVE; break; } - next =3D drbr_dequeue(ifp, txr->br); } =20 if (enqueued > 0) { Index: dev/bxe/if_bxe.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- dev/bxe/if_bxe.c (revision 246357) +++ dev/bxe/if_bxe.c (working copy) @@ -9491,7 +9491,7 @@ bxe_tx_mq_start_locked(struct ifnet *ifp, struct bxe_fastpath *fp, struct mbuf *m) { struct bxe_softc *sc; - struct mbuf *next; + struct mbuf *next, *snext; int depth, rc, tx_count; =20 sc =3D fp->sc; @@ -9506,24 +9506,16 @@ bxe_tx_mq_start_locked(struct ifnet *ifp, =20 BXE_FP_LOCK_ASSERT(fp); =20 - if (m =3D=3D NULL) { - /* No new work, check for pending frames. */ - next =3D drbr_dequeue(ifp, fp->br); - } else if (drbr_needs_enqueue(ifp, fp->br)) { - /* Both new and pending work, maintain packet order. */ + if (m !=3D NULL) { rc =3D drbr_enqueue(ifp, fp->br, m); if (rc !=3D 0) { fp->tx_soft_errors++; goto bxe_tx_mq_start_locked_exit; } - next =3D drbr_dequeue(ifp, fp->br); - } else - /* New work only, nothing pending. */ - next =3D m; - + } /* Keep adding entries while there are frames to send. */ - while (next !=3D NULL) { - + while ((next =3D drbr_peek(ifp, fp->br)) !=3D NULL) { + snext =3D next; /* The transmit mbuf now belongs to us, keep track of = it. */ fp->tx_mbuf_alloc++; =20 @@ -9537,23 +9529,22 @@ bxe_tx_mq_start_locked(struct ifnet *ifp, if (__predict_false(rc !=3D 0)) { fp->tx_encap_failures++; /* Very Bad Frames(tm) may have been dropped. */ - if (next !=3D NULL) { + if (next =3D=3D NULL) { + drbr_advance(ifp, fp->br); + } else { + drbr_putback(ifp, fp->br, next, snext); /* * Mark the TX queue as full and save * the frame. */ ifp->if_drv_flags |=3D IFF_DRV_OACTIVE; fp->tx_frame_deferred++; - - /* This may reorder frame. */ - rc =3D drbr_enqueue(ifp, fp->br, next); fp->tx_mbuf_alloc--; } - /* Stop looking for more work. */ break; } - + drbr_advance(ifp, fp->br); /* The transmit frame was enqueued successfully. */ tx_count++; =20 @@ -9574,8 +9565,6 @@ bxe_tx_mq_start_locked(struct ifnet *ifp, ifp->if_drv_flags &=3D ~IFF_DRV_OACTIVE; break; } - - next =3D drbr_dequeue(ifp, fp->br); } =20 /* No TX packets were dequeued. */ Index: net/if_var.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- net/if_var.h (revision 246357) +++ net/if_var.h (working copy) @@ -622,6 +622,46 @@ drbr_enqueue(struct ifnet *ifp, struct buf_ring *b } =20 static __inline void +drbr_putback(struct ifnet *ifp, struct buf_ring *br, struct mbuf *new, = struct mbuf *prev) +{ + /* + * The top of the list needs to be swapped=20 + * for this one. + */ +#ifdef ALTQ + if (ifp !=3D NULL && ALTQ_IS_ENABLED(&ifp->if_snd)) { + /*=20 + * Peek in altq case dequeued it + * so put it back. + */ + IFQ_DRV_PREPEND(&ifp->if_snd, new); + return; + } +#endif + if (new !=3D prev)=20 + buf_ring_swap(br, new, prev); +} + +static __inline struct mbuf * +drbr_peek(struct ifnet *ifp, struct buf_ring *br) +{ +#ifdef ALTQ + struct mbuf *m; + if (ifp !=3D NULL && ALTQ_IS_ENABLED(&ifp->if_snd)) { + /*=20 + * Pull it off like a dequeue + * since drbr_advance() does nothing + * for altq and drbr_putback() will + * use the old prepend function. + */ + IFQ_DEQUEUE(&ifp->if_snd, m); + return (m); + } +#endif + return(buf_ring_peek(br)); +} + +static __inline void drbr_flush(struct ifnet *ifp, struct buf_ring *br) { struct mbuf *m; @@ -648,7 +688,7 @@ drbr_dequeue(struct ifnet *ifp, struct buf_ring *b #ifdef ALTQ struct mbuf *m; =20 - if (ALTQ_IS_ENABLED(&ifp->if_snd)) {=09 + if (ifp !=3D NULL && ALTQ_IS_ENABLED(&ifp->if_snd)) {=09 IFQ_DEQUEUE(&ifp->if_snd, m); return (m); } @@ -656,6 +696,18 @@ drbr_dequeue(struct ifnet *ifp, struct buf_ring *b return (buf_ring_dequeue_sc(br)); } =20 +static __inline void +drbr_advance(struct ifnet *ifp, struct buf_ring *br) +{ +#ifdef ALTQ + /* Nothing to do here since peek dequeues in altq case */ + if (ifp !=3D NULL && ALTQ_IS_ENABLED(&ifp->if_snd)) + return; +#endif + return (buf_ring_advance_sc(br)); +} + + static __inline struct mbuf * drbr_dequeue_cond(struct ifnet *ifp, struct buf_ring *br, int (*func) (struct mbuf *, void *), void *arg)=20 Index: sys/buf_ring.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sys/buf_ring.h (revision 246357) +++ sys/buf_ring.h (working copy) @@ -208,6 +208,51 @@ buf_ring_dequeue_sc(struct buf_ring *br) } =20 /* + * single-consumer advance after a peek + * use where it is protected by a lock + * e.g. a network driver's tx queue lock + */ +static __inline void +buf_ring_advance_sc(struct buf_ring *br) +{ + uint32_t cons_head, cons_next; + uint32_t prod_tail; +=09 + cons_head =3D br->br_cons_head; + prod_tail =3D br->br_prod_tail; +=09 + cons_next =3D (cons_head + 1) & br->br_cons_mask; + if (cons_head =3D=3D prod_tail)=20 + return; + br->br_cons_head =3D cons_next; +#ifdef DEBUG_BUFRING + br->br_ring[cons_head] =3D NULL; +#endif + br->br_cons_tail =3D cons_next; +} + +/* + * Used to return a differnt mbuf to the + * top of the ring. This can happen if + * the driver changed the packets (some defragmentation + * for example) and then realized the transmit + * ring was full. In such a case the old packet + * is now freed, but we want the order of the actual + * data (being sent in the new packet) to remain + * the same. + */ +static __inline void +buf_ring_swap(struct buf_ring *br, void *new, void *old) +{ + int ret; + if (br->br_cons_head =3D=3D br->br_prod_tail)=20 + /* Huh? */ + return; + ret =3D atomic_cmpset_long((uint64_t = *)&br->br_ring[br->br_cons_head], (uint64_t)old, (uint64_t)new); + KASSERT(ret, ("Swap out failed old:%p new:%p ret:%d", old, new, = ret)); +} + +/* * return a pointer to the first entry in the ring * without modifying it, or NULL if the ring is empty * race-prone if not protected by a lock Index: ofed/drivers/net/mlx4/en_tx.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- ofed/drivers/net/mlx4/en_tx.c (revision 246357) +++ ofed/drivers/net/mlx4/en_tx.c (working copy) @@ -919,7 +919,7 @@ mlx4_en_transmit_locked(struct ifnet *dev, int tx_ { struct mlx4_en_priv *priv =3D netdev_priv(dev); struct mlx4_en_tx_ring *ring; - struct mbuf *next; + struct mbuf *next, *snext; int enqueued, err =3D 0; =20 ring =3D &priv->tx_ring[tx_ind]; @@ -931,22 +931,22 @@ mlx4_en_transmit_locked(struct ifnet *dev, int tx_ } =20 enqueued =3D 0; - if (m =3D=3D NULL) { - next =3D drbr_dequeue(dev, ring->br); - } else if (drbr_needs_enqueue(dev, ring->br)) { + if (m !=3D NULL) { if ((err =3D drbr_enqueue(dev, ring->br, m)) !=3D 0) return (err); - next =3D drbr_dequeue(dev, ring->br); - } else - next =3D m; - + } /* Process the queue */ - while (next !=3D NULL) { + while ((next =3D drbr_peek(ifp, txr->br)) !=3D NULL) { + snext =3D next; if ((err =3D mlx4_en_xmit(dev, tx_ind, &next)) !=3D 0) { - if (next !=3D NULL) - err =3D drbr_enqueue(dev, ring->br, = next); + if (next =3D=3D NULL) { + drbr_advance(ifp, txr->br); + } else { + drbr_putback(ifp, txr->br, next, snext); + } break; } + drbr_advance(ifp, txr->br); enqueued++; dev->if_obytes +=3D next->m_pkthdr.len; if (next->m_flags & M_MCAST) @@ -955,7 +955,6 @@ mlx4_en_transmit_locked(struct ifnet *dev, int tx_ ETHER_BPF_MTAP(dev, next); if ((dev->if_drv_flags & IFF_DRV_RUNNING) =3D=3D 0) break; - next =3D drbr_dequeue(dev, ring->br); } =20 if (enqueued > 0) --Apple-Mail=_653FCD68-7101-4A93-A68D-4D518FFFEDD1 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On Feb 5, 2013, at 12:13 PM, John Baldwin wrote: > On Tuesday, February 05, 2013 10:24:24 am Randall Stewart wrote: >> Here is an updated patch=85 sigh.. I foobar'd the ALTQ stuff.. lots = of crashes=20 > ;-D >=20 > Heh, I like this better, thanks. I think you can remove = buf_ring_swap() as it=20 > is no longer used? >=20 > --=20 > John Baldwin > _______________________________________________ > freebsd-net@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-net > To unsubscribe, send any mail to "freebsd-net-unsubscribe@freebsd.org" >=20 ------------------------------ Randall Stewart 803-317-4952 (cell) --Apple-Mail=_653FCD68-7101-4A93-A68D-4D518FFFEDD1--