d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: Revert vnet/epair cleanup race mitigation

Browse Source 
Revert the mitigation code for the vnet/epair cleanup race (done in r365457).
r368237 introduced a more reliable fix.

MFC after:	2 weeks
Sponsored by:	Modirum MDPay
This commit is contained in:
Kristof Provost 2020-12-01 16:34:43 +00:00
parent e133271fc1
commit 7f883a9b5b
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/net/if.c
View File

@ -1338,11 +1338,6 @@ if_vmove(struct ifnet *ifp, struct vnet *new_vnet)
ifindex_free_locked(ifp->if_index); ifindex_free_locked(ifp->if_index);
IFNET_WUNLOCK(); IFNET_WUNLOCK();
/* Don't re-attach DYING interfaces. */
if (ifp->if_flags & IFF_DYING)
return (0);
/* /*
* Perform interface-specific reassignment tasks, if provided by * Perform interface-specific reassignment tasks, if provided by
* the driver. * the driver.

10
sys/net/if_epair.c
View File

@ -611,14 +611,8 @@ epair_qflush(struct ifnet *ifp)
struct epair_softc *sc; struct epair_softc *sc;
sc = ifp->if_softc; sc = ifp->if_softc;
KASSERT(sc != NULL, ("%s: ifp=%p, epair_softc gone? sc=%p\n",
/* __func__, ifp, sc));
* See epair_clone_destroy(), we can end up getting called twice.
* Don't do anything on the second call.
*/
if (sc == NULL)
return;
/* /*
* Remove this ifp from all backpointer lists. The interface will not * Remove this ifp from all backpointer lists. The interface will not
* usable for flushing anyway nor should it have anything to flush * usable for flushing anyway nor should it have anything to flush