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

o In iflib_txq_drain():

Browse Source 
- Remove desc_used, which is only ever written to.
  - Remove a dead store to reclaimed.
  - Don't recycle avail.
  - Sort variables according to style(9).
  These changes will make a subsequent commit easier to read.
o In iflib_tx_credits_update(), don't bother checking whether the
  ift_txd_credits_update method pointer is NULL; _iflib_pre_assert()
  asserts upfront that this method has been assigned and functions
  like iflib_{fast_intr_rxtx,netmap_timer_adjust,txq_can_drain}()
  and _task_fn_tx() were already unconditionally relying on the
  method being callable.
This commit is contained in:
Marius Strobl 2019-06-26 15:28:21 +00:00
parent a5b24a2b65
commit c2c5d1e787
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=349414
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/net/iflib.c
View File

@ -3580,10 +3580,10 @@ iflib_txq_drain(struct ifmp_ring *r, uint32_t cidx, uint32_t pidx)
iflib_txq_t txq = r->cookie; iflib_txq_t txq = r->cookie;
if_ctx_t ctx = txq->ift_ctx; if_ctx_t ctx = txq->ift_ctx;
if_t ifp = ctx->ifc_ifp; if_t ifp = ctx->ifc_ifp;
struct mbuf **mp, *m; struct mbuf *m, **mp;
int i, count, consumed, pkt_sent, bytes_sent, mcast_sent, avail; int avail, bytes_sent, consumed, count, err, i, in_use_prev;
int reclaimed, err, in_use_prev, desc_used; int mcast_sent, pkt_sent, reclaimed, txq_avail;
bool do_prefetch, ring, rang; bool do_prefetch, rang, ring;
if (__predict_false(!(if_getdrvflags(ifp) & IFF_DRV_RUNNING) || if (__predict_false(!(if_getdrvflags(ifp) & IFF_DRV_RUNNING) ||
!LINK_ACTIVE(ctx))) { !LINK_ACTIVE(ctx))) {
@ -3621,16 +3621,15 @@ iflib_txq_drain(struct ifmp_ring *r, uint32_t cidx, uint32_t pidx)
avail, ctx->ifc_flags, TXQ_AVAIL(txq)); avail, ctx->ifc_flags, TXQ_AVAIL(txq));
#endif #endif
do_prefetch = (ctx->ifc_flags & IFC_PREFETCH); do_prefetch = (ctx->ifc_flags & IFC_PREFETCH);
avail = TXQ_AVAIL(txq); txq_avail = TXQ_AVAIL(txq);
err = 0; err = 0;
for (desc_used = i = 0; i < count && avail > MAX_TX_DESC(ctx) + 2; i++) { for (i = 0; i < count && txq_avail > MAX_TX_DESC(ctx) + 2; i++) {
int rem = do_prefetch ? count - i : 0; int rem = do_prefetch ? count - i : 0;
mp = _ring_peek_one(r, cidx, i, rem); mp = _ring_peek_one(r, cidx, i, rem);
MPASS(mp != NULL && *mp != NULL); MPASS(mp != NULL && *mp != NULL);
if (__predict_false(*mp == (struct mbuf *)txq)) { if (__predict_false(*mp == (struct mbuf *)txq)) {
consumed++; consumed++;
reclaimed++;
continue; continue;
} }
in_use_prev = txq->ift_in_use; in_use_prev = txq->ift_in_use;
@ -3649,10 +3648,9 @@ iflib_txq_drain(struct ifmp_ring *r, uint32_t cidx, uint32_t pidx)
DBG_COUNTER_INC(tx_sent); DBG_COUNTER_INC(tx_sent);
bytes_sent += m->m_pkthdr.len; bytes_sent += m->m_pkthdr.len;
mcast_sent += !!(m->m_flags & M_MCAST); mcast_sent += !!(m->m_flags & M_MCAST);
avail = TXQ_AVAIL(txq); txq_avail = TXQ_AVAIL(txq);
txq->ift_db_pending += (txq->ift_in_use - in_use_prev); txq->ift_db_pending += (txq->ift_in_use - in_use_prev);
desc_used += (txq->ift_in_use - in_use_prev);
ETHER_BPF_MTAP(ifp, m); ETHER_BPF_MTAP(ifp, m);
if (__predict_false(!(ifp->if_drv_flags & IFF_DRV_RUNNING))) if (__predict_false(!(ifp->if_drv_flags & IFF_DRV_RUNNING)))
break; break;
@ -6155,9 +6153,6 @@ iflib_tx_credits_update(if_ctx_t ctx, iflib_txq_t txq)
int credits_pre = txq->ift_cidx_processed; int credits_pre = txq->ift_cidx_processed;
#endif #endif
if (ctx->isc_txd_credits_update == NULL)
return (0);
bus_dmamap_sync(txq->ift_ifdi->idi_tag, txq->ift_ifdi->idi_map, bus_dmamap_sync(txq->ift_ifdi->idi_tag, txq->ift_ifdi->idi_map,
BUS_DMASYNC_POSTREAD); BUS_DMASYNC_POSTREAD);
if ((credits = ctx->isc_txd_credits_update(ctx->ifc_softc, txq->ift_id, true)) == 0) if ((credits = ctx->isc_txd_credits_update(ctx->ifc_softc, txq->ift_id, true)) == 0)