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

Execute nd6_dad_timer() in the network epoch, since nd6_dad_duplicated()

Browse Source 
requires it.
Make nd6_dad_starttimer() require network epoch.  Two calls out of three
happen from nd6_dad_timer().  Enter epoch in the remaining one.
This commit is contained in:
Gleb Smirnoff 2019-10-22 16:06:33 +00:00
parent 0ddd3082a4
commit be0c32e2ff
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/netinet6/nd6_nbr.c
View File

@ -1192,13 +1192,10 @@ static void
nd6_dad_starttimer(struct dadq *dp, int ticks, int send_ns)
{
if (send_ns != 0) {
struct epoch_tracker et;
NET_EPOCH_ASSERT();
NET_EPOCH_ENTER(et);
if (send_ns != 0)
nd6_dad_ns_output(dp);
NET_EPOCH_EXIT(et);
}
callout_reset(&dp->dad_timer_ch, ticks,
(void (*)(void *))nd6_dad_timer, (void *)dp);
}
@ -1237,6 +1234,7 @@ nd6_dad_start(struct ifaddr *ifa, int delay)
struct in6_ifaddr *ia = (struct in6_ifaddr *)ifa;
struct dadq *dp;
char ip6buf[INET6_ADDRSTRLEN];
struct epoch_tracker et;
KASSERT((ia->ia6_flags & IN6_IFF_TENTATIVE) != 0,
("starting DAD on non-tentative address %p", ifa));
@ -1298,7 +1296,9 @@ nd6_dad_start(struct ifaddr *ifa, int delay)
/* Add this to the dadq and add a reference for the dadq. */
refcount_init(&dp->dad_refcnt, 1);
nd6_dad_add(dp);
NET_EPOCH_ENTER(et);
nd6_dad_starttimer(dp, delay, 0);
NET_EPOCH_EXIT(et);
}
/*
@ -1330,9 +1330,11 @@ nd6_dad_timer(struct dadq *dp)
struct ifnet *ifp = dp->dad_ifa->ifa_ifp;
struct in6_ifaddr *ia = (struct in6_ifaddr *)ifa;
char ip6buf[INET6_ADDRSTRLEN];
struct epoch_tracker et;
KASSERT(ia != NULL, ("DAD entry %p with no address", dp));
NET_EPOCH_ENTER(et);
if (ND_IFINFO(ifp)->flags & ND6_IFF_IFDISABLED) {
/* Do not need DAD for ifdisabled interface. */
log(LOG_ERR, "nd6_dad_timer: cancel DAD on %s because of "
@ -1429,6 +1431,7 @@ nd6_dad_timer(struct dadq *dp)
err:
nd6_dad_del(dp);
done:
NET_EPOCH_EXIT(et);
CURVNET_RESTORE();
}