From nobody Thu Oct 17 09:16:53 2024 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 4XThzn5L95z5Ym57; Thu, 17 Oct 2024 09:16:53 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XThzn1XqZz4Hq9; Thu, 17 Oct 2024 09:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729156613; 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=Ae6VoMtGUCE/QvNHShEgIW8uBF/tc3moEkaMPjib8SU=; b=oB30jDu0oP1OwOJcfBNagzjsv1r5L08013DGyjLr0N8SKWxRfe2qI+iWZt06nHZ0bBtJd/ pETXE1gmr4yvEpEZqXEgZ74enkf3MlzPtlm4rathqBDqHgcaBmWUsBACZ8U+Byc9di6M+2 MUR8A7qgN3tWwKHCdKJZImSC+uZMDKg0+gavyXKpgz1WORiX7ee5Uh8W9lTWMkuG7P2k1l 2AGoeMyWvQDkDzmVXMgKGMKhVXqYRYEDPae+eRYm3DYSiK351BG+e+NzrgOvsUrhV2L6fl o0gAQmkksK0334I40jPnRo4nfvVv1Ig3mX0jeWFRXiilz+Dma0oBGQqeEoFQJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729156613; 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=Ae6VoMtGUCE/QvNHShEgIW8uBF/tc3moEkaMPjib8SU=; b=PPA9mm5tO4b/SgAuP+hYPuK5tMLupI6X9zbZ9YJaMgFYdxgiOhUI2yBsLiQ86TCMqGF45y esOOvJFYEypzwiH7MkvLPalUSCzLQ9Bg4sou3YSyNy5dh0cBw8BBVdCiqLxf2xJf9UsEsY y0st+osrUAtiUFtkiwIlvjE9E0l/AIliSlqF45gXEyji59udda/o2jT5k+v6HVoOLG5U6o 2mxLBYn6qCwr4ST8blOJ8pSjiK48NwuMARNNJskEA8ZPGzfbvWyWqbJfgzt4HaUQxaHYwn K56AKiLQidaczGBhZBexAnKeRdSGnkY9pq1qMagS9dsohocd1etLwL58JfCgRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729156613; a=rsa-sha256; cv=none; b=p8sHX+Vk4SWUdO4GpWUVoxOYLt8N1wFikhYDvkD3WTFjN6sStrtRx4teE3lkXdQTo+e6nc YWEqmXWGmQoX3TO+1rWThVW3zeoQC1mttAdrEeVph+z2HRH/97jmfb8mMQZk1UUJnT2u3A PnaHakjz/69v9DBxeXHmtKnl1dmLlZX1RejfxoP/2tJ6s4yA3ZYUUWVtjU74KOx+QK3nkD ZjHgWtt5LPVxdzzEJTsotzwo1OgdEcgx/2/ytItkfF9gpGlaHXViCowRlSTtuYQ4rJ91hO xaGINYJYd1Cdi/VF3MKgM+knhD14l0JKZIEv7fvQue38NDNbUrAcaq5MSPyzVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XThzn188HzkcM; Thu, 17 Oct 2024 09:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49H9Grup087999; Thu, 17 Oct 2024 09:16:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49H9Gr4C087996; Thu, 17 Oct 2024 09:16:53 GMT (envelope-from git) Date: Thu, 17 Oct 2024 09:16:53 GMT Message-Id: <202410170916.49H9Gr4C087996@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 9e596eab21d4 - stable/14 - dpaa2: allow tapping of tx packets in dpni 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9e596eab21d46864f0d90aae085319a1782e565e Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9e596eab21d46864f0d90aae085319a1782e565e commit 9e596eab21d46864f0d90aae085319a1782e565e Author: Bjoern A. Zeeb AuthorDate: 2024-10-13 23:14:35 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-10-16 21:50:49 +0000 dpaa2: allow tapping of tx packets in dpni Packet capturing on dpni is only half-working given the BPF_MTAP call in the TX path is missing. Add it to see packets in both directions. Reviewed by: dsl Differential Revision: https://reviews.freebsd.org/D47103 (cherry picked from commit e69e172d40585cfbcfdb28433cec523ca4867cf1) --- sys/dev/dpaa2/dpaa2_ni.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/dpaa2/dpaa2_ni.c b/sys/dev/dpaa2/dpaa2_ni.c index 622e63626bfe..698b440376e3 100644 --- a/sys/dev/dpaa2/dpaa2_ni.c +++ b/sys/dev/dpaa2/dpaa2_ni.c @@ -2936,6 +2936,8 @@ dpaa2_ni_tx(struct dpaa2_ni_softc *sc, struct dpaa2_channel *ch, KASSERT(btx->fq->chan == ch, ("%s: unexpected channel", __func__)); #endif /* INVARIANTS */ + BPF_MTAP(sc->ifp, m); + error = bus_dmamap_load_mbuf_sg(buf->dmat, buf->dmap, m, segs, &nsegs, BUS_DMA_NOWAIT); if (__predict_false(error != 0)) {