Page MenuHomeFreeBSD
Files F164672840

D58240.id182003.diff
No OneTemporary
Actions

D58240.id182003.diff
View Options

Index: sys/dev/ena/ena_datapath.c
===================================================================
--- sys/dev/ena/ena_datapath.c
+++ sys/dev/ena/ena_datapath.c
@@ -572,6 +572,8 @@
unsigned int qid;
int rc, i;
int budget = (ENA_RX_DESC_BUDGET == -1) ? INT_MAX : ENA_RX_DESC_BUDGET;
+ uint32_t total_pkts = 0;
+ uint64_t total_bytes = 0;
#ifdef DEV_NETMAP
int done;
#endif /* DEV_NETMAP */
@@ -614,7 +616,7 @@
reset_reason = ENA_REGS_RESET_INV_RX_REQ_ID;
}
ena_trigger_reset(adapter, reset_reason);
- return (0);
+ goto update_stats;
}
if (unlikely(ena_rx_ctx.descs == 0))
@@ -646,12 +648,7 @@
ena_rx_checksum(rx_ring, &ena_rx_ctx, mbuf);
}
- counter_enter();
- counter_u64_add_protected(rx_ring->rx_stats.bytes,
- mbuf->m_pkthdr.len);
- counter_u64_add_protected(adapter->hw_stats.rx_bytes,
- mbuf->m_pkthdr.len);
- counter_exit();
+ total_bytes += mbuf->m_pkthdr.len;
/*
* LRO is only for IP/TCP packets and TCP checksum of the packet
* should be computed by hardware.
@@ -676,10 +673,7 @@
if_input(ifp, mbuf);
}
- counter_enter();
- counter_u64_add_protected(rx_ring->rx_stats.cnt, 1);
- counter_u64_add_protected(adapter->hw_stats.rx_packets, 1);
- counter_exit();
+ total_pkts++;
/*
* Adjust our budget; note that we count descriptors, not
@@ -702,6 +696,13 @@
tcp_lro_flush_all(&rx_ring->lro);
+update_stats:
+ counter_enter();
+ counter_u64_add_protected(rx_ring->rx_stats.cnt, total_pkts);
+ counter_u64_add_protected(rx_ring->rx_stats.bytes, total_bytes);
+ counter_u64_add_protected(adapter->hw_stats.rx_packets, total_pkts);
+ counter_u64_add_protected(adapter->hw_stats.rx_bytes, total_bytes);
+ counter_exit();
return (budget <= 0);
}

File Metadata

Mime Type
text/plain
Expires
Tue, Aug 4, 2:41 AM (6 h, 55 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35928129
Default Alt Text
D58240.id182003.diff (1 KB)

Event Timeline