Author: np
Date: Sat Jan 3 00:09:21 2015
New Revision: 276597
URL: https://svnweb.freebsd.org/changeset/base/276597
Log:
cxgbe/tom: do not engage the TOE's payload chopper for payload < 2 MSS
or for 10Gbps ports.
MFC after: 2 weeks
Modified:
head/sys/dev/cxgbe/offload.h
head/sys/dev/cxgbe/t4_main.c
head/sys/dev/cxgbe/tom/t4_cpl_io.c
Modified: head/sys/dev/cxgbe/offload.h
==============================================================================
--- head/sys/dev/cxgbe/offload.h Fri Jan 2 23:46:26 2015
(r276596)
+++ head/sys/dev/cxgbe/offload.h Sat Jan 3 00:09:21 2015
(r276597)
@@ -147,6 +147,7 @@ struct tom_tunables {
int indsz;
int ddp_thres;
int rx_coalesce;
+ int tx_align;
};
int t4_register_uld(struct uld_info *);
Modified: head/sys/dev/cxgbe/t4_main.c
==============================================================================
--- head/sys/dev/cxgbe/t4_main.c Fri Jan 2 23:46:26 2015
(r276596)
+++ head/sys/dev/cxgbe/t4_main.c Sat Jan 3 00:09:21 2015
(r276597)
@@ -4801,6 +4801,10 @@ t4_sysctls(struct adapter *sc)
sc->tt.rx_coalesce = 1;
SYSCTL_ADD_INT(ctx, children, OID_AUTO, "rx_coalesce",
CTLFLAG_RW, &sc->tt.rx_coalesce, 0, "receive coalescing");
+
+ sc->tt.tx_align = 1;
+ SYSCTL_ADD_INT(ctx, children, OID_AUTO, "tx_align",
+ CTLFLAG_RW, &sc->tt.tx_align, 0, "chop and align payload");
}
#endif
Modified: head/sys/dev/cxgbe/tom/t4_cpl_io.c
==============================================================================
--- head/sys/dev/cxgbe/tom/t4_cpl_io.c Fri Jan 2 23:46:26 2015
(r276596)
+++ head/sys/dev/cxgbe/tom/t4_cpl_io.c Sat Jan 3 00:09:21 2015
(r276597)
@@ -491,7 +491,7 @@ max_dsgl_nsegs(int tx_credits)
static inline void
write_tx_wr(void *dst, struct toepcb *toep, unsigned int immdlen,
- unsigned int plen, uint8_t credits, int shove, int ulp_mode)
+ unsigned int plen, uint8_t credits, int shove, int ulp_mode, int txalign)
{
struct fw_ofld_tx_data_wr *txwr = dst;
unsigned int wr_ulp_mode;
@@ -513,6 +513,19 @@ write_tx_wr(void *dst, struct toepcb *to
V_FW_OFLD_TX_DATA_WR_URGENT(0) | /* XXX */
V_FW_OFLD_TX_DATA_WR_SHOVE(shove));
txwr->plen = htobe32(plen);
+
+ if (txalign > 0) {
+ struct tcpcb *tp = intotcpcb(toep->inp);
+
+ if (plen < 2 * tp->t_maxseg || is_10G_port(toep->port))
+ txwr->lsodisable_to_proxy |=
+ htobe32(F_FW_OFLD_TX_DATA_WR_LSODISABLE);
+ else
+ txwr->lsodisable_to_proxy |=
+ htobe32(F_FW_OFLD_TX_DATA_WR_ALIGNPLD |
+ (tp->t_flags & TF_NODELAY ? 0 :
+ F_FW_OFLD_TX_DATA_WR_ALIGNPLDSHOVE));
+ }
}
/*
@@ -716,7 +729,8 @@ t4_push_frames(struct adapter *sc, struc
}
txwr = wrtod(wr);
credits = howmany(wr->wr_len, 16);
- write_tx_wr(txwr, toep, plen, plen, credits, shove, 0);
+ write_tx_wr(txwr, toep, plen, plen, credits, shove, 0,
+ sc->tt.tx_align);
m_copydata(sndptr, 0, plen, (void *)(txwr + 1));
nsegs = 0;
} else {
@@ -734,7 +748,8 @@ t4_push_frames(struct adapter *sc, struc
}
txwr = wrtod(wr);
credits = howmany(wr_len, 16);
- write_tx_wr(txwr, toep, 0, plen, credits, shove, 0);
+ write_tx_wr(txwr, toep, 0, plen, credits, shove, 0,
+ sc->tt.tx_align);
write_tx_sgl(txwr + 1, sndptr, m, nsegs,
max_nsegs_1mbuf);
if (wr_len & 0xf) {
@@ -890,7 +905,7 @@ t4_ulp_push_frames(struct adapter *sc, s
txwr = wrtod(wr);
credits = howmany(wr->wr_len, 16);
write_tx_wr(txwr, toep, plen, ulp_len, credits, shove,
- ulp_mode);
+ ulp_mode, 0);
m_copydata(sndptr, 0, plen, (void *)(txwr + 1));
} else {
int wr_len;
@@ -907,7 +922,7 @@ t4_ulp_push_frames(struct adapter *sc, s
txwr = wrtod(wr);
credits = howmany(wr_len, 16);
write_tx_wr(txwr, toep, 0, ulp_len, credits, shove,
- ulp_mode);
+ ulp_mode, 0);
write_tx_sgl(txwr + 1, sndptr, m, nsegs,
max_nsegs_1mbuf);
if (wr_len & 0xf) {
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
