From owner-p4-projects@FreeBSD.ORG Mon Nov 24 04:13:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E77B61065677; Mon, 24 Nov 2008 04:13:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A1B681065674 for ; Mon, 24 Nov 2008 04:13:13 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8AFF38FC0A for ; Mon, 24 Nov 2008 04:13:13 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAO4DD5m091083 for ; Mon, 24 Nov 2008 04:13:13 GMT (envelope-from qingli@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAO4DDJN091081 for perforce@freebsd.org; Mon, 24 Nov 2008 04:13:13 GMT (envelope-from qingli@freebsd.org) Date: Mon, 24 Nov 2008 04:13:13 GMT Message-Id: <200811240413.mAO4DDJN091081@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to qingli@freebsd.org using -f From: Qing Li To: Perforce Change Reviews Cc: Subject: PERFORCE change 153421 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Nov 2008 04:13:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=153421 Change 153421 by qingli@FreeBSD-newarp on 2008/11/24 04:13:09 missed a file in the previous commit, and fix locking on IPv4 arp input path Affected files ... .. //depot/projects/arp-v2/src/sys/net/if_llatbl.c#6 edit .. //depot/projects/arp-v2/src/sys/netinet/if_ether.c#16 edit .. //depot/projects/arp-v2/src/sys/netinet/ip_output.c#7 edit Differences ... ==== //depot/projects/arp-v2/src/sys/net/if_llatbl.c#6 (text+ko) ==== @@ -473,9 +473,8 @@ } /* - * XXXXXXXX: A big and ugly hack! - * I must redesign this before even committing to perforce. This is - * just a hack to make new design working. + * XXXXXXXX: + * REVISE this approach if possible. */ IFNET_WLOCK(); SLIST_FOREACH(llt, &lltables, llt_link) { ==== //depot/projects/arp-v2/src/sys/netinet/if_ether.c#16 (text+ko) ==== @@ -561,7 +561,7 @@ sin.sin_family = AF_INET; sin.sin_addr = isaddr; flag = (itaddr.s_addr == myaddr.s_addr) ? LLE_CREATE : 0; -/* Qing IF_AFDATA_LOCK(ifp); */ + IF_AFDATA_LOCK(ifp); la = lla_lookup(LLTABLE(ifp), flag, (struct sockaddr *)&sin); if (la != NULL) { /* the following is not an error when doing bridging */ @@ -695,10 +695,11 @@ } (void)memcpy(ar_tha(ah), ar_sha(ah), ah->ar_hln); (void)memcpy(ar_sha(ah), &la->ll_addr, ah->ar_hln); -/* QING IF_AFDATA_UNLOCK(ifp); */ } } + IF_AFDATA_UNLOCK(ifp); + if (itaddr.s_addr == myaddr.s_addr && IN_LINKLOCAL(ntohl(itaddr.s_addr))) { /* RFC 3927 link-local IPv4; always reply by broadcast. */ @@ -724,8 +725,7 @@ return; drop: -/* if (la != NULL) - IF_AFDATA_UNLOCK(ifp); */ + IF_AFDATA_UNLOCK(ifp); m_freem(m); } #endif ==== //depot/projects/arp-v2/src/sys/netinet/ip_output.c#7 (text+ko) ==== @@ -560,10 +560,10 @@ */ m->m_flags &= ~(M_PROTOFLAGS); - IF_LLTBLS_LOCK(ifp); + IF_AFDATA_LOCK(ifp); error = (*ifp->if_output)(ifp, m, (struct sockaddr *)dst, ro->ro_rt); - IF_LLTBLS_UNLOCK(ifp); + IF_AFDATA_UNLOCK(ifp); goto done; } @@ -596,10 +596,10 @@ */ m->m_flags &= ~(M_PROTOFLAGS); - IF_LLTBLS_LOCK(ifp); + IF_AFDATA_LOCK(ifp); error = (*ifp->if_output)(ifp, m, (struct sockaddr *)dst, ro->ro_rt); - IF_LLTBLS_UNLOCK(ifp); + IF_AFDATA_UNLOCK(ifp); } else m_freem(m); }