From owner-p4-projects@FreeBSD.ORG  Sun Sep 28 21:25:38 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 64D4F16A4C0; Sun, 28 Sep 2003 21:25:38 -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 3FD7916A4B3
	for <perforce@freebsd.org>; Sun, 28 Sep 2003 21:25:38 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B015C4401E
	for <perforce@freebsd.org>; Sun, 28 Sep 2003 21:25:37 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8T4PbXJ025066
	for <perforce@freebsd.org>; Sun, 28 Sep 2003 21:25:37 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8T4PbCh025063
	for perforce@freebsd.org; Sun, 28 Sep 2003 21:25:37 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Date: Sun, 28 Sep 2003 21:25:37 -0700 (PDT)
Message-Id: <200309290425.h8T4PbCh025063@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 38770 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: Mon, 29 Sep 2003 04:25:38 -0000

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

Change 38770 by sam@sam_ebb on 2003/09/28 21:24:35

	eliminate recursion on the SAHTREE lock

Affected files ...

.. //depot/projects/netperf/sys/netipsec/key.c#9 edit

Differences ...

==== //depot/projects/netperf/sys/netipsec/key.c#9 (text+ko) ====

@@ -2903,7 +2903,7 @@
 	u_int stateidx, state;
 
 	sav = NULL;
-	SAHTREE_LOCK();
+	SAHTREE_LOCK_ASSERT();
 	/* search all status */
 	for (stateidx = 0;
 	     stateidx < _ARRAYLEN(saorder_state_alive);
@@ -2924,7 +2924,6 @@
 				break;
 		}
 	}
-	SAHTREE_UNLOCK();
 
 	return sav;
 }
@@ -4688,7 +4687,10 @@
 		return key_senderror(so, m, ENOENT);
 	}
 #else
-	if ((sav = key_getsavbyspi(sah, sa0->sadb_sa_spi)) == NULL) {
+	SAHTREE_LOCK();
+	sav = key_getsavbyspi(sah, sa0->sadb_sa_spi);
+	SAHTREE_UNLOCK();
+	if (sav == NULL) {
 		ipseclog((LOG_DEBUG, "%s: no such a SA found (spi:%u)\n",
 			__func__, (u_int32_t)ntohl(sa0->sadb_sa_spi)));
 		return key_senderror(so, m, EINVAL);
@@ -4880,7 +4882,10 @@
 
 	/* create new SA entry. */
 	/* We can create new SA only if SPI is differenct. */
-	if (key_getsavbyspi(newsah, sa0->sadb_sa_spi)) {
+	SAHTREE_LOCK();
+	newsav = key_getsavbyspi(newsah, sa0->sadb_sa_spi);
+	SAHTREE_UNLOCK();
+	if (newsav != NULL) {
 		ipseclog((LOG_DEBUG, "%s: SA already exists.\n", __func__));
 		return key_senderror(so, m, EEXIST);
 	}