From owner-p4-projects@FreeBSD.ORG  Mon Aug 18 18:12:11 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8862237B404; Mon, 18 Aug 2003 18:12:10 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1B09B37B401
	for <perforce@freebsd.org>; Mon, 18 Aug 2003 18:12:10 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B41EC43F3F
	for <perforce@freebsd.org>; Mon, 18 Aug 2003 18:12:09 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7J1C90U048561
	for <perforce@freebsd.org>; Mon, 18 Aug 2003 18:12:09 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7J1C97d048558
	for perforce@freebsd.org; Mon, 18 Aug 2003 18:12:09 -0700 (PDT)
Date: Mon, 18 Aug 2003 18:12:09 -0700 (PDT)
Message-Id: <200308190112.h7J1C97d048558@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 36386 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Aug 2003 01:12:11 -0000

http://perforce.freebsd.org/chv.cgi?CH=36386

Change 36386 by sam@sam_ebb on 2003/08/18 18:12:06

	correct locking assumptions about callbacks through rnh_close:
	the rtentry is supplied locked

Affected files ...

.. //depot/projects/netperf/sys/netinet/in_rmx.c#3 edit
.. //depot/projects/netperf/sys/netinet6/in6_rmx.c#3 edit

Differences ...

==== //depot/projects/netperf/sys/netinet/in_rmx.c#3 (text+ko) ====

@@ -193,7 +193,8 @@
 {
 	struct rtentry *rt = (struct rtentry *)rn;
 
-	/*XXX locking? */
+	RT_LOCK_ASSERT(rt, MA_OWNED);
+
 	if (!(rt->rt_flags & RTF_UP))
 		return;			/* prophylactic measures */
 
@@ -208,10 +209,8 @@
 	 * waiting for a timeout cycle to kill it.
 	 */
 	if (rtq_reallyold != 0) {
-		RT_LOCK(rt);
 		rt->rt_flags |= RTPRF_OURS;
 		rt->rt_rmx.rmx_expire = time_second + rtq_reallyold;
-		RT_UNLOCK(rt);
 	} else {
 		rtrequest(RTM_DELETE,
 			  (struct sockaddr *)rt_key(rt),

==== //depot/projects/netperf/sys/netinet6/in6_rmx.c#3 (text+ko) ====

@@ -252,6 +252,8 @@
 {
 	struct rtentry *rt = (struct rtentry *)rn;
 
+	RT_LOCK_ASSERT(rt, MA_OWNED);
+
 	if (!(rt->rt_flags & RTF_UP))
 		return;		/* prophylactic measures */
 
@@ -267,10 +269,8 @@
 	 * waiting for a timeout cycle to kill it.
 	 */
 	if (rtq_reallyold != 0) {
-		RT_LOCK(rt);
 		rt->rt_flags |= RTPRF_OURS;
 		rt->rt_rmx.rmx_expire = time_second + rtq_reallyold;
-		RT_UNLOCK(rt);
 	} else {
 		rtrequest(RTM_DELETE,
 			  (struct sockaddr *)rt_key(rt),