 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_arp.c,v 1.184 2015/10/08 08:17:37 roy Exp $	*/
+/*	$NetBSD: if_arp.c,v 1.185 2015/10/13 09:33:35 roy Exp $	*/
 /*-
  * Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Public Access Networks Corporation ("Panix").  It was developed under
  * contract to Panix by Eric Haszlakiewicz and Thor Lancelot Simon.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -58,27 +58,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)if_ether.c	8.2 (Berkeley) 9/26/94
  */
 /*
  * Ethernet address resolution protocol.
  * TODO:
  *	add "inuse/lock" bit (or ref. count) along with valid bit
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.184 2015/10/08 08:17:37 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.185 2015/10/13 09:33:35 roy Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
 #include "opt_inet.h"
 #endif
 #ifdef INET
 #include "bridge.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 @@ -781,223 +781,215 @@ arprequest(struct ifnet *ifp,
  * set one up and broadcast a request for the IP address.
  * Hold onto this mbuf and resend it once the address
  * is finally resolved.  A return value of 1 indicates
  * that desten has been filled in and the packet should be sent
  * normally; a 0 return indicates that the packet has been
  * taken over here, either now or for later transmission.
  */
 int
 arpresolve(struct ifnet *ifp, struct rtentry *rt, struct mbuf *m,
     const struct sockaddr *dst, u_char *desten)
+{
 	struct llentry *la;
 	const struct sockaddr_dl *sdl;
-	int renew;
+	const char *create_lookup;
-	int flags = 0;
+	bool renew;
 	int error;
 	KASSERT(m != NULL);
-	la = arplookup(ifp, m, &satocsin(dst)->sin_addr, 1, 0, 0, rt);
+	la = arplookup(ifp, m, &satocsin(dst)->sin_addr, 0, 0, 0, rt);
-	if (la != NULL)
+	if (la == NULL || la->la_rt == NULL)
-		rt = la->la_rt;
+		goto notfound;
-	if (la == NULL || rt == NULL) {
+	rt = la->la_rt;
 		ARP_STATINC(ARP_STAT_ALLOCFAIL);
 		log(LOG_DEBUG,
 		    "arpresolve: can't allocate llinfo on %s for %s\n",
 		    ifp->if_xname, in_fmtaddr(satocsin(dst)->sin_addr));
 		m_freem(m);
 		if (la != NULL)
 			LLE_RUNLOCK(la);
 		return 0;
 	sdl = satocsdl(rt->rt_gateway);
 	/*
 	 * Check the address family and length is valid, the address
 	 * is resolved; otherwise, try to resolve.
 	 */
 	if ((rt->rt_expire == 0 || rt->rt_expire > time_uptime) &&
 	    sdl->sdl_family == AF_LINK && sdl->sdl_alen != 0) {
 		memcpy(desten, CLLADDR(sdl),
 		    min(sdl->sdl_alen, ifp->if_addrlen));
 		rt->rt_pksent = time_uptime; /* Time for last pkt sent */
 		LLE_RUNLOCK(la);
 		return 1;
+	}
 	/*
 	 * Re-send the ARP request when appropriate.
 	 */
 #ifdef	DIAGNOSTIC
 	if (rt->rt_expire == 0) {
 		/* This should never happen. (Should it? -gwr) */
 		printf("arpresolve: unresolved and rt_expire == 0\n");
 		/* Set expiration time to now (expired). */
 		rt->rt_expire = time_uptime;
+	}
 #endif
-retry:
+notfound:
 	if (la == NULL) {
 		IF_AFDATA_RLOCK(ifp);
 		la = lla_lookup(LLTABLE(ifp), flags, dst);
 		IF_AFDATA_RUNLOCK(ifp);
 #ifdef IFF_STATICARP /* FreeBSD */
 #define _IFF_NOARP (IFF_NOARP | IFF_STATICARP)
 #else
 #define _IFF_NOARP IFF_NOARP
 #endif
-	if ((la == NULL) && ((flags & LLE_EXCLUSIVE) == 0)
+		if (ifp->if_flags & _IFF_NOARP) {
-	    && ((ifp->if_flags & _IFF_NOARP) == 0))
+			m_freem(m);
 			return 0;
 		flags |= LLE_EXCLUSIVE;
 #undef _IFF_NOARP
 		create_lookup = "create";
 		IF_AFDATA_WLOCK(ifp);
-		la = lla_create(LLTABLE(ifp), flags, dst);
+		la = lla_create(LLTABLE(ifp), LLE_EXCLUSIVE, dst);
 		IF_AFDATA_WUNLOCK(ifp);
 		if (la == NULL)
-		if (la == NULL) {
+			ARP_STATINC(ARP_STAT_ALLOCFAIL);
-			log(LOG_DEBUG,
+	} else if (LLE_TRY_UPGRADE(la) == 0) {
-			    "%s: failed to create llentry for %s on %s\n",
+		create_lookup = "lookup";
-			    __func__, inet_ntoa(satocsin(dst)->sin_addr),
+		LLE_RUNLOCK(la);
-			    ifp->if_xname);
+		IF_AFDATA_RLOCK(ifp);
 		la = lla_lookup(LLTABLE(ifp), LLE_EXCLUSIVE, dst);
 		IF_AFDATA_RUNLOCK(ifp);
+	}
 #undef _IFF_NOARP
 	if (la == NULL) {
 		log(LOG_DEBUG,
 		    "%s: failed to %s llentry for %s on %s\n",
 		    __func__, create_lookup, inet_ntoa(satocsin(dst)->sin_addr),
 		    ifp->if_xname);
 		m_freem(m);
 		return 0;
+	}
 	/* Just in case */
 	if (la->la_rt == NULL) {
 		log(LOG_DEBUG,
 		    "%s: valid llentry has no rtentry for %s on %s\n",
 		    __func__, inet_ntoa(satocsin(dst)->sin_addr),
 		    ifp->if_xname);
 		m_freem(m);
 		return 0;
+	}
 	rt = la->la_rt;
 	if ((la->la_flags & LLE_VALID) &&
-	    ((la->la_flags & LLE_STATIC) || la->la_expire > time_uptime)) {
+	    ((la->la_flags & LLE_STATIC) || la->la_expire > time_uptime))
+	{
 		sdl = satocsdl(rt->rt_gateway);
 		memcpy(desten, CLLADDR(sdl),
 		    min(sdl->sdl_alen, ifp->if_addrlen));
-		renew = 0;
+		renew = false;
 		/*
 		 * If entry has an expiry time and it is approaching,
 		 * see if we need to send an ARP request within this
 		 * arpt_down interval.
 		 */
 		if (!(la->la_flags & LLE_STATIC) &&
-		    time_uptime + la->la_preempt > la->la_expire) {
+		    time_uptime + la->la_preempt > la->la_expire)
 			renew = 1;
 			renew = true;
 			la->la_preempt--;
+		}
-		if (flags & LLE_EXCLUSIVE)
+		LLE_WUNLOCK(la);
 			LLE_WUNLOCK(la);
 		else
 			LLE_RUNLOCK(la);
-		if (renew == 1) {
+		if (renew) {
 			const u_int8_t *enaddr =
 #if NCARP > 0
 			    (rt->rt_ifp->if_type == IFT_CARP) ?
 			    CLLADDR(rt->rt_ifp->if_sadl):
 #endif
 			    CLLADDR(ifp->if_sadl);
-			arprequest(ifp, &satocsin(rt->rt_ifa->ifa_addr)->sin_addr,
+			arprequest(ifp,
 			    &satocsin(rt->rt_ifa->ifa_addr)->sin_addr,
 			    &satocsin(dst)->sin_addr, enaddr);
+		}
 		return 1;
+	}
 	if (la->la_flags & LLE_STATIC) {   /* should not happen! */
 		log(LOG_DEBUG, "arpresolve: ouch, empty static llinfo for %s\n",
 		    inet_ntoa(satocsin(dst)->sin_addr));
 		m_freem(m);
 		error = EINVAL;
 		goto done;
+	}
 	renew = (la->la_asked == 0 || la->la_expire != time_uptime);
 	if (renew && (flags & LLE_EXCLUSIVE) == 0) {
 		flags |= LLE_EXCLUSIVE;
 		LLE_RUNLOCK(la);
 		la = NULL;
 		goto retry;
 	/*
 	 * There is an arptab entry, but no ethernet address
 	 * response yet.  Add the mbuf to the list, dropping
 	 * the oldest packet if we have exceeded the system
 	 * setting.
 	 */
 	LLE_WLOCK_ASSERT(la);
 	if (la->la_numheld >= arp_maxhold) {
 		if (la->la_hold != NULL) {
 			struct mbuf *next = la->la_hold->m_nextpkt;
 			m_freem(la->la_hold);
 			la->la_hold = next;
 			la->la_numheld--;
 			ARP_STATINC(ARP_STAT_DFRDROPPED);
+		}
+	}
 	if (la->la_hold != NULL) {
 		struct mbuf *curr = la->la_hold;
 		while (curr->m_nextpkt != NULL)
 			curr = curr->m_nextpkt;
 		curr->m_nextpkt = m;
 	} else
 		la->la_hold = m;
 	la->la_numheld++;
-	if (renew == 0 && (flags & LLE_EXCLUSIVE)) {
+	if (!renew)
 		flags &= ~LLE_EXCLUSIVE;
 		LLE_DOWNGRADE(la);
 	/*
 	 * Return EWOULDBLOCK if we have tried less than arp_maxtries. It
 	 * will be masked by ether_output(). Return EHOSTDOWN/EHOSTUNREACH
 	 * if we have already sent arp_maxtries ARP requests. Retransmit the
 	 * ARP request, but not faster than one request per second.
 	 */
 	if (la->la_asked < arp_maxtries)
 		error = EWOULDBLOCK;	/* First request. */
 	else
 		error = (rt->rt_flags & RTF_GATEWAY) ?
 		    EHOSTUNREACH : EHOSTDOWN;
 	if (renew) {
 		const u_int8_t *enaddr =
 #if NCARP > 0
 		    (rt->rt_ifp->if_type == IFT_CARP) ?
 		    CLLADDR(rt->rt_ifp->if_sadl):
 #endif
 		    CLLADDR(ifp->if_sadl);
 		LLE_ADDREF(la);
 		la->la_expire = time_uptime;
 		callout_reset(&la->la_timer, hz * arpt_down,
 		    arptimer, la);
 		la->la_asked++;
-		if (flags & LLE_EXCLUSIVE)
+		LLE_WUNLOCK(la);
 			LLE_WUNLOCK(la);
 		else
 			LLE_RUNLOCK(la);
 		arprequest(ifp, &satocsin(rt->rt_ifa->ifa_addr)->sin_addr,
 		    &satocsin(dst)->sin_addr, enaddr);
 		return error == 0;
+	}
 done:
-	if (flags & LLE_EXCLUSIVE)
+	LLE_RUNLOCK(la);
 		LLE_WUNLOCK(la);
 	else
 		LLE_RUNLOCK(la);
 	return error == 0;
+}
 /*
  * Common length and type checks are done here,
  * then the protocol-specific routine is called.
  */
 void
 arpintr(void)
+{
 	struct mbuf *m;
 	struct arphdr *ar;
 	int s;