From owner-svn-ports-head@freebsd.org Wed Jan 6 11:54:15 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A13644CDB2A; Wed, 6 Jan 2021 11:54:15 +0000 (UTC) (envelope-from nc@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D9npH48tDz3Q6C; Wed, 6 Jan 2021 11:54:15 +0000 (UTC) (envelope-from nc@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 81AFB1DFD8; Wed, 6 Jan 2021 11:54:15 +0000 (UTC) (envelope-from nc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 106BsFXi098249; Wed, 6 Jan 2021 11:54:15 GMT (envelope-from nc@FreeBSD.org) Received: (from nc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 106BsFMw098248; Wed, 6 Jan 2021 11:54:15 GMT (envelope-from nc@FreeBSD.org) Message-Id: <202101061154.106BsFMw098248@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: nc set sender to nc@FreeBSD.org using -f From: Neel Chauhan Date: Wed, 6 Jan 2021 11:54:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r560502 - in head/emulators: virtualbox-ose-kmod virtualbox-ose/files X-SVN-Group: ports-head X-SVN-Commit-Author: nc X-SVN-Commit-Paths: in head/emulators: virtualbox-ose-kmod virtualbox-ose/files X-SVN-Commit-Revision: 560502 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jan 2021 11:54:15 -0000 Author: nc Date: Wed Jan 6 11:54:14 2021 New Revision: 560502 URL: https://svnweb.freebsd.org/changeset/ports/560502 Log: emulators/virtualbox-ose-kmod: Fix kernel panic on 13-CURRENT with EPOCH and bridge mode. Reviewed by: kp, jkim (previous version) Approved by: kp, jkim (previous version), 0mp (mentor) Differential Revision: https://reviews.freebsd.org/D26359 Added: head/emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_VBoxNetFlt_freebsd_VBoxNetFlt-freebsd.c (contents, props changed) Modified: head/emulators/virtualbox-ose-kmod/Makefile Modified: head/emulators/virtualbox-ose-kmod/Makefile ============================================================================== --- head/emulators/virtualbox-ose-kmod/Makefile Wed Jan 6 11:46:31 2021 (r560501) +++ head/emulators/virtualbox-ose-kmod/Makefile Wed Jan 6 11:54:14 2021 (r560502) @@ -3,7 +3,7 @@ PORTNAME= virtualbox-ose PORTVERSION= 5.2.44 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/ PKGNAMESUFFIX= -kmod Added: head/emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_VBoxNetFlt_freebsd_VBoxNetFlt-freebsd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_VBoxNetFlt_freebsd_VBoxNetFlt-freebsd.c Wed Jan 6 11:54:14 2021 (r560502) @@ -0,0 +1,34 @@ +--- src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c.orig 2020-07-28 21:59:30.107638000 -0700 ++++ src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c 2020-07-28 22:00:37.858885000 -0700 +@@ -361,7 +361,14 @@ + { + if (mtag != NULL || !fActive) + { ++#if __FreeBSD_version >= 1300049 ++ struct epoch_tracker et; ++ NET_EPOCH_ENTER(et); ++#endif + ether_demux(ifp, m); ++#if __FreeBSD_version >= 1300049 ++ NET_EPOCH_EXIT(et); ++#endif + if (fActive) + vboxNetFltRelease(pThis, true /*fBusy*/); + VBOXCURVNET_RESTORE(); +@@ -457,7 +464,16 @@ + if (fDropIt) + m_freem(m); + else ++ { ++#if __FreeBSD_version >= 1300049 ++ struct epoch_tracker et; ++ NET_EPOCH_ENTER(et); ++#endif + ether_demux(ifp, m); ++#if __FreeBSD_version >= 1300049 ++ NET_EPOCH_EXIT(et); ++#endif ++ } + } + vboxNetFltRelease(pThis, true /* fBusy */); + VBOXCURVNET_RESTORE();