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

pfsync: Ensure we enter network epoch before calling ip_output

Browse Source 
As of r356974 calls to ip_output() require us to be in the network epoch.
That wasn't the case for the calls done from pfsyncintr() and
pfsync_defer_tmo().
This commit is contained in:
Kristof Provost 2020-01-22 21:01:19 +00:00
parent 979b4b3495
commit ef1bd1e517
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=356995
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/netpfil/pf/if_pfsync.c
View File

@ -1806,6 +1806,7 @@ pfsync_undefer(struct pfsync_deferral *pd, int drop)
static void
pfsync_defer_tmo(void *arg)
{
struct epoch_tracker et;
struct pfsync_deferral *pd = arg;
struct pfsync_softc *sc = pd->pd_sc;
struct mbuf *m = pd->pd_m;
@ -1814,6 +1815,7 @@ pfsync_defer_tmo(void *arg)
PFSYNC_BUCKET_LOCK_ASSERT(b);
NET_EPOCH_ENTER(et);
CURVNET_SET(m->m_pkthdr.rcvif->if_vnet);
TAILQ_REMOVE(&b->b_deferrals, pd, pd_entry);
@ -1828,6 +1830,7 @@ pfsync_defer_tmo(void *arg)
pf_release_state(st);
CURVNET_RESTORE();
NET_EPOCH_EXIT(et);
}
static void
@ -2307,11 +2310,13 @@ pfsync_push_all(struct pfsync_softc *sc)
static void
pfsyncintr(void *arg)
{
struct epoch_tracker et;
struct pfsync_softc *sc = arg;
struct pfsync_bucket *b;
struct mbuf *m, *n;
int c;
NET_EPOCH_ENTER(et);
CURVNET_SET(sc->sc_ifp->if_vnet);
for (c = 0; c < pfsync_buckets; c++) {
@ -2345,6 +2350,7 @@ pfsyncintr(void *arg)
}
}
CURVNET_RESTORE();
NET_EPOCH_EXIT(et);
}
static int