From: Linus Torvalds <torvalds@osdl.org>
To: Eric Pouech <pouech-eric@wanadoo.fr>
Cc: Roland McGrath <roland@redhat.com>,
Mike Hearn <mh@codeweavers.com>,
linux-kernel@vger.kernel.org, Andrew Morton <akpm@osdl.org>,
wine-devel <wine-devel@winehq.com>
Subject: Re: ptrace single-stepping change breaks Wine
Date: Fri, 19 Nov 2004 13:22:02 -0800 (PST) [thread overview]
Message-ID: <Pine.LNX.4.58.0411191319360.2222@ppc970.osdl.org> (raw)
In-Reply-To: <419E5A88.1050701@wanadoo.fr>
On Fri, 19 Nov 2004, Eric Pouech wrote:
>
> wine mixes both approches, we have (to control what's generated inside the
> various exception) to ptrace from our NT-kernel-like process (the ptracer) to
> get the context of the exception. Restart from the ptracer is done with
> PTRACE_SINGLESTEP.
Here's a new patch to try. Totally untested.
It is more careful about clearing PT_DTRACED (which by now should probably
be renamed PT_PRACE_SINGLESTEP or something on x86, since we should never
be lazy about this thing any more), and it may or may not help.
Pls test _together_ with the previous patch (which is already applied in
the current top-of-tree for anybody with really recent kernels).
Linus
-----
===== arch/i386/kernel/ptrace.c 1.27 vs edited =====
--- 1.27/arch/i386/kernel/ptrace.c 2004-11-07 18:10:34 -08:00
+++ edited/arch/i386/kernel/ptrace.c 2004-11-19 13:18:56 -08:00
@@ -138,6 +138,26 @@
return retval;
}
+static void set_singlestep(struct task_struct *child)
+{
+ long eflags;
+
+ set_tsk_thread_flag(child, TIF_SINGLESTEP);
+ eflags = get_stack_long(child, EFL_OFFSET);
+ put_stack_long(child, EFL_OFFSET, eflags | TRAP_FLAG);
+ child->ptrace |= PT_DTRACE;
+}
+
+static void clear_singlestep(struct task_struct *child)
+{
+ long eflags;
+
+ clear_tsk_thread_flag(child, TIF_SINGLESTEP);
+ eflags = get_stack_long(child, EFL_OFFSET);
+ put_stack_long(child, EFL_OFFSET, eflags & ~TRAP_FLAG);
+ child->ptrace &= ~PT_DTRACE;
+}
+
/*
* Called by kernel/ptrace.c when detaching..
*
@@ -145,11 +165,7 @@
*/
void ptrace_disable(struct task_struct *child)
{
- long tmp;
-
- clear_tsk_thread_flag(child, TIF_SINGLESTEP);
- tmp = get_stack_long(child, EFL_OFFSET) & ~TRAP_FLAG;
- put_stack_long(child, EFL_OFFSET, tmp);
+ clear_singlestep(child);
}
/*
@@ -388,10 +404,8 @@
}
break;
- case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */
- case PTRACE_CONT: { /* restart after signal. */
- long tmp;
-
+ case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */
+ case PTRACE_CONT: /* restart after signal. */
ret = -EIO;
if ((unsigned long) data > _NSIG)
break;
@@ -401,56 +415,39 @@
else {
clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
}
- clear_tsk_thread_flag(child, TIF_SINGLESTEP);
child->exit_code = data;
- /* make sure the single step bit is not set. */
- tmp = get_stack_long(child, EFL_OFFSET) & ~TRAP_FLAG;
- put_stack_long(child, EFL_OFFSET,tmp);
+ /* make sure the single step bit is not set. */
+ clear_singlestep(child);
wake_up_process(child);
ret = 0;
break;
- }
/*
* make the child exit. Best I can do is send it a sigkill.
* perhaps it should be put in the status that it wants to
* exit.
*/
- case PTRACE_KILL: {
- long tmp;
-
+ case PTRACE_KILL:
ret = 0;
if (child->exit_state == EXIT_ZOMBIE) /* already dead */
break;
child->exit_code = SIGKILL;
- clear_tsk_thread_flag(child, TIF_SINGLESTEP);
/* make sure the single step bit is not set. */
- tmp = get_stack_long(child, EFL_OFFSET) & ~TRAP_FLAG;
- put_stack_long(child, EFL_OFFSET, tmp);
+ clear_singlestep(child);
wake_up_process(child);
break;
- }
-
- case PTRACE_SINGLESTEP: { /* set the trap flag. */
- long tmp;
+ case PTRACE_SINGLESTEP: /* set the trap flag. */
ret = -EIO;
if ((unsigned long) data > _NSIG)
break;
clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
- if ((child->ptrace & PT_DTRACE) == 0) {
- /* Spurious delayed TF traps may occur */
- child->ptrace |= PT_DTRACE;
- }
- tmp = get_stack_long(child, EFL_OFFSET) | TRAP_FLAG;
- put_stack_long(child, EFL_OFFSET, tmp);
- set_tsk_thread_flag(child, TIF_SINGLESTEP);
+ set_singlestep(child);
child->exit_code = data;
/* give it a chance to run. */
wake_up_process(child);
ret = 0;
break;
- }
case PTRACE_DETACH:
/* detach a process that was attached. */
next prev parent reply other threads:[~2004-11-19 21:22 UTC|newest]
Thread overview: 101+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <Pine.LNX.4.58.0411151439270.2222@ppc970.osdl.org>
2004-11-15 22:53 ` ptrace single-stepping change breaks Wine Roland McGrath
2004-11-19 19:00 ` Eric Pouech
2004-11-19 19:20 ` Linus Torvalds
2004-11-19 19:33 ` Eric Pouech
2004-11-19 19:51 ` Linus Torvalds
2004-11-19 20:41 ` Eric Pouech
2004-11-19 21:22 ` Linus Torvalds [this message]
2004-11-19 21:23 ` Daniel Jacobowitz
2004-11-19 21:53 ` Linus Torvalds
2004-11-20 21:49 ` Jesse Allen
2004-11-21 4:55 ` Jesse Allen
2004-11-21 21:32 ` Davide Libenzi
2004-11-21 22:33 ` Linus Torvalds
2004-11-21 23:14 ` Davide Libenzi
2004-11-22 1:12 ` Linus Torvalds
2004-11-22 0:13 ` Andreas Schwab
2004-11-22 1:07 ` Linus Torvalds
2004-11-22 4:06 ` Davide Libenzi
2004-11-22 4:29 ` Linus Torvalds
2004-11-22 6:23 ` Linus Torvalds
2004-11-22 11:06 ` Andreas Schwab
2004-11-22 16:27 ` Linus Torvalds
2004-11-22 13:46 ` Davide Libenzi
2004-11-22 23:15 ` Jesse Allen
2004-11-22 23:48 ` Jesse Allen
2004-11-28 17:01 ` Eric Pouech
2004-11-22 20:52 ` Eric Pouech
2004-11-22 21:10 ` Linus Torvalds
2004-11-22 22:19 ` Mike Hearn
2004-11-22 22:25 ` Linus Torvalds
2004-12-29 2:14 ` Thomas Sailer
2004-12-29 15:02 ` Mike Hearn
2004-12-29 18:53 ` Linus Torvalds
2004-12-29 19:40 ` Jesse Allen
2004-12-29 20:04 ` Linus Torvalds
2004-12-29 21:43 ` Jesse Allen
2004-12-30 0:44 ` Linus Torvalds
2004-12-30 1:13 ` Davide Libenzi
2004-12-30 1:55 ` Linus Torvalds
2004-12-30 4:51 ` Linus Torvalds
2004-12-30 4:58 ` Linus Torvalds
2004-12-30 5:07 ` Davide Libenzi
2004-12-30 7:26 ` Linus Torvalds
2004-12-30 17:59 ` Davide Libenzi
2004-12-30 18:16 ` Linus Torvalds
2004-12-30 19:27 ` Jesse Allen
2004-12-30 19:34 ` Linus Torvalds
2004-12-30 22:46 ` Linus Torvalds
2004-12-30 23:00 ` Daniel Jacobowitz
2004-12-30 23:17 ` Linus Torvalds
2004-12-31 5:36 ` Daniel Jacobowitz
2004-12-31 5:47 ` Linus Torvalds
2004-12-31 7:00 ` Jesse Allen
2004-12-31 15:10 ` Daniel Jacobowitz
2004-12-31 17:19 ` Linus Torvalds
2005-01-01 23:20 ` Daniel Jacobowitz
2005-01-29 9:25 ` Kari Hurtta
2004-12-30 23:15 ` Andi Kleen
2004-12-31 0:38 ` Linus Torvalds
2004-12-31 12:35 ` Andi Kleen
2004-12-31 15:16 ` Davide Libenzi
2004-12-31 17:30 ` Linus Torvalds
2004-12-31 19:55 ` Jesse Allen
2004-12-31 17:14 ` Linus Torvalds
2004-12-31 4:55 ` Jesse Allen
2004-12-31 5:05 ` Linus Torvalds
2004-12-31 5:38 ` Daniel Jacobowitz
2004-12-30 19:19 ` Davide Libenzi
2004-12-30 5:06 ` Davide Libenzi
2004-12-30 4:28 ` Jesse Allen
2004-12-29 20:56 ` Jesse Allen
2004-12-29 19:35 ` Thomas Sailer
2004-12-29 20:13 ` Jesse Allen
2004-12-30 1:49 ` Thomas Sailer
2004-12-30 2:10 ` Linus Torvalds
2004-12-30 2:39 ` Thomas Sailer
2004-12-30 2:57 ` Thomas Sailer
2004-12-30 3:15 ` Thomas Sailer
2004-12-30 4:15 ` Andrew Morton
2004-12-30 10:09 ` Thomas Sailer
2004-12-30 13:06 ` Mike Hearn
2004-12-31 13:13 ` Thomas Sailer
2004-12-31 13:31 ` Mike Hearn
2004-12-31 15:42 ` Jesse Allen
2004-12-31 15:56 ` Davide Libenzi
2004-12-31 15:59 ` Jesse Allen
2004-12-31 22:01 ` Linus Torvalds
2005-01-01 22:04 ` Davide Libenzi
2005-01-01 22:14 ` Linus Torvalds
2005-01-02 3:46 ` Davide Libenzi
2005-01-07 4:51 ` minor nit with decoding popf instruction - was " John Kacur
2005-01-07 6:48 ` Linus Torvalds
2005-01-08 5:05 ` John Kacur
2004-12-31 15:51 ` Thomas Sailer
[not found] ` <1104873315.3557.87.camel@littlegreen>
2005-01-04 21:21 ` Andrew Morton
2005-01-05 10:43 ` Thomas Sailer
2005-01-05 11:24 ` Ingo Molnar
2005-01-05 11:40 ` Alexandre Julliard
2004-12-30 12:11 ` Mike Hearn
2004-11-20 3:40 ` Roland McGrath
2004-11-19 20:59 ` Grzegorz Kulewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.58.0411191319360.2222@ppc970.osdl.org \
--to=torvalds@osdl.org \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mh@codeweavers.com \
--cc=pouech-eric@wanadoo.fr \
--cc=roland@redhat.com \
--cc=wine-devel@winehq.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).