jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-03 19:08:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Be more aggressive about tx cleaning - when multiples streams were running the tx

Browse Source 
queue could fill up and stop getting cleaned.
This commit is contained in:
Kip Macy 2008-01-11 02:26:54 +00:00
parent 9cce003858
commit 9330dbc3a1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=175224
3 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/dev/cxgb/cxgb_adapter.h
View File

@ -549,6 +549,7 @@ void t3_intr_msix(void *data);
int t3_encap(struct sge_qset *, struct mbuf **, int);
int t3_sge_init_adapter(adapter_t *);
int t3_sge_reset_adapter(adapter_t *);
int t3_sge_init_port(struct port_info *);
void t3_sge_deinit_sw(adapter_t *);
void t3_free_tx_desc(struct sge_txq *q, int n);
@ -618,5 +619,5 @@ void t3_free_qset(adapter_t *sc, struct sge_qset *q);
int cxgb_dequeue_packet(struct ifnet *, struct sge_txq *, struct mbuf **);
void cxgb_start(struct ifnet *ifp);
void refill_fl_service(adapter_t *adap, struct sge_fl *fl);
int reclaim_completed_tx(struct sge_txq *q, int reclaim_min);
#endif

5
sys/dev/cxgb/cxgb_main.c
View File

@ -1712,7 +1712,6 @@ cxgb_init_locked(struct port_info *p)
}
if (p->adapter->open_device_map == 0) {
t3_intr_clear(sc);
t3_sge_init_adapter(sc);
}
setbit(&p->adapter->open_device_map, p->port_id);
ADAPTER_UNLOCK(p->adapter);
@ -1733,6 +1732,7 @@ cxgb_init_locked(struct port_info *p)
t3_port_intr_enable(sc, p->port_id);
callout_reset(&sc->cxgb_tick_ch, hz, cxgb_tick, sc);
t3_sge_reset_adapter(sc);
ifp->if_drv_flags |= IFF_DRV_RUNNING;
ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
@ -1963,7 +1963,7 @@ cxgb_start_tx(struct ifnet *ifp, uint32_t txmax)
if (IFQ_DRV_IS_EMPTY(&ifp->if_snd))
return (ENOBUFS);
qs = &p->adapter->sge.qs[p->first_qset];
txq = &qs->txq[TXQ_ETH];
if (txq->flags & TXQ_TRANSMITTING)
@ -1971,6 +1971,7 @@ cxgb_start_tx(struct ifnet *ifp, uint32_t txmax)
mtx_lock(&txq->lock);
txq->flags |= TXQ_TRANSMITTING;
reclaim_completed_tx(txq, TX_ETH_Q_SIZE >> 1);
err = cxgb_tx_common(ifp, qs, txmax);
txq->flags &= ~TXQ_TRANSMITTING;
mtx_unlock(&txq->lock);

45
sys/dev/cxgb/cxgb_sge.c
View File

@ -202,10 +202,13 @@ static void sge_txq_reclaim_handler(void *arg, int ncount);
* queue's lock held.
*/
static __inline int
reclaim_completed_tx(struct sge_txq *q)
reclaim_completed_tx_(struct sge_txq *q, int reclaim_min)
{
int reclaim = desc_reclaimable(q);
if (reclaim < reclaim_min)
return (0);
mtx_assert(&q->lock, MA_OWNED);
if (reclaim > 0) {
t3_free_tx_desc(q, reclaim);
@ -215,6 +218,13 @@ reclaim_completed_tx(struct sge_txq *q)
return (reclaim);
}
int
reclaim_completed_tx(struct sge_txq *q, int reclaim_min)
{
return reclaim_completed_tx_(q, reclaim_min);
}
/**
* should_restart_tx - are there enough resources to restart a Tx queue?
* @q: the Tx queue
@ -774,6 +784,13 @@ t3_sge_init_adapter(adapter_t *sc)
return (0);
}
int
t3_sge_reset_adapter(adapter_t *sc)
{
callout_reset(&sc->sge_timer_ch, TX_RECLAIM_PERIOD, sge_timer_cb, sc);
return (0);
}
int
t3_sge_init_port(struct port_info *pi)
{
@ -815,7 +832,7 @@ refill_rspq(adapter_t *sc, const struct sge_rspq *q, u_int credits)
}
static __inline void
sge_txq_reclaim_(struct sge_txq *txq)
sge_txq_reclaim_(struct sge_txq *txq, int force)
{
int reclaimable, n;
struct port_info *pi;
@ -823,11 +840,13 @@ sge_txq_reclaim_(struct sge_txq *txq)
pi = txq->port;
reclaim_more:
n = 0;
reclaimable = desc_reclaimable(txq);
if (reclaimable > 0 && mtx_trylock(&txq->lock)) {
n = reclaim_completed_tx(txq);
mtx_unlock(&txq->lock);
}
if ((reclaimable = desc_reclaimable(txq)) < 16)
return;
if (mtx_trylock(&txq->lock) == 0)
return;
n = reclaim_completed_tx_(txq, 16);
mtx_unlock(&txq->lock);
if (pi && pi->ifp->if_drv_flags & IFF_DRV_OACTIVE &&
txq->size - txq->in_use >= TX_START_MAX_DESC) {
struct sge_qset *qs = txq_to_qset(txq, TXQ_ETH);
@ -847,9 +866,11 @@ sge_txq_reclaim_handler(void *arg, int ncount)
{
struct sge_txq *q = arg;
sge_txq_reclaim_(q);
sge_txq_reclaim_(q, TRUE);
}
static void
sge_timer_reclaim(void *arg, int ncount)
{
@ -866,10 +887,10 @@ sge_timer_reclaim(void *arg, int ncount)
for (i = 0; i < nqsets; i++) {
qs = &sc->sge.qs[i];
txq = &qs->txq[TXQ_ETH];
sge_txq_reclaim_(txq);
sge_txq_reclaim_(txq, FALSE);
txq = &qs->txq[TXQ_OFLD];
sge_txq_reclaim_(txq);
sge_txq_reclaim_(txq, FALSE);
lock = (sc->flags & USING_MSIX) ? &qs->rspq.lock :
&sc->sge.qs[0].rspq.lock;
@ -1981,7 +2002,7 @@ ofld_xmit(adapter_t *adap, struct sge_txq *q, struct mbuf *m)
KASSERT(stx->mi.mi_base == NULL, ("mi_base set"));
mtx_lock(&q->lock);
again: reclaim_completed_tx(q);
again: reclaim_completed_tx_(q, 16);
ret = check_desc_avail(adap, q, m, ndesc, TXQ_OFLD);
if (__predict_false(ret)) {
if (ret == 1) {
@ -2034,7 +2055,7 @@ restart_offloadq(void *data, int npending)
int nsegs, cleaned;
mtx_lock(&q->lock);
again: cleaned = reclaim_completed_tx(q);
again: cleaned = reclaim_completed_tx_(q, 16);
while ((m = mbufq_peek(&q->sendq)) != NULL) {
unsigned int gen, pidx;