From e1074ed6a08033ee571b4bedb3ffe6049a4a7361 Mon Sep 17 00:00:00 2001 From: Gleb Smirnoff Date: Tue, 8 Dec 2020 16:46:00 +0000 Subject: [PATCH] The list of ports in configuration path shall be protected by locks, epoch shall be used only for fast path. Thus use LAGG_XLOCK() in lagg_[un]register_vlan. This fixes sleeping in epoch panic. PR: 240609 --- sys/net/if_lagg.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 773ceb01772..2177d11c3fc 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -471,17 +471,16 @@ lagg_proto_portreq(struct lagg_softc *sc, struct lagg_port *lp, void *v) static void lagg_register_vlan(void *arg, struct ifnet *ifp, u_int16_t vtag) { - struct epoch_tracker et; struct lagg_softc *sc = ifp->if_softc; struct lagg_port *lp; if (ifp->if_softc != arg) /* Not our event */ return; - NET_EPOCH_ENTER(et); + LAGG_XLOCK(sc); CK_SLIST_FOREACH(lp, &sc->sc_ports, lp_entries) EVENTHANDLER_INVOKE(vlan_config, lp->lp_ifp, vtag); - NET_EPOCH_EXIT(et); + LAGG_XUNLOCK(sc); } /* @@ -491,17 +490,16 @@ lagg_register_vlan(void *arg, struct ifnet *ifp, u_int16_t vtag) static void lagg_unregister_vlan(void *arg, struct ifnet *ifp, u_int16_t vtag) { - struct epoch_tracker et; struct lagg_softc *sc = ifp->if_softc; struct lagg_port *lp; if (ifp->if_softc != arg) /* Not our event */ return; - NET_EPOCH_ENTER(et); + LAGG_XLOCK(sc); CK_SLIST_FOREACH(lp, &sc->sc_ports, lp_entries) EVENTHANDLER_INVOKE(vlan_unconfig, lp->lp_ifp, vtag); - NET_EPOCH_EXIT(et); + LAGG_XUNLOCK(sc); } static int