From nobody Fri Apr 24 13:25:27 2026 X-Original-To: dev-commits-src-all@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 4g2DGv4M3Zz6bGbx for ; Fri, 24 Apr 2026 13:25:27 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2DGv3fglz45MR for ; Fri, 24 Apr 2026 13:25:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777037127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ViTSkTu4h+D9t4LfHqGcLhiHMg94pDrusvrRAOpf9Q=; b=Ywz7HSc759w6yNs2U45LpGZdZv378O9FKdoEICq6locsnqt+nJbaXwMPbDRxA7imWFFfC4 rSlPGIDQ57/irVvoKA4JBhbs0xalUD/bRE5S4d4dFEgJiMXYMrk1aPgZF9ahfvtr921Z0K NzZoW7NkPnfQdclw4cLCAftAMPbRaVhr93tIA9CVrf8RGOflc18Y8zoRdJChks3v1RlkR6 H9MqFG+CnV+wL9dveLuvfRSVebl6iVxKu0WiGmerfcJks+r/AfR2Jw+7UxHFyyNNihbigI guTAluudiZErtvofRxNhP8uwxyhbb73P0eatHGmfRVPYt2z239eH/TtdesSxHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777037127; a=rsa-sha256; cv=none; b=UJRB+F9BXQDmQcY+syBlyVtwX45GRTCGEAucFxRpTvAz6Mpb4iUSfRlYLXqeltUKCPUvqu Fd0fSPJPymGY36B6A0KFZnuWuFx3IxXV0ooS19DVCcHUxeeg+MYRoWoXqpQj7OC/LMbe8G J65PPpxfLMmVgJuGnFPiXNi6QekmhQN5wysqXzIf+O970+EFJZsnyxPadvwiwh2tw2AQxr J5bVaXI+a3HUcgA0lSlrydrteAhqUGFW5an1Zm48Sv2W12tV3RtB/6QFaDia9smqH/cevZ g70n6RKYb3Py3YJQnFf4X+EHIJoQXB0D6/qJ4The2FiojtH2tHFDiQqQAngGfA== 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=1777037127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ViTSkTu4h+D9t4LfHqGcLhiHMg94pDrusvrRAOpf9Q=; b=U6GDisGYIPK+am+kwtIC+kq0+D2pI86f2YtEQdggM32WXYD/2o8YHOGhZwpjWRjMzuJbAp seG+r8LxZFUP3wwYFrWLVs17+ZOoMZgWdRJf9jTE5DoYRve94+zgBBdpm4AwImQGyRPPMU Ej+kLCOuCoapSihJ3N4oVwe+eD0YYNxqdNF9oHp6BoN9FOEf9AvrbS3j+VictoGRZ9JFRb 2zomLzl93ygx/LW6LQzugRKGTyy/xaGIpq4whLW3o3Pw5xCj0dRmIPPbmhNayxtiM2tny0 uDujBnlDMrrcsGX7YDVEIkCe1bi6RKdkFY9NKzuqtihLAhUHv6u7z4hifyk5Ug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2DGv32dSz14MZ for ; Fri, 24 Apr 2026 13:25:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20c6a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 13:25:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 35f8e4b961cb - stable/14 - dpaa2: add support for several interface counters List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 35f8e4b961cb2a1ee5b04f8ce14b340b80e57395 Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 13:25:27 +0000 Message-Id: <69eb6f47.20c6a.473759d5@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=35f8e4b961cb2a1ee5b04f8ce14b340b80e57395 commit 35f8e4b961cb2a1ee5b04f8ce14b340b80e57395 Author: Michael Tuexen AuthorDate: 2026-01-30 09:58:57 +0000 Commit: Michael Tuexen CommitDate: 2026-04-24 11:23:54 +0000 dpaa2: add support for several interface counters Add support for IFCOUNTER_IPACKETS, IFCOUNTER_OPACKETS, IFCOUNTER_OBYTES, IFCOUNTER_OMCASTS, IFCOUNTER_OERRORS, and IFCOUNTER_OQDROPS. This allows tools like systat to report the incoming and outgoing bandwidth. Reviewed by: dsl, Timo Völker Differential Revision: https://reviews.freebsd.org/D54893 (cherry picked from commit 33596d92555e5b1632fca14eb9af295e4b8f751c) --- sys/dev/dpaa2/dpaa2_ni.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sys/dev/dpaa2/dpaa2_ni.c b/sys/dev/dpaa2/dpaa2_ni.c index f72217084cdd..3be33cd18b66 100644 --- a/sys/dev/dpaa2/dpaa2_ni.c +++ b/sys/dev/dpaa2/dpaa2_ni.c @@ -2517,6 +2517,7 @@ dpaa2_ni_transmit(if_t ifp, struct mbuf *m) ch = sc->channels[chidx]; error = buf_ring_enqueue(ch->xmit_br, m); if (__predict_false(error != 0)) { + if_inc_counter(ifp, IFCOUNTER_OQDROPS, 1); m_freem(m); } else { taskqueue_enqueue(ch->cleanup_tq, &ch->cleanup_task); @@ -2928,6 +2929,8 @@ dpaa2_ni_tx(struct dpaa2_ni_softc *sc, struct dpaa2_channel *ch, bus_dma_segment_t segs[DPAA2_TX_SEGLIMIT]; int rc, nsegs; int error; + int len; + bool mcast; mtx_assert(&tx->lock, MA_NOTOWNED); mtx_lock(&tx->lock); @@ -2942,6 +2945,8 @@ dpaa2_ni_tx(struct dpaa2_ni_softc *sc, struct dpaa2_channel *ch, buf->m = m; sgt = buf->sgt; } + len = m->m_pkthdr.len; + mcast = (m->m_flags & M_MCAST) != 0; #if defined(INVARIANTS) struct dpaa2_ni_tx_ring *btx = (struct dpaa2_ni_tx_ring *)buf->opt; @@ -2959,6 +2964,7 @@ dpaa2_ni_tx(struct dpaa2_ni_softc *sc, struct dpaa2_channel *ch, if (md == NULL) { device_printf(dev, "%s: m_collapse() failed\n", __func__); fq->chan->tx_dropped++; + if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1); goto err; } @@ -2969,6 +2975,7 @@ dpaa2_ni_tx(struct dpaa2_ni_softc *sc, struct dpaa2_channel *ch, device_printf(dev, "%s: bus_dmamap_load_mbuf_sg() " "failed: error=%d\n", __func__, error); fq->chan->tx_dropped++; + if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1); goto err; } } @@ -2978,6 +2985,7 @@ dpaa2_ni_tx(struct dpaa2_ni_softc *sc, struct dpaa2_channel *ch, device_printf(dev, "%s: failed to build frame descriptor: " "error=%d\n", __func__, error); fq->chan->tx_dropped++; + if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1); goto err_unload; } else sc->tx_sg_frames++; /* for sysctl(9) */ @@ -2996,8 +3004,13 @@ dpaa2_ni_tx(struct dpaa2_ni_softc *sc, struct dpaa2_channel *ch, if (rc != 1) { fq->chan->tx_dropped++; + if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1); goto err_unload; } else { + if (mcast) + if_inc_counter(sc->ifp, IFCOUNTER_OMCASTS, 1); + if_inc_counter(sc->ifp, IFCOUNTER_OPACKETS, 1); + if_inc_counter(sc->ifp, IFCOUNTER_OBYTES, len); fq->chan->tx_frames++; } return; @@ -3201,6 +3214,7 @@ dpaa2_ni_rx(struct dpaa2_channel *ch, struct dpaa2_ni_fq *fq, m->m_pkthdr.rcvif = sc->ifp; m->m_pkthdr.flowid = fq->fqid; M_HASHTYPE_SET(m, M_HASHTYPE_OPAQUE); + if_inc_counter(sc->ifp, IFCOUNTER_IPACKETS, 1); if (update_csum_flags && ((if_getcapenable(sc->ifp) & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) != 0)) {