From owner-p4-projects@FreeBSD.ORG  Tue Dec  2 18:22:05 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9256C16A4D0; Tue,  2 Dec 2003 18:22:05 -0800 (PST)
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 6E73016A4CE
	for <perforce@freebsd.org>; Tue,  2 Dec 2003 18:22:05 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B5FC943FDD
	for <perforce@freebsd.org>; Tue,  2 Dec 2003 18:22:04 -0800 (PST)
	(envelope-from peter@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 hB32M4XJ094720
	for <perforce@freebsd.org>; Tue, 2 Dec 2003 18:22:04 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB32M4eu094717
	for perforce@freebsd.org; Tue, 2 Dec 2003 18:22:04 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Tue, 2 Dec 2003 18:22:04 -0800 (PST)
Message-Id: <200312030222.hB32M4eu094717@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 43343 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: Wed, 03 Dec 2003 02:22:06 -0000

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

Change 43343 by peter@peter_overcee on 2003/12/02 18:21:59

	catch up with procsig locking.  I think this is what caused my panics yesterday.

Affected files ...

.. //depot/projects/hammer/sys/amd64/ia32/ia32_signal.c#9 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/ia32/ia32_signal.c#9 (text+ko) ====

@@ -187,6 +187,7 @@
 	p = td->td_proc;
 	PROC_LOCK_ASSERT(p, MA_OWNED);
 	psp = p->p_sigacts;
+	mtx_assert(&psp->ps_mtx, MA_OWNED);
 	regs = td->td_frame;
 	oonstack = sigonstack(regs->tf_rsp);
 
@@ -250,6 +251,7 @@
 		sf.sf_addr = regs->tf_addr;
 		sf.sf_ah = (u_int32_t)(uintptr_t)catcher;
 	}
+	mtx_unlock(&psp->ps_mtx);
 	PROC_UNLOCK(p);
 
 	/*
@@ -274,6 +276,7 @@
 	td->td_pcb->pcb_es = _udatasel;
 	/* leave user %fs and %gs untouched */
 	PROC_LOCK(p);
+	mtx_lock(&psp->ps_mtx);
 }
 #endif	/* COMPAT_FREEBSD4 */
 
@@ -298,6 +301,7 @@
 		return;
 	}
 #endif
+	mtx_assert(&psp->ps_mtx, MA_OWNED);
 	regs = td->td_frame;
 	oonstack = sigonstack(regs->tf_rsp);
 
@@ -366,6 +370,7 @@
 		sf.sf_addr = regs->tf_addr;
 		sf.sf_ah = (u_int32_t)(uintptr_t)catcher;
 	}
+	mtx_unlock(&psp->ps_mtx);
 	PROC_UNLOCK(p);
 
 	/*
@@ -390,6 +395,7 @@
 	td->td_pcb->pcb_es = _udatasel;
 	/* leave user %fs and %gs untouched */
 	PROC_LOCK(p);
+	mtx_lock(&psp->ps_mtx);
 }
 
 /*