Date: Wed, 6 Jan 2021 11:54:15 +0000 (UTC) From: Neel Chauhan <nc@FreeBSD.org> 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 Message-ID: <202101061154.106BsFMw098248@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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();
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101061154.106BsFMw098248>