From nobody Fri Aug 18 23:18:48 2023 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 4RSHqt0Ynwz4fs5j; Fri, 18 Aug 2023 23:18:50 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSHqr3KWBz4nbh; Fri, 18 Aug 2023 23:18:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692400728; 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=wKy0vfVKahljse/DD19vrmlUWd15UJ/0OlC0WUBPjJc=; b=r60z0HgjePPMn4paBWYM5OOdhqFEye+98Eiif667V4asxs58NvhAGnvcYs2xfvquJibkON pZcGCL5B9JIzyyTMufg3/HgrtF/iJXGHnkdFLb2Blr0z1vhDKiUCLQknmsVQxW/qpLHoLl /czPNgOIY/IZDM+29jGwNqofHCGEZvTO/Fm1/trxKbEZevTSSBfTubHwobhaViMN13oLeY tVdv7ApUag0drv+1EZ3P/ncfwdxB6vnDjRZ5GMnEvUkxFHUuhhBhF9HCuxYDQ9aq4vcZLM zXZCXthMC2S8hRBNIIMNPxRsEC+pzKH1f/ttUhsuKP9mcXYVoouLGASNRG/t8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692400728; 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=wKy0vfVKahljse/DD19vrmlUWd15UJ/0OlC0WUBPjJc=; b=Zp7lwxwf00ra6Mge5DnHVGrxQ3S3SGVtRloJB7Z5S1XBK9pycYRkg9CwFSpoELXfCCKk5V hDgiKqSpY69ZW3E99GhMM5GSZJsuh5xsC2se7aiI5TBZK5LlZhajq26QqJ0o8kdRb3J0rQ qpiIeXaarxwb0+kTs3eTRWKjfhw53rbfzJgaVsES3ITbympYKYFKAN9JFe1UjDe6y4YwHi YOaSkARsBSGKyX5nMbi2rHRQ8FpvxQdDO1a+5fTLdR1YMOC7Wl7Lcn0JX0ZVvp7ZPjSTGV 7UXmMUjb1fPda33tQAmIXXvTSl4R1PTzICIvoT4WHRa/fTs0OPMLsPIBpmwXcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692400728; a=rsa-sha256; cv=none; b=jHt/MJKtBOHy0L/9hjiZag0XhtH+U7Mg4S+oEDdU9PtHtB1DGLXVm8BdGoziNuFh1xCGmq s+q5XqIfo64rnMqKwtOuX0FPjpdOEG7sJ2RtZTwq81+nYZp76Rj3cwS/33pQE7kpNbwHQp qF40dl2gRI5CkcECilpEkqJ9F1r5m4O0AiMm2wcdr13ZLCehywgXGt5OYKY5Je2JtLGo3v hDWnEyHL2+HFKvFsEHXuR3Lcqk3uoLHIgaBmp8TcQpVjo+qqWrXieH6X7ylJYcb0q66SrE juEHNjd9K0fBRMLHoA1q1c1Q+4wT9kFq6mU/DlakJcLMRPEyOBdrZcCkrWQYYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RSHqr25xFzbQw; Fri, 18 Aug 2023 23:18:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37INImgl018718; Fri, 18 Aug 2023 23:18:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37INIm8C018715; Fri, 18 Aug 2023 23:18:48 GMT (envelope-from git) Date: Fri, 18 Aug 2023 23:18:48 GMT Message-Id: <202308182318.37INIm8C018715@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 545ab0eb1993 - stable/13 - gve: Fix Tx tcpdump panic 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 545ab0eb19931d8b2e978da18811f16b97b94c78 Auto-Submitted: auto-generated The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=545ab0eb19931d8b2e978da18811f16b97b94c78 commit 545ab0eb19931d8b2e978da18811f16b97b94c78 Author: Shailend Chand AuthorDate: 2023-07-27 05:22:31 +0000 Commit: Xin LI CommitDate: 2023-08-18 23:18:16 +0000 gve: Fix Tx tcpdump panic Ringing the doorbell before making the BPF call can result in the mbuf being freed before the BPF call. Reviewed-by: markj Differential Revision: https://reviews.freebsd.org/D41189 (cherry picked from commit 74861578d95573e13a2099143f9d4e7edbb82806) --- sys/dev/gve/gve_tx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/gve/gve_tx.c b/sys/dev/gve/gve_tx.c index dd48bc35a258..db3f7415f412 100644 --- a/sys/dev/gve/gve_tx.c +++ b/sys/dev/gve/gve_tx.c @@ -706,12 +706,12 @@ gve_xmit_br(struct gve_tx_ring *tx) break; } + drbr_advance(ifp, tx->br); + BPF_MTAP(ifp, mbuf); + bus_dmamap_sync(tx->desc_ring_mem.tag, tx->desc_ring_mem.map, BUS_DMASYNC_PREWRITE); gve_db_bar_write_4(priv, tx->com.db_offset, tx->req); - - drbr_advance(ifp, tx->br); - BPF_MTAP(ifp, mbuf); } }