From owner-svn-src-head@FreeBSD.ORG Tue Dec 2 07:01:18 2008 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D03FF1065670; Tue, 2 Dec 2008 07:01:18 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CCC048FC0A; Tue, 2 Dec 2008 07:01:18 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mB271IOR051799; Tue, 2 Dec 2008 07:01:18 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mB271IWm051798; Tue, 2 Dec 2008 07:01:18 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200812020701.mB271IWm051798@svn.freebsd.org> From: Kip Macy Date: Tue, 2 Dec 2008 07:01:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r185549 - head/sys/dev/cxgb X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Dec 2008 07:01:18 -0000 Author: kmacy Date: Tue Dec 2 07:01:18 2008 New Revision: 185549 URL: http://svn.freebsd.org/changeset/base/185549 Log: - fix bug where dnsperf would stop transmitting after a few seconds - break complex conditionals in to multiple lines to avoid wrapping - remove copious unused debug statements - be more aggressive about cleaning in the calling thread - eliminate usage of ENOSPC - increase number of iterations that cxgbsp can do - eliminate "initerr" usage to simplify ENOBUFS handling - when coalescing pass all packets to BPF - always set overrun if hardware queue is full Modified: head/sys/dev/cxgb/cxgb_multiq.c Modified: head/sys/dev/cxgb/cxgb_multiq.c ============================================================================== --- head/sys/dev/cxgb/cxgb_multiq.c Tue Dec 2 06:50:26 2008 (r185548) +++ head/sys/dev/cxgb/cxgb_multiq.c Tue Dec 2 07:01:18 2008 (r185549) @@ -128,7 +128,8 @@ cxgb_pcpu_enqueue_packet_(struct sge_qse txq->txq_drops++; m_freem(m); } - if (wakeup_tx_thread && ((txq->flags & TXQ_TRANSMITTING) == 0)) + if (wakeup_tx_thread && !err && + ((txq->flags & TXQ_TRANSMITTING) == 0)) wakeup(qs); return (err); @@ -195,7 +196,6 @@ cxgb_dequeue_packet(struct sge_txq *txq, return (0); if (txq->immpkt != NULL) { - DPRINTF("immediate packet\n"); m_vec[0] = txq->immpkt; txq->immpkt = NULL; return (1); @@ -209,8 +209,10 @@ cxgb_dequeue_packet(struct sge_txq *txq, count = 1; m_vec[0] = m; - if (m->m_pkthdr.tso_segsz > 0 || m->m_pkthdr.len > TX_WR_SIZE_MAX || - m->m_next != NULL || (coalesce_tx_enable == 0)) { + if (m->m_pkthdr.tso_segsz > 0 || + m->m_pkthdr.len > TX_WR_SIZE_MAX || + m->m_next != NULL || + (coalesce_tx_enable == 0)) { return (count); } @@ -218,8 +220,9 @@ cxgb_dequeue_packet(struct sge_txq *txq, for (m = buf_ring_peek(txq->txq_mr); m != NULL; m = buf_ring_peek(txq->txq_mr)) { - if (m->m_pkthdr.tso_segsz > 0 || - size + m->m_pkthdr.len > TX_WR_SIZE_MAX || m->m_next != NULL) + if (m->m_pkthdr.tso_segsz > 0 + || size + m->m_pkthdr.len > TX_WR_SIZE_MAX + || m->m_next != NULL) break; m0 = buf_ring_dequeue_sc(txq->txq_mr); @@ -315,39 +318,30 @@ cxgb_pcpu_start_(struct sge_qset *qs, st immpkt = NULL; } - if (initerr && initerr != ENOBUFS) { - if (cxgb_debug) - log(LOG_WARNING, "cxgb link down\n"); + if (initerr) { if (immpkt) m_freem(immpkt); + if (initerr == ENOBUFS && !tx_flush) + wakeup(qs); return (initerr); } if ((tx_flush && (desc_reclaimable(txq) > 0)) || - (desc_reclaimable(txq) > (TX_ETH_Q_SIZE>>1))) { - int reclaimed = 0; - - if (cxgb_debug) { - device_printf(qs->port->adapter->dev, - "cpuid=%d curcpu=%d reclaimable=%d txq=%p txq->cidx=%d txq->pidx=%d ", - qs->qs_cpuid, curcpu, desc_reclaimable(txq), - txq, txq->cidx, txq->pidx); - } - reclaimed = cxgb_pcpu_reclaim_tx(txq); - if (cxgb_debug) - printf("reclaimed=%d\n", reclaimed); + (desc_reclaimable(txq) > (TX_ETH_Q_SIZE>>3))) { + cxgb_pcpu_reclaim_tx(txq); } stopped = isset(&qs->txq_stopped, TXQ_ETH); - flush = (((!buf_ring_empty(txq->txq_mr) || (!IFQ_DRV_IS_EMPTY(&pi->ifp->if_snd))) && !stopped) || txq->immpkt); + flush = (( +#ifdef IFNET_MULTIQUEUE + !buf_ring_empty(txq->txq_mr) +#else + !IFQ_DRV_IS_EMPTY(&pi->ifp->if_snd) +#endif + && !stopped) || txq->immpkt); max_desc = tx_flush ? TX_ETH_Q_SIZE : TX_START_MAX_DESC; - - if (cxgb_debug) - DPRINTF("stopped=%d flush=%d max_desc=%d\n", - stopped, flush, max_desc); - err = flush ? cxgb_tx(qs, max_desc) : ENOSPC; - + err = flush ? cxgb_tx(qs, max_desc) : 0; if ((tx_flush && flush && err == 0) && (!buf_ring_empty(txq->txq_mr) || @@ -359,16 +353,13 @@ cxgb_pcpu_start_(struct sge_qset *qs, st sched_prio(td, PRI_MIN_TIMESHARE); thread_unlock(td); } - if (i > 50) { - if (cxgb_debug) - device_printf(qs->port->adapter->dev, + if (i > 200) { + device_printf(qs->port->adapter->dev, "exceeded max enqueue tries\n"); return (EBUSY); } goto retry; } - err = (initerr != 0) ? initerr : err; - return (err); } @@ -391,32 +382,22 @@ cxgb_pcpu_transmit(struct ifnet *ifp, st if (immpkt && (immpkt->m_pkthdr.flowid != 0)) { cookie = immpkt->m_pkthdr.flowid; qidx = cxgb_pcpu_cookie_to_qidx(pi, cookie); - DPRINTF("hash=0x%x qidx=%d cpu=%d\n", immpkt->m_pkthdr.flowid, qidx, curcpu); qs = &pi->adapter->sge.qs[qidx]; } else #endif qs = &pi->adapter->sge.qs[pi->first_qset]; txq = &qs->txq[TXQ_ETH]; - if (((sc->tunq_coalesce == 0) || (buf_ring_count(txq->txq_mr) >= TX_WR_COUNT_MAX) || (coalesce_tx_enable == 0)) && mtx_trylock(&txq->lock)) { - if (cxgb_debug) - printf("doing immediate transmit\n"); - txq->flags |= TXQ_TRANSMITTING; err = cxgb_pcpu_start_(qs, immpkt, FALSE); txq->flags &= ~TXQ_TRANSMITTING; - resid = (buf_ring_count(txq->txq_mr) > 64) || (desc_reclaimable(txq) > 64); mtx_unlock(&txq->lock); - } else if (immpkt) { - if (cxgb_debug) - printf("deferred coalesce=%jx ring_count=%d mtx_owned=%d\n", - sc->tunq_coalesce, buf_ring_count(txq->txq_mr), mtx_owned(&txq->lock)); - err = cxgb_pcpu_enqueue_packet_(qs, immpkt); - } - return ((err == ENOSPC) ? 0 : err); + } else if (immpkt) + return (cxgb_pcpu_enqueue_packet_(qs, immpkt)); + return ((err == EBUSY) ? 0 : err); } void @@ -624,29 +605,23 @@ cxgb_tx(struct sge_qset *qs, uint32_t tx txq = &qs->txq[TXQ_ETH]; ifp = qs->port->ifp; in_use_init = txq->in_use; - err = 0; - - for (i = 0; i < TX_WR_COUNT_MAX; i++) - m_vec[i] = NULL; + count = err = 0; mtx_assert(&txq->lock, MA_OWNED); while ((txq->in_use - in_use_init < txmax) && (txq->size > txq->in_use + TX_MAX_DESC)) { check_pkt_coalesce(qs); count = cxgb_dequeue_packet(txq, m_vec); - if (count == 0) { - err = ENOSPC; + if (count == 0) break; - } - ETHER_BPF_MTAP(ifp, m_vec[0]); + for (i = 0; i < count; i++) + ETHER_BPF_MTAP(ifp, m_vec[i]); if ((err = t3_encap(qs, m_vec, count)) != 0) break; txq->txq_enqueued += count; - m_vec[0] = NULL; } - if ((err == 0) && (txq->size <= txq->in_use + TX_MAX_DESC)) { - err = ENOBUFS; + if (txq->size <= txq->in_use + TX_MAX_DESC) { txq_fills++; setbit(&qs->txq_stopped, TXQ_ETH); }