From owner-svn-src-projects@FreeBSD.ORG Fri Nov 21 02:29:00 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BE36631D; Fri, 21 Nov 2014 02:29:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9FD7C1EF; Fri, 21 Nov 2014 02:29:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAL2T0qO076505; Fri, 21 Nov 2014 02:29:00 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAL2SvAI076446; Fri, 21 Nov 2014 02:28:57 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411210228.sAL2SvAI076446@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Fri, 21 Nov 2014 02:28:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274774 - in projects/routing/sys: net netinet netinet6 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Nov 2014 02:29:00 -0000 Author: melifaro Date: Fri Nov 21 02:28:56 2014 New Revision: 274774 URL: https://svnweb.freebsd.org/changeset/base/274774 Log: Switch IF_AFDATA lock to rmlock Modified: projects/routing/sys/net/if.c projects/routing/sys/net/if_llatbl.c projects/routing/sys/net/if_var.h projects/routing/sys/net/rt_nhops.c projects/routing/sys/netinet/if_ether.c projects/routing/sys/netinet/in.c projects/routing/sys/netinet/toecore.c projects/routing/sys/netinet6/icmp6.c projects/routing/sys/netinet6/in6.c projects/routing/sys/netinet6/nd6.c projects/routing/sys/netinet6/nd6_nbr.c projects/routing/sys/netinet6/nd6_rtr.c projects/routing/sys/netinet6/scope6.c Modified: projects/routing/sys/net/if.c ============================================================================== --- projects/routing/sys/net/if.c Fri Nov 21 02:13:12 2014 (r274773) +++ projects/routing/sys/net/if.c Fri Nov 21 02:28:56 2014 (r274774) @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -773,8 +774,11 @@ if_attachdomain1(struct ifnet *ifp) * Since dp->dom_ifattach calls malloc() with M_WAITOK, we * cannot lock ifp->if_afdata initialization, entirely. */ +#if 0 if (IF_AFDATA_TRYLOCK(ifp) == 0) return; +#endif + IF_AFDATA_LOCK(ifp); if (ifp->if_afdata_initialized >= domain_init_status) { IF_AFDATA_UNLOCK(ifp); log(LOG_WARNING, "%s called more than once on %s\n", Modified: projects/routing/sys/net/if_llatbl.c ============================================================================== --- projects/routing/sys/net/if_llatbl.c Fri Nov 21 02:13:12 2014 (r274773) +++ projects/routing/sys/net/if_llatbl.c Fri Nov 21 02:28:56 2014 (r274774) @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #ifdef DDB #include @@ -142,6 +143,7 @@ llentry_alloc(struct ifnet *ifp, struct struct sockaddr_storage *dst) { struct llentry *la; + IF_AFDATA_TRACKER; IF_AFDATA_RLOCK(ifp); la = lla_lookup(lt, LLE_EXCLUSIVE, (struct sockaddr *)dst); Modified: projects/routing/sys/net/if_var.h ============================================================================== --- projects/routing/sys/net/if_var.h Fri Nov 21 02:13:12 2014 (r274773) +++ projects/routing/sys/net/if_var.h Fri Nov 21 02:28:56 2014 (r274774) @@ -192,7 +192,7 @@ struct ifnet { int if_amcount; /* number of all-multicast requests */ struct ifaddr *if_addr; /* pointer to link-level address */ const u_int8_t *if_broadcastaddr; /* linklevel broadcast bytestring */ - struct rwlock if_afdata_lock; + struct rmlock if_afdata_lock; void *if_afdata[AF_MAX]; int if_afdata_initialized; @@ -340,21 +340,22 @@ EVENTHANDLER_DECLARE(group_change_event, #endif /* _SYS_EVENTHANDLER_H_ */ #define IF_AFDATA_LOCK_INIT(ifp) \ - rw_init(&(ifp)->if_afdata_lock, "if_afdata") + rm_init(&(ifp)->if_afdata_lock, "if_afdata") -#define IF_AFDATA_WLOCK(ifp) rw_wlock(&(ifp)->if_afdata_lock) -#define IF_AFDATA_RLOCK(ifp) rw_rlock(&(ifp)->if_afdata_lock) -#define IF_AFDATA_WUNLOCK(ifp) rw_wunlock(&(ifp)->if_afdata_lock) -#define IF_AFDATA_RUNLOCK(ifp) rw_runlock(&(ifp)->if_afdata_lock) +#define IF_AFDATA_WLOCK(ifp) rm_wlock(&(ifp)->if_afdata_lock) +#define IF_AFDATA_RLOCK(ifp) rm_rlock(&(ifp)->if_afdata_lock, &tracker) +#define IF_AFDATA_WUNLOCK(ifp) rm_wunlock(&(ifp)->if_afdata_lock) +#define IF_AFDATA_RUNLOCK(ifp) rm_runlock(&(ifp)->if_afdata_lock, &tracker) #define IF_AFDATA_LOCK(ifp) IF_AFDATA_WLOCK(ifp) #define IF_AFDATA_UNLOCK(ifp) IF_AFDATA_WUNLOCK(ifp) -#define IF_AFDATA_TRYLOCK(ifp) rw_try_wlock(&(ifp)->if_afdata_lock) -#define IF_AFDATA_DESTROY(ifp) rw_destroy(&(ifp)->if_afdata_lock) - -#define IF_AFDATA_LOCK_ASSERT(ifp) rw_assert(&(ifp)->if_afdata_lock, RA_LOCKED) -#define IF_AFDATA_RLOCK_ASSERT(ifp) rw_assert(&(ifp)->if_afdata_lock, RA_RLOCKED) -#define IF_AFDATA_WLOCK_ASSERT(ifp) rw_assert(&(ifp)->if_afdata_lock, RA_WLOCKED) -#define IF_AFDATA_UNLOCK_ASSERT(ifp) rw_assert(&(ifp)->if_afdata_lock, RA_UNLOCKED) +#define IF_AFDATA_TRYLOCK(ifp) rm_try_wlock(&(ifp)->if_afdata_lock) +#define IF_AFDATA_DESTROY(ifp) rm_destroy(&(ifp)->if_afdata_lock) +#define IF_AFDATA_TRACKER struct rm_priotracker tracker + +#define IF_AFDATA_LOCK_ASSERT(ifp) rm_assert(&(ifp)->if_afdata_lock, RA_LOCKED) +#define IF_AFDATA_RLOCK_ASSERT(ifp) rm_assert(&(ifp)->if_afdata_lock, RA_RLOCKED) +#define IF_AFDATA_WLOCK_ASSERT(ifp) rm_assert(&(ifp)->if_afdata_lock, RA_WLOCKED) +#define IF_AFDATA_UNLOCK_ASSERT(ifp) rm_assert(&(ifp)->if_afdata_lock, RA_UNLOCKED) /* * 72 was chosen below because it is the size of a TCP/IP Modified: projects/routing/sys/net/rt_nhops.c ============================================================================== --- projects/routing/sys/net/rt_nhops.c Fri Nov 21 02:13:12 2014 (r274773) +++ projects/routing/sys/net/rt_nhops.c Fri Nov 21 02:28:56 2014 (r274774) @@ -681,6 +681,7 @@ fib6_storelladdr(struct ifnet *ifp, stru { struct llentry *ln; struct sockaddr_in6 dst_sa; + IF_AFDATA_TRACKER; if (mm_flags & M_MCAST) { ETHER_MAP_IPV6_MULTICAST(&dst, desten); Modified: projects/routing/sys/netinet/if_ether.c ============================================================================== --- projects/routing/sys/netinet/if_ether.c Fri Nov 21 02:13:12 2014 (r274773) +++ projects/routing/sys/netinet/if_ether.c Fri Nov 21 02:28:56 2014 (r274774) @@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -354,6 +355,7 @@ arpresolve_fast(struct ifnet *ifp, struc struct llentry *la; struct sockaddr_in sin; const struct sockaddr *sa_dst; + IF_AFDATA_TRACKER; if (mflags & M_BCAST) { memcpy(dst_addr, ifp->if_broadcastaddr, ifp->if_addrlen); @@ -437,6 +439,7 @@ arpresolve(struct ifnet *ifp, struct rte const struct sockaddr *dst, u_char *desten, struct llentry **lle) { struct llentry *la = NULL; + IF_AFDATA_TRACKER; int is_gw; *lle = NULL; @@ -479,6 +482,7 @@ arpresolve_slow(struct ifnet *ifp, int i struct mbuf *curr = NULL; struct mbuf *next = NULL; int create, error; + IF_AFDATA_TRACKER; create = 0; *lle = NULL; @@ -699,6 +703,7 @@ in_arpinput(struct mbuf *m) sin.sin_len = sizeof(struct sockaddr_in); sin.sin_family = AF_INET; sin.sin_addr.s_addr = 0; + IF_AFDATA_TRACKER; if (ifp->if_bridge) bridged = 1; Modified: projects/routing/sys/netinet/in.c ============================================================================== --- projects/routing/sys/netinet/in.c Fri Nov 21 02:13:12 2014 (r274773) +++ projects/routing/sys/netinet/in.c Fri Nov 21 02:28:56 2014 (r274774) @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: projects/routing/sys/netinet/toecore.c ============================================================================== --- projects/routing/sys/netinet/toecore.c Fri Nov 21 02:13:12 2014 (r274773) +++ projects/routing/sys/netinet/toecore.c Fri Nov 21 02:28:56 2014 (r274774) @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -456,6 +457,7 @@ toe_nd6_resolve(struct ifnet *ifp, struc struct llentry *lle; struct sockaddr_in6 *sin6 = (void *)sa; int rc, flags = 0; + IF_AFDATA_TRACKER; restart: IF_AFDATA_RLOCK(ifp); Modified: projects/routing/sys/netinet6/icmp6.c ============================================================================== --- projects/routing/sys/netinet6/icmp6.c Fri Nov 21 02:13:12 2014 (r274773) +++ projects/routing/sys/netinet6/icmp6.c Fri Nov 21 02:28:56 2014 (r274774) @@ -74,6 +74,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -2504,6 +2505,7 @@ icmp6_redirect_output(struct mbuf *m0, s struct sockaddr_in6 src_sa; struct route_info ri; struct nhop6_basic nh6; + IF_AFDATA_TRACKER; int e; icmp6_errcount(ND_REDIRECT, 0); Modified: projects/routing/sys/netinet6/in6.c ============================================================================== --- projects/routing/sys/netinet6/in6.c Fri Nov 21 02:13:12 2014 (r274773) +++ projects/routing/sys/netinet6/in6.c Fri Nov 21 02:28:56 2014 (r274774) @@ -72,6 +72,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: projects/routing/sys/netinet6/nd6.c ============================================================================== --- projects/routing/sys/netinet6/nd6.c Fri Nov 21 02:13:12 2014 (r274773) +++ projects/routing/sys/netinet6/nd6.c Fri Nov 21 02:28:56 2014 (r274774) @@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -997,6 +998,7 @@ nd6_is_addr_neighbor(struct sockaddr_in6 { struct llentry *lle; int rc = 0; + IF_AFDATA_TRACKER; IF_AFDATA_UNLOCK_ASSERT(ifp); if (nd6_is_new_addr_neighbor(addr, ifp)) @@ -1166,6 +1168,7 @@ nd6_nud_hint(struct rtentry *rt, struct { struct llentry *ln; struct ifnet *ifp; + IF_AFDATA_TRACKER; if ((dst6 == NULL) || (rt == NULL)) return; @@ -1253,6 +1256,7 @@ nd6_ioctl(u_long cmd, caddr_t data, stru struct nd_defrouter *dr; struct nd_prefix *pr; int i = 0, error = 0; + IF_AFDATA_TRACKER; if (ifp->if_afdata[AF_INET6] == NULL) return (EPFNOSUPPORT); @@ -1578,6 +1582,7 @@ nd6_cache_lladdr(struct ifnet *ifp, stru struct sockaddr_in6 sin6; struct mbuf *chain = NULL; int static_route = 0; + IF_AFDATA_TRACKER; IF_AFDATA_UNLOCK_ASSERT(ifp); @@ -1867,6 +1872,7 @@ nd6_output(struct ifnet *ifp, struct ifn { struct llentry *ln = NULL; int error = 0; + IF_AFDATA_TRACKER; /* discard the packet if IPv6 operation is disabled on the interface */ if ((ND_IFINFO(ifp)->flags & ND6_IFF_IFDISABLED)) { @@ -1963,6 +1969,7 @@ nd6_output_lle(struct ifnet *ifp, struct int error = 0; int has_lle = 0; int ip6len; + IF_AFDATA_TRACKER; #ifdef INVARIANTS if (lle != NULL) { @@ -2304,6 +2311,7 @@ nd6_storelladdr(struct ifnet *ifp, struc const struct sockaddr *dst, u_char *desten, struct llentry **lle) { struct llentry *ln; + IF_AFDATA_TRACKER; *lle = NULL; IF_AFDATA_UNLOCK_ASSERT(ifp); Modified: projects/routing/sys/netinet6/nd6_nbr.c ============================================================================== --- projects/routing/sys/netinet6/nd6_nbr.c Fri Nov 21 02:13:12 2014 (r274773) +++ projects/routing/sys/netinet6/nd6_nbr.c Fri Nov 21 02:28:56 2014 (r274774) @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -609,6 +610,7 @@ nd6_na_input(struct mbuf *m, int off, in struct mbuf *chain = NULL; struct m_tag *mtag; struct sockaddr_in6 sin6; + IF_AFDATA_TRACKER; char ip6bufs[INET6_ADDRSTRLEN], ip6bufd[INET6_ADDRSTRLEN]; if (ip6->ip6_hlim != 255) { Modified: projects/routing/sys/netinet6/nd6_rtr.c ============================================================================== --- projects/routing/sys/netinet6/nd6_rtr.c Fri Nov 21 02:13:12 2014 (r274773) +++ projects/routing/sys/netinet6/nd6_rtr.c Fri Nov 21 02:28:56 2014 (r274774) @@ -626,6 +626,7 @@ defrouter_select(void) { struct nd_defrouter *dr, *selected_dr = NULL, *installed_dr = NULL; struct llentry *ln = NULL; + IF_AFDATA_TRACKER; /* * Let's handle easy case (3) first: @@ -1299,6 +1300,7 @@ find_pfxlist_reachable_router(struct nd_ struct nd_pfxrouter *pfxrtr; struct llentry *ln; int canreach; + IF_AFDATA_TRACKER; LIST_FOREACH(pfxrtr, &pr->ndpr_advrtrs, pfr_entry) { IF_AFDATA_RLOCK(pfxrtr->router->ifp); Modified: projects/routing/sys/netinet6/scope6.c ============================================================================== --- projects/routing/sys/netinet6/scope6.c Fri Nov 21 02:13:12 2014 (r274773) +++ projects/routing/sys/netinet6/scope6.c Fri Nov 21 02:28:56 2014 (r274774) @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -208,6 +209,7 @@ static int scope6_get(struct ifnet *ifp, struct scope6_id *idlist) { struct scope6_id *sid; + IF_AFDATA_TRACKER; /* We only need to lock the interface's afdata for SID() to work. */ IF_AFDATA_RLOCK(ifp); @@ -410,6 +412,7 @@ in6_setscope(struct in6_addr *in6, struc int scope; u_int32_t zoneid = 0; struct scope6_id *sid; + IF_AFDATA_TRACKER; /* * special case: the loopback address can only belong to a loopback