From nobody Mon Oct 14 17:44:36 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 4XS4P02Hhcz5Ytyq; Mon, 14 Oct 2024 17:44:36 +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 4XS4P01lcvz4hT2; Mon, 14 Oct 2024 17:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728927876; 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=//KLNHnRH0OA6D81UWGAvTPbQG7eAKsj6ab2nPR7UcI=; b=H77JHGUOIULA7pHvvwzyJnxhdtPn32muzWFGXqrtXdR97E3WQ0jkBUJC+8sdO/1fAOxJaN TNRSTc8slhqb1IzwIGJG4YOHQ2nu38tz4NnS7OnmHXTwSO3snGBIaxFaUxOY2ArD0H+VYa Tuzbe3zr09BXa3c8UT7tmhpCOpHnBBFGoiKR93UKN+5D42r8M72Ww7ziE6arkLr/lKBjMU dJ5eQz0fGAOVELNzEiLwfdLiRok0BlxFR3k9v7ZE7LlISPu8xCBKjga0bcATELYRTE5vtM fYkl7fNW5tncJWwpDVCaCythjPuIsPmoANBWmdaXkfCrY7GX2bWCKB19CMy4pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728927876; 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=//KLNHnRH0OA6D81UWGAvTPbQG7eAKsj6ab2nPR7UcI=; b=Zd4zYZQBGeWyFDdVbUpeT2E4UFU6hIu59rJc+CY2Vkeo6Qwtjunmq0hInIYaTQqys8og2B U3X1kvtKlN5vlpy79MFAp8aFvUGSzmMSAZmXomM6bkr6o8u5QmZooQ4/ixnKIa0CUE8SPZ IefjdG3GmCxL3Ipxx/vxzIYphW6QtJff/Te5uFsr3hyQPfcGvaCBYLlNYi6vHmIxa4X0VJ FvdtRmER6GUJUmEEEaH5OQF3fjLYZCWQorHl34OuQkLh998C7nE6raSDl329Ub5575uevQ V3bBmdhUGmyHe8rbdivntN1ZhIcjfe1PzhXo/2GoBFfqA1ERVp8U/5gqtFHssw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728927876; a=rsa-sha256; cv=none; b=MhfcjxJhv85eFPxrXNXk4jbuzlfDETKAHCX/yRhtUZbQ3zNN6rqoOjOyHdjiqDTtMElAcT vr2lNB/MtC+8ASNzaAkUlcO2i/i89EoW/k82MwBS6WC9+88C8o7tHORe/nJ8EeLwOhj6Zb 5Zzdb89A2i5t24A7uQ/JKihWRlqi7xeQEQWFps6ENofXTiYSMPAZgbCAcr12r51AVzEHml hxA+nmo1S7kyVDgV0f8XoGCLw4/Wrf8ZSgnIpChuQplDKWSDsZEr9pz8YlHjPV2xdKwLGN yOCxX9wluKmJIJNXZlHTi19qOizw7TmP5qCtqyij7jYG8P4NIwm3/gddrdlwEQ== 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 4XS4P01Mthzncv; Mon, 14 Oct 2024 17:44:36 +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 49EHiaLW015572; Mon, 14 Oct 2024 17:44:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49EHia8n015569; Mon, 14 Oct 2024 17:44:36 GMT (envelope-from git) Date: Mon, 14 Oct 2024 17:44:36 GMT Message-Id: <202410141744.49EHia8n015569@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: e69e172d4058 - main - 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/main X-Git-Reftype: branch X-Git-Commit: e69e172d40585cfbcfdb28433cec523ca4867cf1 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=e69e172d40585cfbcfdb28433cec523ca4867cf1 commit e69e172d40585cfbcfdb28433cec523ca4867cf1 Author: Bjoern A. Zeeb AuthorDate: 2024-10-13 23:14:35 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-10-14 17:41:35 +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. MFC after: 3 days Reviewed by: dsl Differential Revision: https://reviews.freebsd.org/D47103 --- 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)) {