Author: glebius
Date: Tue Oct 8 16:45:56 2019
New Revision: 353312
URL: https://svnweb.freebsd.org/changeset/base/353312
Log:
In DIAGNOSTIC block of if_delmulti_ifma_flags() enter the network epoch.
This quickly plugs the regression from r353292. The locking of multicast
definitely needs a broader review today...
Reported by: pho, dhw
Modified:
head/sys/net/if.c
Modified: head/sys/net/if.c
==============================================================================
--- head/sys/net/if.c Tue Oct 8 16:42:50 2019 (r353311)
+++ head/sys/net/if.c Tue Oct 8 16:45:56 2019 (r353312)
@@ -3689,13 +3689,14 @@ if_delmulti_ifma_flags(struct ifmultiaddr *ifma, int f
if (ifp == NULL) {
printf("%s: ifma_ifp seems to be detached\n", __func__);
} else {
+ struct epoch_tracker et;
struct ifnet *oifp;
- NET_EPOCH_ASSERT();
-
+ NET_EPOCH_ENTER(et);
CK_STAILQ_FOREACH(oifp, &V_ifnet, if_link)
if (ifp == oifp)
break;
+ NET_EPOCH_EXIT(et);
if (ifp != oifp)
ifp = NULL;
}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
