Page MenuHomeFreeBSD
Files F144622530

D12871.1775839013.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D12871.1775839013.diff
View Options

Index: sys/dev/ena/ena.h
===================================================================
--- sys/dev/ena/ena.h
+++ sys/dev/ena/ena.h
@@ -216,6 +216,7 @@
counter_u64_t bytes;
counter_u64_t refil_partial;
counter_u64_t bad_csum;
+ counter_u64_t mjum_alloc_fail;
counter_u64_t mbuf_alloc_fail;
counter_u64_t dma_mapping_err;
counter_u64_t bad_desc_num;
Index: sys/dev/ena/ena.c
===================================================================
--- sys/dev/ena/ena.c
+++ sys/dev/ena/ena.c
@@ -564,7 +564,7 @@
BUS_SPACE_MAXADDR, /* highaddr of excl window */
NULL, NULL, /* filter, filterarg */
MJUM16BYTES, /* maxsize */
- 1, /* nsegments */
+ adapter->max_rx_sgl_size, /* nsegments */
MJUM16BYTES, /* maxsegsize */
0, /* flags */
NULL, /* lockfunc */
@@ -980,6 +980,7 @@
struct ena_com_buf *ena_buf;
bus_dma_segment_t segs[1];
int nsegs, error;
+ int mlen;
/* if previous allocated frag is not used */
if (unlikely(rx_info->mbuf != NULL))
@@ -989,11 +990,18 @@
rx_info->mbuf = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, MJUM16BYTES);
if (unlikely(rx_info->mbuf == NULL)) {
- counter_u64_add(rx_ring->rx_stats.mbuf_alloc_fail, 1);
- return (ENOMEM);
+ counter_u64_add(rx_ring->rx_stats.mjum_alloc_fail, 1);
+ rx_info->mbuf = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
+ if (unlikely(rx_info->mbuf == NULL)) {
+ counter_u64_add(rx_ring->rx_stats.mbuf_alloc_fail, 1);
+ return (ENOMEM);
+ }
+ mlen = MCLBYTES;
+ } else {
+ mlen = MJUM16BYTES;
}
/* Set mbuf length*/
- rx_info->mbuf->m_pkthdr.len = rx_info->mbuf->m_len = MJUM16BYTES;
+ rx_info->mbuf->m_pkthdr.len = rx_info->mbuf->m_len = mlen;
/* Map packets for DMA */
ena_trace(ENA_DBG | ENA_RSC | ENA_RXPTH,
@@ -1013,7 +1021,7 @@
ena_buf = &rx_info->ena_buf;
ena_buf->paddr = segs[0].ds_addr;
- ena_buf->len = MJUM16BYTES;
+ ena_buf->len = mlen;
ena_trace(ENA_DBG | ENA_RSC | ENA_RXPTH,
"ALLOC RX BUF: mbuf %p, rx_info %p, len %d, paddr %#jx\n",
Index: sys/dev/ena/ena_sysctl.c
===================================================================
--- sys/dev/ena/ena_sysctl.c
+++ sys/dev/ena/ena_sysctl.c
@@ -199,6 +199,9 @@
SYSCTL_ADD_COUNTER_U64(ctx, rx_list, OID_AUTO,
"mbuf_alloc_fail", CTLFLAG_RD,
&rx_stats->mbuf_alloc_fail, "Failed mbuf allocs");
+ SYSCTL_ADD_COUNTER_U64(ctx, rx_list, OID_AUTO,
+ "mjum_alloc_fail", CTLFLAG_RD,
+ &rx_stats->mjum_alloc_fail, "Failed jumbo mbuf allocs");
SYSCTL_ADD_COUNTER_U64(ctx, rx_list, OID_AUTO,
"dma_mapping_err", CTLFLAG_RD,
&rx_stats->dma_mapping_err, "DMA mapping errors");

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 10, 4:36 PM (9 h, 26 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28317528
Default Alt Text
D12871.1775839013.diff (2 KB)

Event Timeline