Page MenuHomeFreeBSD
Files F174431426

D60175.id188204.diff
No OneTemporary
Actions

D60175.id188204.diff
View Options

diff --git a/FreeBSD/sys/dev/iavf/if_iavf_iflib.c b/FreeBSD/sys/dev/iavf/if_iavf_iflib.c
--- a/FreeBSD/sys/dev/iavf/if_iavf_iflib.c
+++ b/FreeBSD/sys/dev/iavf/if_iavf_iflib.c
@@ -213,6 +213,7 @@
.isc_tx_maxsegsize = IAVF_MAX_FRAME,
.isc_tso_maxsize = IAVF_TSO_SIZE + sizeof(struct ether_vlan_header),
.isc_tso_maxsegsize = IAVF_MAX_DMA_SEG_SIZE,
+ .isc_sparse_maxsegs = IAVF_MAX_TX_SEGS,
.isc_rx_maxsize = IAVF_MAX_FRAME,
.isc_rx_nsegments = IAVF_MAX_RX_SEGS,
.isc_rx_maxsegsize = IAVF_MAX_FRAME,
diff --git a/FreeBSD/sys/dev/ice/if_ice_iflib.c b/FreeBSD/sys/dev/ice/if_ice_iflib.c
--- a/FreeBSD/sys/dev/ice/if_ice_iflib.c
+++ b/FreeBSD/sys/dev/ice/if_ice_iflib.c
@@ -283,6 +283,7 @@
* related ifnet parameter.
*/
.isc_tso_maxsegsize = ICE_MAX_DMA_SEG_SIZE,
+ .isc_sparse_maxsegs = ICE_MAX_TX_SEGS,
.isc_rx_maxsize = ICE_MAX_FRAME_SIZE,
.isc_rx_nsegments = ICE_MAX_RX_SEGS,
@@ -3749,6 +3750,7 @@
.isc_tx_maxsegsize = ICE_MAX_FRAME_SIZE,
.isc_tso_maxsize = ICE_TSO_SIZE + sizeof(struct ether_vlan_header),
.isc_tso_maxsegsize = ICE_MAX_DMA_SEG_SIZE,
+ .isc_sparse_maxsegs = ICE_MAX_TX_SEGS,
.isc_rx_maxsize = ICE_MAX_FRAME_SIZE,
.isc_rx_nsegments = ICE_MAX_RX_SEGS,
diff --git a/FreeBSD/sys/dev/ixl/if_ixl.c b/FreeBSD/sys/dev/ixl/if_ixl.c
--- a/FreeBSD/sys/dev/ixl/if_ixl.c
+++ b/FreeBSD/sys/dev/ixl/if_ixl.c
@@ -357,6 +357,7 @@
.isc_tx_maxsegsize = IXL_MAX_DMA_SEG_SIZE,
.isc_tso_maxsize = IXL_TSO_SIZE + sizeof(struct ether_vlan_header),
.isc_tso_maxsegsize = IXL_MAX_DMA_SEG_SIZE,
+ .isc_sparse_maxsegs = IXL_MAX_TX_SEGS,
.isc_rx_maxsize = 16384,
.isc_rx_nsegments = IXL_MAX_RX_SEGS,
.isc_rx_maxsegsize = IXL_MAX_DMA_SEG_SIZE,
diff --git a/FreeBSD/sys/net/iflib.h b/FreeBSD/sys/net/iflib.h
--- a/FreeBSD/sys/net/iflib.h
+++ b/FreeBSD/sys/net/iflib.h
@@ -280,8 +280,8 @@
int isc_nfl __aligned(CACHE_LINE_SIZE);
int isc_ntxqs; /* # of tx queues per tx qset - usually 1 */
int isc_nrxqs; /* # of rx queues per rx qset - intel 1, chelsio 2, broadcom 3 */
+ int isc_sparse_maxsegs;
int __spare0__;
- int __spare1__;
int isc_flags;
};
diff --git a/FreeBSD/sys/net/iflib.c b/FreeBSD/sys/net/iflib.c
--- a/FreeBSD/sys/net/iflib.c
+++ b/FreeBSD/sys/net/iflib.c
@@ -365,7 +365,6 @@
typedef struct iflib_sw_tx_desc_array {
bus_dmamap_t *ifsd_map; /* bus_dma maps for packet */
- bus_dmamap_t *ifsd_tso_map; /* bus_dma maps for TSO packet */
struct mbuf **ifsd_m; /* pkthdr mbufs */
struct mbuf **ifsd_m_defer; /* deferred mbuf ptr */
struct mbuf **ifsd_m_deferb;/* deferred mbuf backing ptr */
@@ -387,19 +386,6 @@
#define IFLIB_RESTART_BUDGET 8
-/*
- * Encode TSO or !TSO in the low bits of the tx ifsd_m pointer so as
- * to avoid defref'ing the mbuf to determine the correct busdma resources
- * to release
- */
-#define IFLIB_TSO (1ULL << 0)
-#define IFLIB_NO_TSO (2ULL << 0)
-#define IFLIB_FLAGS_MASK (0x3ULL)
-#define IFLIB_SAVE_MBUF(mbuf, flags) ((void *)(((uintptr_t)mbuf) | flags))
-#define IFLIB_GET_FLAGS(a) ((uintptr_t)a & IFLIB_FLAGS_MASK)
-#define IFLIB_GET_MBUF(a) ((struct mbuf *)((uintptr_t)a & ~IFLIB_FLAGS_MASK))
-
-
#define IFC_LEGACY 0x001
#define IFC_QFLUSH 0x002
#define IFC_MULTISEG 0x004
@@ -427,7 +413,8 @@
uint8_t ift_gen;
uint8_t ift_br_offset:1,
ift_defer_mfree:1,
- ift_spare_bits0:6;
+ ift_sparse_check:1,
+ ift_spare_bits0:5;
uint16_t ift_npending;
uint16_t ift_db_pending;
uint16_t ift_rs_pending;
@@ -492,7 +479,6 @@
uint8_t ift_spare0[2]; /* pad to the next pointer boundary */
struct iflib_filter_info ift_filter_info;
bus_dma_tag_t ift_buf_tag;
- bus_dma_tag_t ift_tso_buf_tag;
iflib_dma_info_t ift_ifdi;
#define MTX_NAME_LEN 32
char ift_mtx_name[MTX_NAME_LEN];
@@ -1848,11 +1834,7 @@
/*********************************************************************
*
- * Allocate DMA resources for TX buffers as well as memory for the TX
- * mbuf map. TX DMA maps (non-TSO/TSO) and TX mbuf map are kept in a
- * iflib_sw_tx_desc_array structure, storing all the information that
- * is needed to transmit a packet on the wire. This is called only
- * once at attach, setup is done every reset.
+ * Allocate DMA resources for TX buffers and the TX mbuf map.
*
**********************************************************************/
static int
@@ -1862,7 +1844,7 @@
if_shared_ctx_t sctx = ctx->ifc_sctx;
if_softc_ctx_t scctx = &ctx->ifc_softc_ctx;
device_t dev = ctx->ifc_dev;
- bus_size_t tsomaxsize;
+ bus_size_t maxsegsize, maxsize, tsomaxsize;
bus_addr_t lowaddr;
int err, nsegments, ntsosegments;
bool tso;
@@ -1881,42 +1863,31 @@
}
lowaddr = DMA_WIDTH_TO_BUS_LOWADDR(scctx->isc_dma_width);
+ tso = (if_getcapabilities(ctx->ifc_ifp) & IFCAP_TSO) != 0;
+ maxsize = sctx->isc_tx_maxsize;
+ maxsegsize = sctx->isc_tx_maxsegsize;
+ if (tso) {
+ maxsize = MAX(maxsize, tsomaxsize);
+ nsegments = MAX(nsegments, ntsosegments);
+ maxsegsize = MAX(maxsegsize, sctx->isc_tso_maxsegsize);
+ }
- /*
- * Set up DMA tags for TX buffers.
- */
+ /* Set up the TX buffer DMA tag. */
if ((err = bus_dma_tag_create(bus_get_dma_tag(dev),
1, 0, /* alignment, bounds */
lowaddr, /* lowaddr */
BUS_SPACE_MAXADDR, /* highaddr */
NULL, NULL, /* filter, filterarg */
- sctx->isc_tx_maxsize, /* maxsize */
+ maxsize, /* maxsize */
nsegments, /* nsegments */
- sctx->isc_tx_maxsegsize, /* maxsegsize */
+ maxsegsize, /* maxsegsize */
0, /* flags */
NULL, /* lockfunc */
NULL, /* lockfuncarg */
&txq->ift_buf_tag))) {
device_printf(dev, "Unable to allocate TX DMA tag: %d\n", err);
device_printf(dev, "maxsize: %ju nsegments: %d maxsegsize: %ju\n",
- (uintmax_t)sctx->isc_tx_maxsize, nsegments, (uintmax_t)sctx->isc_tx_maxsegsize);
- goto fail;
- }
- tso = (if_getcapabilities(ctx->ifc_ifp) & IFCAP_TSO) != 0;
- if (tso && (err = bus_dma_tag_create(bus_get_dma_tag(dev),
- 1, 0, /* alignment, bounds */
- lowaddr, /* lowaddr */
- BUS_SPACE_MAXADDR, /* highaddr */
- NULL, NULL, /* filter, filterarg */
- tsomaxsize, /* maxsize */
- ntsosegments, /* nsegments */
- sctx->isc_tso_maxsegsize, /* maxsegsize */
- 0, /* flags */
- NULL, /* lockfunc */
- NULL, /* lockfuncarg */
- &txq->ift_tso_buf_tag))) {
- device_printf(dev, "Unable to allocate TSO TX DMA tag: %d\n",
- err);
+ (uintmax_t)maxsize, nsegments, (uintmax_t)maxsegsize);
goto fail;
}
@@ -1949,14 +1920,6 @@
err = ENOMEM;
goto fail;
}
- if (tso && (txq->ift_sds.ifsd_tso_map = (bus_dmamap_t *)malloc(
- sizeof(bus_dmamap_t) * scctx->isc_ntxd[txq->ift_br_offset],
- M_IFLIB, M_NOWAIT | M_ZERO)) == NULL) {
- device_printf(dev,
- "Unable to allocate TSO TX buffer map memory\n");
- err = ENOMEM;
- goto fail;
- }
for (int i = 0; i < scctx->isc_ntxd[txq->ift_br_offset]; i++) {
err = bus_dmamap_create(txq->ift_buf_tag, 0,
&txq->ift_sds.ifsd_map[i]);
@@ -1964,14 +1927,6 @@
device_printf(dev, "Unable to create TX DMA map\n");
goto fail;
}
- if (!tso)
- continue;
- err = bus_dmamap_create(txq->ift_tso_buf_tag, 0,
- &txq->ift_sds.ifsd_tso_map[i]);
- if (err != 0) {
- device_printf(dev, "Unable to create TSO TX DMA map\n");
- goto fail;
- }
}
return (0);
fail:
@@ -1992,15 +1947,6 @@
bus_dmamap_destroy(txq->ift_buf_tag, map);
txq->ift_sds.ifsd_map[i] = NULL;
}
-
- if (txq->ift_sds.ifsd_tso_map != NULL) {
- map = txq->ift_sds.ifsd_tso_map[i];
- bus_dmamap_sync(txq->ift_tso_buf_tag, map,
- BUS_DMASYNC_POSTWRITE);
- bus_dmamap_unload(txq->ift_tso_buf_tag, map);
- bus_dmamap_destroy(txq->ift_tso_buf_tag, map);
- txq->ift_sds.ifsd_tso_map[i] = NULL;
- }
}
static void
@@ -2047,10 +1993,6 @@
free(txq->ift_sds.ifsd_map, M_IFLIB);
txq->ift_sds.ifsd_map = NULL;
}
- if (txq->ift_sds.ifsd_tso_map != NULL) {
- free(txq->ift_sds.ifsd_tso_map, M_IFLIB);
- txq->ift_sds.ifsd_tso_map = NULL;
- }
if (txq->ift_sds.ifsd_m != NULL) {
free(txq->ift_sds.ifsd_m, M_IFLIB);
txq->ift_sds.ifsd_m = NULL;
@@ -2063,10 +2005,6 @@
bus_dma_tag_destroy(txq->ift_buf_tag);
txq->ift_buf_tag = NULL;
}
- if (txq->ift_tso_buf_tag != NULL) {
- bus_dma_tag_destroy(txq->ift_tso_buf_tag);
- txq->ift_tso_buf_tag = NULL;
- }
if (txq->ift_ifdi != NULL) {
free(txq->ift_ifdi, M_IFLIB);
}
@@ -2077,7 +2015,7 @@
{
struct mbuf *m;
- m = IFLIB_GET_MBUF(txq->ift_sds.ifsd_m[i]);
+ m = txq->ift_sds.ifsd_m[i];
if (m == NULL)
return;
@@ -2086,12 +2024,6 @@
txq->ift_sds.ifsd_map[i], BUS_DMASYNC_POSTWRITE);
bus_dmamap_unload(txq->ift_buf_tag, txq->ift_sds.ifsd_map[i]);
}
- if (txq->ift_sds.ifsd_tso_map != NULL) {
- bus_dmamap_sync(txq->ift_tso_buf_tag,
- txq->ift_sds.ifsd_tso_map[i], BUS_DMASYNC_POSTWRITE);
- bus_dmamap_unload(txq->ift_tso_buf_tag,
- txq->ift_sds.ifsd_tso_map[i]);
- }
txq->ift_sds.ifsd_m[i] = NULL;
m_freem(m);
DBG_COUNTER_INC(tx_frees);
@@ -3803,12 +3735,9 @@
ntxd = txq->ift_size;
pidx = txq->ift_pidx & (ntxd - 1);
ifsd_m = txq->ift_sds.ifsd_m;
- m = IFLIB_GET_MBUF(ifsd_m[pidx]);
+ m = ifsd_m[pidx];
ifsd_m[pidx] = NULL;
bus_dmamap_unload(txq->ift_buf_tag, txq->ift_sds.ifsd_map[pidx]);
- if (txq->ift_sds.ifsd_tso_map != NULL)
- bus_dmamap_unload(txq->ift_tso_buf_tag,
- txq->ift_sds.ifsd_tso_map[pidx]);
#if MEMORY_LOGGING
txq->ift_dequeued++;
#endif
@@ -3870,7 +3799,6 @@
struct mbuf *m_head, **ifsd_m;
bus_dmamap_t map;
struct if_pkt_info pi;
- uintptr_t flags;
int remap = 0;
int err, nsegs, ndesc, max_segs, pidx;
@@ -3879,6 +3807,7 @@
scctx = &ctx->ifc_softc_ctx;
segs = txq->ift_segs;
m_head = *m_headp;
+ buf_tag = txq->ift_buf_tag;
map = NULL;
/*
@@ -3888,19 +3817,6 @@
map = txq->ift_sds.ifsd_map[pidx];
ifsd_m = txq->ift_sds.ifsd_m;
- if (m_head->m_pkthdr.csum_flags & CSUM_TSO) {
- buf_tag = txq->ift_tso_buf_tag;
- max_segs = scctx->isc_tx_tso_segments_max;
- map = txq->ift_sds.ifsd_tso_map[pidx];
- MPASS(buf_tag != NULL);
- MPASS(max_segs > 0);
- flags = IFLIB_TSO;
- } else {
- buf_tag = txq->ift_buf_tag;
- max_segs = scctx->isc_tx_nsegments;
- map = txq->ift_sds.ifsd_map[pidx];
- flags = IFLIB_NO_TSO;
- }
if ((sctx->isc_flags & IFLIB_NEED_ETHER_PAD) &&
__predict_false(m_head->m_pkthdr.len < scctx->isc_min_frame_size)) {
err = iflib_ether_pad(ctx->ifc_dev, m_headp, scctx->isc_min_frame_size);
@@ -3931,10 +3847,22 @@
retry:
err = bus_dmamap_load_mbuf_sg(buf_tag, map, m_head, segs, &nsegs,
BUS_DMA_NOWAIT);
+ if (__predict_false(err == 0 && txq->ift_sparse_check &&
+ (pi.ipi_csum_flags & CSUM_TSO) == 0 &&
+ nsegs > sctx->isc_sparse_maxsegs)) {
+ bus_dmamap_unload(buf_tag, map);
+ err = EFBIG;
+ }
defrag:
if (__predict_false(err)) {
switch (err) {
case EFBIG:
+ if (pi.ipi_csum_flags & CSUM_TSO)
+ max_segs = scctx->isc_tx_tso_segments_max;
+ else if (txq->ift_sparse_check)
+ max_segs = sctx->isc_sparse_maxsegs;
+ else
+ max_segs = scctx->isc_tx_nsegments;
/* try collapse once and defrag once */
if (remap == 0) {
m_head = m_collapse(*m_headp, M_NOWAIT, max_segs);
@@ -3971,7 +3899,7 @@
DBG_COUNTER_INC(encap_txd_encap_fail);
return (err);
}
- ifsd_m[pidx] = IFLIB_SAVE_MBUF(m_head, flags);
+ ifsd_m[pidx] = m_head;
if (m_head->m_pkthdr.csum_flags & CSUM_SND_TAG)
pi.ipi_mbuf = m_head;
else
@@ -4051,7 +3979,7 @@
/*
* Update packets / bytes sent
*/
- if (flags & IFLIB_TSO) {
+ if (pi.ipi_csum_flags & CSUM_TSO) {
int hlen = pi.ipi_ehdrlen + pi.ipi_ip_hlen + pi.ipi_tcp_hlen;
int tsolen = pi.ipi_len - hlen;
int nsegs = (tsolen + pi.ipi_tso_segsz - 1) / pi.ipi_tso_segsz;
@@ -4099,7 +4027,6 @@
{
uint32_t qsize, cidx, gen;
struct mbuf *m, **ifsd_m;
- uintptr_t flags;
cidx = txq->ift_cidx;
gen = txq->ift_gen;
@@ -4107,22 +4034,11 @@
ifsd_m =txq->ift_sds.ifsd_m;
while (n-- > 0) {
- if ((m = IFLIB_GET_MBUF(ifsd_m[cidx])) != NULL) {
- flags = IFLIB_GET_FLAGS(ifsd_m[cidx]);
- MPASS(flags != 0);
- if (flags & IFLIB_TSO) {
- bus_dmamap_sync(txq->ift_tso_buf_tag,
- txq->ift_sds.ifsd_tso_map[cidx],
- BUS_DMASYNC_POSTWRITE);
- bus_dmamap_unload(txq->ift_tso_buf_tag,
- txq->ift_sds.ifsd_tso_map[cidx]);
- } else {
- bus_dmamap_sync(txq->ift_buf_tag,
- txq->ift_sds.ifsd_map[cidx],
- BUS_DMASYNC_POSTWRITE);
- bus_dmamap_unload(txq->ift_buf_tag,
- txq->ift_sds.ifsd_map[cidx]);
- }
+ if ((m = ifsd_m[cidx]) != NULL) {
+ bus_dmamap_sync(txq->ift_buf_tag,
+ txq->ift_sds.ifsd_map[cidx], BUS_DMASYNC_POSTWRITE);
+ bus_dmamap_unload(txq->ift_buf_tag,
+ txq->ift_sds.ifsd_map[cidx]);
/* XXX we don't support any drivers that batch packets yet */
MPASS(m->m_nextpkt == NULL);
if (m_defer == NULL) {
@@ -6618,6 +6534,7 @@
}
txq->ift_ctx = ctx;
txq->ift_id = i;
+ txq->ift_sparse_check = sctx->isc_sparse_maxsegs != 0;
if (sctx->isc_flags & IFLIB_HAS_TXCQ) {
txq->ift_br_offset = 1;
} else {

File Metadata

Mime Type
text/plain
Expires
Sun, Oct 4, 4:05 AM (16 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40171693
Default Alt Text
D60175.id188204.diff (12 KB)

Event Timeline