From nobody Sat Aug 1 15:14:02 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hC60W344bz6nCtd for ; Sat, 01 Aug 2026 15:14:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hC60W1GWLz3XFx for ; Sat, 01 Aug 2026 15:14:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785597243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pCzS4+nInD6Jg3vBrLIBaL42RQG6+4Wp9mFSZ3S7q2M=; b=xvnUO8vzFuP1p4xF8nir42HTLIPmA2ZuZY0u5LzIawzCzXgOAIOZwKZc8aNZiz5EmTZQOd UEunnK4PS3py889ZCzHgsIqhEvUkBCih4K7n/RhSgPLEjmnYiYi6QwZsUPN6uOOkk2ZwIe XsrhOlnm0iG6g5qYrENFx5Q0SXGrZ+s8q7z5uPV7MyL6e62p26l6v/q20jlHg4E9llDxYI kWubyN+Uow52kRwZxfWSfFJz40PxZhyFPsvGOf5fdxbfXoXYRa/eYaPTRvKGa2Ccda/rI6 41ARy+73AEu4MG9ldqCxWD3gRpnNWfjsA192xNhXZlYlzsGDvH22Snn0mqYLhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785597243; a=rsa-sha256; cv=none; b=PMyRcA2OuBrQJbnddOQC+kUk/k+su4PvDPeniccGEf9YJii5blT4oYPMtfLsDrgizkltdH UxhPFiCXteT9OIDnDFGN56cnX3QVtKmH8qxHKXMybesWwURGncNVvvPwOWsjS+nhr+wykv Smz4cZGKDHQPbDKXSb8pTz1bSnOPs6RAiNuie6hnP2hBDCB12j9fIk2J38BsmNE+TQ+ZK5 nuGoivMzPByqHslJGOFzcVYt307YyvnYgp3jjtaemDWewxBvkVLSqMgpc2pKwPrVRsRJft k9FIQsMmz7HWjBufZ8a/06Y3hkmYmqTvlTIQrk/Jo6bsALM5Kni8OAmq/7+I2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785597243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pCzS4+nInD6Jg3vBrLIBaL42RQG6+4Wp9mFSZ3S7q2M=; b=aRUJdGCwaC4Ccd5yrI/ZAe+e/rZYE3jKEVNqwH2TOUk7kOC5BVzfYJyFs2b6G1T7uXzN1Y iDO+V5yOLynz2KBB/16bi+HrNcAP8XttkouHZ7TJbU8oiy/0n+3zdsGSFdYMK4rlnlWz7U ZPodxZpUvO2dX335SmgXU/M+AexC5uMVAVIAShe0VlCS0N4e6DbFCfn867ik0nvgJ2E1jV 74fGXfVuJfpYy29mwe6SDS48R2V9NJ+duSIWApp2616ef2YZmXjNQzg6udFBNGvUy2PmjE cR6CVNCc/nVBCU4rG+GjP4XTiqtgMuA0pC2O+gGMDtp19EBWr6MjCkJsVtFRlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hC60V70Wkzpgr for ; Sat, 01 Aug 2026 15:14:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37dad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 01 Aug 2026 15:14:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: David Arinzon From: Arthur Kiyanovski Subject: git: 203735fee058 - stable/14 - ena: Batch RX statistics updates List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: akiyano X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 203735fee058c783a39d7f4441aad29994db493d Auto-Submitted: auto-generated Date: Sat, 01 Aug 2026 15:14:02 +0000 Message-Id: <6a6e0d3a.37dad.3ca7c176@gitrepo.freebsd.org> The branch stable/14 has been updated by akiyano: URL: https://cgit.FreeBSD.org/src/commit/?id=203735fee058c783a39d7f4441aad29994db493d commit 203735fee058c783a39d7f4441aad29994db493d Author: David Arinzon AuthorDate: 2026-04-16 11:22:04 +0000 Commit: Arthur Kiyanovski CommitDate: 2026-08-01 15:12:05 +0000 ena: Batch RX statistics updates Move per-packet counter_enter/counter_exit pairs out of the RX processing loop and batch them into a single update after the loop completes. Previously, each received packet triggered two separate counter_enter/counter_exit blocks -- one for bytes and one for packet count. This commit accumulates totals in local variables and updates all four counters (ring and hw stats for both packets and bytes) in a single counter_enter/counter_exit block after the loop. Also move the stats update to after the refill and LRO flush so that the error path (goto update_stats) and the normal path converge at the same label, avoiding code duplication. Submitted by: David Arinzon MFC after: 2 weeks Sponsored by: Amazon, Inc. Reviewed by: cperciva Differential Revision: https://reviews.freebsd.org/D58240 (cherry picked from commit 3ba01cb4c61cc1e29c4d1d7ea4b73cdffb5ce3c2) --- sys/dev/ena/ena_datapath.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/sys/dev/ena/ena_datapath.c b/sys/dev/ena/ena_datapath.c index 4fbdb8daaf58..1ce5c2ae3e65 100644 --- a/sys/dev/ena/ena_datapath.c +++ b/sys/dev/ena/ena_datapath.c @@ -576,6 +576,8 @@ ena_rx_cleanup(struct ena_ring *rx_ring) unsigned int qid; int rc, i; int budget = (ENA_RX_DESC_BUDGET == -1) ? INT_MAX : ENA_RX_DESC_BUDGET; + uint64_t total_pkts = 0; + uint64_t total_bytes = 0; #ifdef DEV_NETMAP int done; #endif /* DEV_NETMAP */ @@ -618,7 +620,7 @@ ena_rx_cleanup(struct ena_ring *rx_ring) 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)) @@ -650,12 +652,7 @@ ena_rx_cleanup(struct ena_ring *rx_ring) 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. @@ -680,10 +677,7 @@ ena_rx_cleanup(struct ena_ring *rx_ring) 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 @@ -706,6 +700,13 @@ ena_rx_cleanup(struct ena_ring *rx_ring) 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); }