PERFORCE change 43343 for review

Peter Wemm peter at FreeBSD.org
Tue Dec 2 18:22:06 PST 2003


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

Change 43343 by peter at 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);
 }
 
 /*


More information about the p4-projects mailing list