d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrate a fix for a very odd signal delivery problem found

Browse Source 
by Bryan Cantril and others in the Solaris/Illumos version of DTrace.

Obtained from: https://www.illumos.org/issues/789
MFC after:	2 weeks
This commit is contained in:
George V. Neville-Neil 2012-06-04 16:15:40 +00:00
parent db5c7d363d
commit 4737d389b0
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/cddl/dev/dtrace/amd64/dtrace_subr.c
View File

@ -27,6 +27,10 @@
* Use is subject to license terms.
*/
/*
* Copyright (c) 2011, Joyent, Inc. All rights reserved.
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/types.h>
@ -297,14 +301,15 @@ dtrace_safe_defer_signal(void)
}
/*
* If we've executed the original instruction, but haven't performed
* the jmp back to t->t_dtrace_npc or the clean up of any registers
* used to emulate %rip-relative instructions in 64-bit mode, do that
* here and take the signal right away. We detect this condition by
* seeing if the program counter is the range [scrpc + isz, astpc).
* If we have executed the original instruction, but we have performed
* neither the jmp back to t->t_dtrace_npc nor the clean up of any
* registers used to emulate %rip-relative instructions in 64-bit mode,
* we'll save ourselves some effort by doing that here and taking the
* signal right away. We detect this condition by seeing if the program
* counter is the range [scrpc + isz, astpc).
*/
if (t->t_dtrace_astpc - rp->r_pc <
t->t_dtrace_astpc - t->t_dtrace_scrpc - isz) {
if (rp->r_pc >= t->t_dtrace_scrpc + isz &&
rp->r_pc < t->t_dtrace_astpc) {
#ifdef __amd64
/*
* If there is a scratch register and we're on the

19
sys/cddl/dev/dtrace/i386/dtrace_subr.c
View File

@ -27,6 +27,10 @@
* Use is subject to license terms.
*/
/*
* Copyright (c) 2011, Joyent, Inc. All rights reserved.
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/types.h>
@ -298,14 +302,15 @@ dtrace_safe_defer_signal(void)
}
/*
* If we've executed the original instruction, but haven't performed
* the jmp back to t->t_dtrace_npc or the clean up of any registers
* used to emulate %rip-relative instructions in 64-bit mode, do that
* here and take the signal right away. We detect this condition by
* seeing if the program counter is the range [scrpc + isz, astpc).
* If we have executed the original instruction, but we have performed
* neither the jmp back to t->t_dtrace_npc nor the clean up of any
* registers used to emulate %rip-relative instructions in 64-bit mode,
* we'll save ourselves some effort by doing that here and taking the
* signal right away. We detect this condition by seeing if the program
* counter is the range [scrpc + isz, astpc).
*/
if (t->t_dtrace_astpc - rp->r_pc <
t->t_dtrace_astpc - t->t_dtrace_scrpc - isz) {
if (rp->r_pc >= t->t_dtrace_scrpc + isz &&
rp->r_pc < t->t_dtrace_astpc) {
#ifdef __amd64
/*
* If there is a scratch register and we're on the