Merge r254386 from user/np/cxl_tuning. Add an INET|INET6 check missing

in said revision.

r254386:
Flush inactive LRO entries periodically.
This commit is contained in:
Navdeep Parhar 2013-08-29 06:26:22 +00:00
parent 4b97b38825
commit 480e603c79
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=255015
3 changed files with 17 additions and 0 deletions

View File

@ -559,6 +559,7 @@ struct adapter {
bus_dma_tag_t dmat; /* Parent DMA tag */
struct sge sge;
int lro_timeout;
struct taskqueue *tq[NCHAN]; /* taskqueues that flush data out */
struct port_info *port[MAX_NPORTS];

View File

@ -4229,6 +4229,10 @@ t4_sysctls(struct adapter *sc)
t4_sge_sysctls(sc, ctx, children);
sc->lro_timeout = 100;
SYSCTL_ADD_INT(ctx, children, OID_AUTO, "lro_timeout", CTLFLAG_RW,
&sc->lro_timeout, 0, "lro inactive-flush timeout (in us)");
#ifdef SBUF_DRAIN
/*
* dev.t4nex.X.misc. Marked CTLFLAG_SKIP to avoid information overload.

View File

@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$");
#include <sys/malloc.h>
#include <sys/queue.h>
#include <sys/taskqueue.h>
#include <sys/time.h>
#include <sys/sysctl.h>
#include <sys/smp.h>
#include <net/bpf.h>
@ -1006,6 +1007,9 @@ service_iq(struct sge_iq *iq, int budget)
uint32_t lq;
struct mbuf *m0;
STAILQ_HEAD(, sge_iq) iql = STAILQ_HEAD_INITIALIZER(iql);
#if defined(INET) || defined(INET6)
const struct timeval lro_timeout = {0, sc->lro_timeout};
#endif
limit = budget ? budget : iq->qsize / 8;
@ -1111,6 +1115,14 @@ service_iq(struct sge_iq *iq, int budget)
V_SEINTARM(V_QINTR_TIMER_IDX(X_TIMERREG_UPDATE_CIDX)));
ndescs = 0;
#if defined(INET) || defined(INET6)
if (iq->flags & IQ_LRO_ENABLED &&
sc->lro_timeout != 0) {
tcp_lro_flush_inactive(&rxq->lro,
&lro_timeout);
}
#endif
if (fl_bufs_used > 0) {
FL_LOCK(fl);
fl->needed += fl_bufs_used;