move IPv6 prefix adding from workq to taskq; as a happy benefit, we

can delete 2 dozen or so lines that check to see if we've queued
up a prefix addition multiple times.

ok stsp@

2 files changed, 13 insertions, 43 deletions

diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h
index fb001cad37d..f17e69535f5 100644
--- a/sys/netinet6/nd6.h
+++ b/sys/netinet6/nd6.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nd6.h,v 1.37 2014/05/07 08:14:59 mpi Exp $	*/
+/*	$OpenBSD: nd6.h,v 1.38 2014/07/11 15:03:17 blambert Exp $	*/
 /*	$KAME: nd6.h,v 1.95 2002/06/08 11:31:06 itojun Exp $	*/
 
 /*
@@ -33,6 +33,8 @@
 #ifndef _NETINET6_ND6_H_
 #define _NETINET6_ND6_H_
 
+#include <sys/task.h>
+
 /* see net/route.h, or net/if_inarp.h */
 #ifndef RTF_ANNOUNCE
 #define RTF_ANNOUNCE	RTF_PROTO2
@@ -184,6 +186,8 @@ struct nd_prefix {
 	struct sockaddr_in6 ndpr_prefix;	/* prefix */
 	struct in6_addr ndpr_mask; /* netmask derived from the prefix */
 
+	struct task ndpr_task;
+
 	time_t ndpr_expire;	/* expiration time of the prefix */
 	time_t ndpr_preferred;	/* preferred time of the prefix */
 	time_t ndpr_lastupdate; /* reception time of last advertisement */
diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c
index f6f6d2fe381..314429c1174 100644
--- a/sys/netinet6/nd6_rtr.c
+++ b/sys/netinet6/nd6_rtr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nd6_rtr.c,v 1.80 2014/03/27 10:39:23 mpi Exp $	*/
+/*	$OpenBSD: nd6_rtr.c,v 1.81 2014/07/11 15:03:17 blambert Exp $	*/
 /*	$KAME: nd6_rtr.c,v 1.97 2001/02/07 11:09:13 itojun Exp $	*/
 
 /*
@@ -942,6 +942,8 @@ nd6_prelist_add(struct nd_prefix *pr, struct nd_defrouter *dr,
 		new->ndpr_prefix.sin6_addr.s6_addr32[i] &=
 		    new->ndpr_mask.s6_addr32[i];
 
+	task_set(&new->ndpr_task, nd6_addr_add, new, NULL);
+
 	s = splsoftnet();
 	/* link ndpr_entry to nd_prefix list */
 	LIST_INSERT_HEAD(&nd_prefix, new, ndpr_entry);
@@ -1277,9 +1279,11 @@ prelist_update(struct nd_prefix *new, struct nd_defrouter *dr, struct mbuf *m)
 		 * 4941 temporary address. And the valid prefix lifetime is
 		 * non-zero. And there is no static address in the same prefix.
 		 * Create new addresses in process context.
+		 * Increment prefix refcount to ensure the prefix is not
+		 * removed before the task is done.
 		 */
 		pr->ndpr_refcnt++;
-		if (workq_add_task(NULL, 0, nd6_addr_add, pr, NULL))
+		if (task_add(systq, &pr->ndpr_task) == 0)
 			pr->ndpr_refcnt--;
 	}
 
@@ -1293,52 +1297,13 @@ nd6_addr_add(void *prptr, void *arg2)
 {
 	struct nd_prefix *pr = (struct nd_prefix *)prptr;
 	struct in6_ifaddr *ia6 = NULL;
-	struct ifaddr *ifa;
-	int ifa_plen, autoconf, privacy, s;
+	int autoconf, privacy, s;
 
 	s = splsoftnet();
 
 	autoconf = 1;
 	privacy = (pr->ndpr_ifp->if_xflags & IFXF_INET6_NOPRIVACY) == 0;
 
-	/* Because prelist_update() runs in interrupt context it may run
-	 * again before this work queue task is run, causing multiple work
-	 * queue tasks to be scheduled all of which add addresses for the
-	 * same prefix. So check again if a non-deprecated address has already
-	 * been autoconfigured for this prefix. */
-	TAILQ_FOREACH(ifa, &pr->ndpr_ifp->if_addrlist, ifa_list) {
-		if (ifa->ifa_addr->sa_family != AF_INET6)
-			continue;
-
-		ia6 = ifatoia6(ifa);
-
-		/*
-		 * Spec is not clear here, but I believe we should concentrate
-		 * on unicast (i.e. not anycast) addresses.
-		 * XXX: other ia6_flags? detached or duplicated?
-		 */
-		if ((ia6->ia6_flags & IN6_IFF_ANYCAST) != 0)
-			continue;
-
-		if ((ia6->ia6_flags & IN6_IFF_AUTOCONF) == 0)
-			continue;
-
-		if ((ia6->ia6_flags & IN6_IFF_DEPRECATED) != 0)
-			continue;
-
-		ifa_plen = in6_mask2len(&ia6->ia_prefixmask.sin6_addr, NULL);
-		if (ifa_plen == pr->ndpr_plen &&
-		    in6_are_prefix_equal(&ia6->ia_addr.sin6_addr,
-		    &pr->ndpr_prefix.sin6_addr, ifa_plen)) {
-			if ((ia6->ia6_flags & IN6_IFF_PRIVACY) == 0)
-				autoconf = 0;
-			else
-				privacy = 0;
-			if (!autoconf && !privacy)
-				break;
-		}
-	}
-
 	if (autoconf && (ia6 = in6_ifadd(pr, 0)) != NULL) {
 		ia6->ia6_ndpr = pr;
 		pr->ndpr_refcnt++;
@@ -1359,6 +1324,7 @@ nd6_addr_add(void *prptr, void *arg2)
 	if (autoconf || privacy)
 		pfxlist_onlink_check();
 
+	/* Decrement prefix refcount now that the task is done. */
 	pr->ndpr_refcnt--;
 
 	splx(s);