From nobody Fri Apr 24 12:31:55 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 4g2C575C9mz6bB8B for ; Fri, 24 Apr 2026 12:31:55 +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 4g2C574Tzkz3w07 for ; Fri, 24 Apr 2026 12:31:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777033915; 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=C5Nd/0iHlVC0h7xbQmjiSaMdyQi+MnXa2B9vXEAhLtY=; b=PpBj3jyv0F89kDT/isXkBQRhM0D5vSVu75HvTzdpJhheEJrqs7usvnCukBru+gbKhbqStN xtGS2MddYxge11zKIIjPQFd9k+EHTpJPWCPrCftIGkRNLDbk02NmUuh+Yp9C5fGgKz3Tkf 2fP64KuiRMQygBq6or7VaEsF6CzMi5t1WXz4mpy8VenK0eWOczo/S8ljLXGaDp6ZmSfa5X rWi4xwtBSe5Zgl3zs1Nu/pRYZOYI5cg9LMm4o0c9wOwdoH3wV3C7v6xZqZoZGSmR0n4/u1 58QCMHWsmpIH3Txxgu/ALW4p3YBxM9O/Fyr/zaZiQUQe3XZ6DsrWL8dN9LoSlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777033915; a=rsa-sha256; cv=none; b=LO72GZ5esavs9DAkbzavHuqaF/pVVVbHqsJGy01xWwXc1MmM72dcA1RKOZjtKTXAZiUVWg am/YdeZaRTwVK2+r5hulW70RHprlPtDr41e3kBhlKOFZWeQsK3hSzyHcqhhOD+H5aniIRu UTiDaNREvYPA5YdhLtaOzBu4xBrvYhh9k8BG+1ZDh34AWUQp6ugVxeFIbhVJah4pzR4XbD oma2xyRwUINNSyvgmOEWR49k6lMdc9Leh1MoTVQoXMurcGWV07i88baViuM9ovPkyN6wvc p4c4n8EUi3cGF8ZWG3oqsAv4X7y1qP4WwZESlfbvCeYO7ccRcphsR5rua1C3WQ== 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=1777033915; 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=C5Nd/0iHlVC0h7xbQmjiSaMdyQi+MnXa2B9vXEAhLtY=; b=uwHx/Tn7Q7nRFa2Ke5t8WKvFQCDlZqQBYN1h8h4pumj+THM7uInAgMiZDiZPY16NUSt8I1 LhLt6rzvW5pEj0m+TX5lHNna73ORCVc6WSbZltyKA/NDwQXr+tc4L6ZxmD9IRhEk8biYt2 QMgXGWeYLAUB6l6hhDGwouGvoOonGvCXEc4STGAcAXqXq91PKXlVsX0ROsYna/CJLHDd84 SGxIe8g6UJVcXzTZB/guZHyAswEYx0qa8hPi5bUnhcL1BGJZV1fuL/Ow8y22MYODyCQQ0r dRS09ScdK4MccOJVwggypwWK0/cm3aksmJ8maRKYMnuPSct0xptwJE45zEo1cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2C57426Mz136W for ; Fri, 24 Apr 2026 12:31:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bc81 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 12:31:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 2fce3f27127b - stable/15 - dpaa2: add support for several interface counters 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 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/15 X-Git-Reftype: branch X-Git-Commit: 2fce3f27127b9ec47b156d6ed883d550fabe46cc Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 12:31:55 +0000 Message-Id: <69eb62bb.1bc81.1e5541bd@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=2fce3f27127b9ec47b156d6ed883d550fabe46cc commit 2fce3f27127b9ec47b156d6ed883d550fabe46cc Author: Michael Tuexen AuthorDate: 2026-01-30 09:58:57 +0000 Commit: Michael Tuexen CommitDate: 2026-04-24 12:30:09 +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 460e2a02a9a7..f85dc41a748c 100644 --- a/sys/dev/dpaa2/dpaa2_ni.c +++ b/sys/dev/dpaa2/dpaa2_ni.c @@ -2549,6 +2549,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); @@ -2960,6 +2961,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); @@ -2974,6 +2977,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; @@ -2991,6 +2996,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; } @@ -3001,6 +3007,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; } } @@ -3010,6 +3017,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) */ @@ -3028,8 +3036,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; @@ -3233,6 +3246,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)) {