svn commit: r260510 - in stable/9/sys: netinet netinet6

[Andrey V. Elsukov]

Author: ae
Date: Fri Jan 10 12:22:49 2014
New Revision: 260510
URL: http://svnweb.freebsd.org/changeset/base/260510

Log:
  MFC r260151 (by adrian):
    Use an RLOCK here instead of an RWLOCK - matching all the other calls
    to lla_lookup().
  
    This drastically reduces the very high lock contention when doing parallel
    TCP throughput tests (> 1024 sockets) with IPv6.
  
  MFC r260187:
    lla_lookup() does modification only when LLE_CREATE is specified.
    Thus we can use IF_AFDATA_RLOCK() instead of IF_AFDATA_LOCK() when doing
    lla_lookup() without LLE_CREATE flag.
  
  MFC r260217:
    Add IF_AFDATA_WLOCK_ASSERT() in case lla_lookup() is called with
    LLE_CREATE flag.

Modified:
  stable/9/sys/netinet/if_ether.c
  stable/9/sys/netinet/in.c
  stable/9/sys/netinet6/in6.c
  stable/9/sys/netinet6/nd6.c
  stable/9/sys/netinet6/nd6_nbr.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netinet/if_ether.c
==============================================================================
--- stable/9/sys/netinet/if_ether.c	Fri Jan 10 12:18:05 2014	(r260509)
+++ stable/9/sys/netinet/if_ether.c	Fri Jan 10 12:22:49 2014	(r260510)
@@ -154,10 +154,10 @@ arp_ifscrub(struct ifnet *ifp, uint32_t 
 	addr4.sin_len    = sizeof(addr4);
 	addr4.sin_family = AF_INET;
 	addr4.sin_addr.s_addr = addr;
-	IF_AFDATA_LOCK(ifp);
+	IF_AFDATA_RLOCK(ifp);
 	lla_lookup(LLTABLE(ifp), (LLE_DELETE | LLE_IFADDR),
 	    (struct sockaddr *)&addr4);
-	IF_AFDATA_UNLOCK(ifp);
+	IF_AFDATA_RUNLOCK(ifp);
 }
 #endif
 
@@ -790,9 +790,9 @@ reply:
 		struct llentry *lle = NULL;
 
 		sin.sin_addr = itaddr;
-		IF_AFDATA_LOCK(ifp);
+		IF_AFDATA_RLOCK(ifp);
 		lle = lla_lookup(LLTABLE(ifp), 0, (struct sockaddr *)&sin);
-		IF_AFDATA_UNLOCK(ifp);
+		IF_AFDATA_RUNLOCK(ifp);
 
 		if ((lle != NULL) && (lle->la_flags & LLE_PUB)) {
 			(void)memcpy(ar_tha(ah), ar_sha(ah), ah->ar_hln);

Modified: stable/9/sys/netinet/in.c
==============================================================================
--- stable/9/sys/netinet/in.c	Fri Jan 10 12:18:05 2014	(r260509)
+++ stable/9/sys/netinet/in.c	Fri Jan 10 12:22:49 2014	(r260510)
@@ -1499,6 +1499,7 @@ in_lltable_lookup(struct lltable *llt, u
 #endif
 		if (!(flags & LLE_CREATE))
 			return (NULL);
+		IF_AFDATA_WLOCK_ASSERT(ifp);
 		/*
 		 * A route that covers the given address must have
 		 * been installed 1st because we are doing a resolution,

Modified: stable/9/sys/netinet6/in6.c
==============================================================================
--- stable/9/sys/netinet6/in6.c	Fri Jan 10 12:18:05 2014	(r260509)
+++ stable/9/sys/netinet6/in6.c	Fri Jan 10 12:22:49 2014	(r260510)
@@ -2603,6 +2603,7 @@ in6_lltable_lookup(struct lltable *llt, 
 	if (lle == NULL) {
 		if (!(flags & LLE_CREATE))
 			return (NULL);
+		IF_AFDATA_WLOCK_ASSERT(ifp);
 		/*
 		 * A route that covers the given address must have
 		 * been installed 1st because we are doing a resolution,

Modified: stable/9/sys/netinet6/nd6.c
==============================================================================
--- stable/9/sys/netinet6/nd6.c	Fri Jan 10 12:18:05 2014	(r260509)
+++ stable/9/sys/netinet6/nd6.c	Fri Jan 10 12:22:49 2014	(r260510)
@@ -1154,9 +1154,9 @@ nd6_nud_hint(struct rtentry *rt, struct 
 		return;
 
 	ifp = rt->rt_ifp;
-	IF_AFDATA_LOCK(ifp);
+	IF_AFDATA_RLOCK(ifp);
 	ln = nd6_lookup(dst6, ND6_EXCLUSIVE, NULL);
-	IF_AFDATA_UNLOCK(ifp);
+	IF_AFDATA_RUNLOCK(ifp);
 	if (ln == NULL)
 		return;
 
@@ -1583,16 +1583,16 @@ nd6_cache_lladdr(struct ifnet *ifp, stru
 	 * description on it in NS section (RFC 2461 7.2.3).
 	 */
 	flags = lladdr ? ND6_EXCLUSIVE : 0;
-	IF_AFDATA_LOCK(ifp);
+	IF_AFDATA_RLOCK(ifp);
 	ln = nd6_lookup(from, flags, ifp);
-
+	IF_AFDATA_RUNLOCK(ifp);
 	if (ln == NULL) {
 		flags |= ND6_EXCLUSIVE;
+		IF_AFDATA_LOCK(ifp);
 		ln = nd6_lookup(from, flags | ND6_CREATE, ifp);
 		IF_AFDATA_UNLOCK(ifp);
 		is_newentry = 1;
 	} else {
-		IF_AFDATA_UNLOCK(ifp);		
 		/* do nothing if static ndp is set */
 		if (ln->la_flags & LLE_STATIC) {
 			static_route = 1;
@@ -1898,9 +1898,9 @@ nd6_output_lle(struct ifnet *ifp, struct
 	flags = ((m != NULL) || (lle != NULL)) ? LLE_EXCLUSIVE : 0;
 	if (ln == NULL) {
 	retry:
-		IF_AFDATA_LOCK(ifp);
+		IF_AFDATA_RLOCK(ifp);
 		ln = lla_lookup(LLTABLE6(ifp), flags, (struct sockaddr *)dst);
-		IF_AFDATA_UNLOCK(ifp);
+		IF_AFDATA_RUNLOCK(ifp);
 		if ((ln == NULL) && nd6_is_addr_neighbor(dst, ifp))  {
 			/*
 			 * Since nd6_is_addr_neighbor() internally calls nd6_lookup(),

Modified: stable/9/sys/netinet6/nd6_nbr.c
==============================================================================
--- stable/9/sys/netinet6/nd6_nbr.c	Fri Jan 10 12:18:05 2014	(r260509)
+++ stable/9/sys/netinet6/nd6_nbr.c	Fri Jan 10 12:22:49 2014	(r260510)
@@ -734,9 +734,9 @@ nd6_na_input(struct mbuf *m, int off, in
 	 * If no neighbor cache entry is found, NA SHOULD silently be
 	 * discarded.
 	 */
-	IF_AFDATA_LOCK(ifp);
+	IF_AFDATA_RLOCK(ifp);
 	ln = nd6_lookup(&taddr6, LLE_EXCLUSIVE, ifp);
-	IF_AFDATA_UNLOCK(ifp);
+	IF_AFDATA_RUNLOCK(ifp);
 	if (ln == NULL) {
 		goto freeit;
 	}