mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Roland McGrath <roland@redhat.com>
To: Andrew Morton <akpm@linux-foundation.org>,
	Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
	"H. Peter Anvin" <hpa@zytor.com>
Subject: [PATCH 12/27] x86-32: ptrace generic resume
Date: Sun, 25 Nov 2007 14:01:28 -0800 (PST)	[thread overview]
Message-ID: <20071125220128.DBD2D26F8E1@magilla.localdomain> (raw)
In-Reply-To: Roland McGrath's message of  Sunday, 25 November 2007 13:55:07 -0800 <20071125215507.4B89226F8C5@magilla.localdomain>


This removes the handling for PTRACE_CONT et al from the 32-bit
ptrace code, so it uses the new generic code via ptrace_request.

Signed-off-by: Roland McGrath <roland@redhat.com>
---
 arch/x86/kernel/ptrace_32.c |   57 -------------------------------------------
 1 files changed, 0 insertions(+), 57 deletions(-)

diff --git a/arch/x86/kernel/ptrace_32.c b/arch/x86/kernel/ptrace_32.c
index a493017..50882b3 100644
--- a/arch/x86/kernel/ptrace_32.c
+++ b/arch/x86/kernel/ptrace_32.c
@@ -277,63 +277,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 		  }
 		  break;
 
-	case PTRACE_SYSEMU: /* continue and stop at next syscall, which will not be executed */
-	case PTRACE_SYSCALL:	/* continue and stop at next (return from) syscall */
-	case PTRACE_CONT:	/* restart after signal. */
-		ret = -EIO;
-		if (!valid_signal(data))
-			break;
-		if (request == PTRACE_SYSEMU) {
-			set_tsk_thread_flag(child, TIF_SYSCALL_EMU);
-			clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-		} else if (request == PTRACE_SYSCALL) {
-			set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-			clear_tsk_thread_flag(child, TIF_SYSCALL_EMU);
-		} else {
-			clear_tsk_thread_flag(child, TIF_SYSCALL_EMU);
-			clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-		}
-		child->exit_code = data;
-		/* make sure the single step bit is not set. */
-		user_disable_single_step(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:
-		ret = 0;
-		if (child->exit_state == EXIT_ZOMBIE)	/* already dead */
-			break;
-		child->exit_code = SIGKILL;
-		/* make sure the single step bit is not set. */
-		user_disable_single_step(child);
-		wake_up_process(child);
-		break;
-
-	case PTRACE_SYSEMU_SINGLESTEP: /* Same as SYSEMU, but singlestep if not syscall */
-	case PTRACE_SINGLESTEP:	/* set the trap flag. */
-		ret = -EIO;
-		if (!valid_signal(data))
-			break;
-
-		if (request == PTRACE_SYSEMU_SINGLESTEP)
-			set_tsk_thread_flag(child, TIF_SYSCALL_EMU);
-		else
-			clear_tsk_thread_flag(child, TIF_SYSCALL_EMU);
-
-		clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-		user_enable_single_step(child);
-		child->exit_code = data;
-		/* give it a chance to run. */
-		wake_up_process(child);
-		ret = 0;
-		break;
-
 	case PTRACE_GETREGS: { /* Get all gp regs from the child. */
 	  	if (!access_ok(VERIFY_WRITE, datap, FRAME_SIZE*sizeof(long))) {
 			ret = -EIO;

  parent reply	other threads:[~2007-11-25 22:01 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-11-25 21:55 [PATCH 01/27] ptrace: arch_has_single_step Roland McGrath
2007-11-25 21:58 ` [PATCH 02/27] x86: segment selector macros Roland McGrath
2007-11-25 21:58 ` [PATCH 03/27] x86: remove TRAP_FLAG Roland McGrath
2007-11-25 21:59 ` [PATCH 04/27] x86: arch_has_single_step Roland McGrath
2007-11-25 21:59 ` [PATCH 05/27] x86: single_step moved Roland McGrath
2007-11-25 21:59 ` [PATCH 06/27] x86: single_step segment macros Roland McGrath
2007-11-25 22:00 ` [PATCH 07/27] x86: single_step 0xf0 Roland McGrath
2007-11-25 22:00 ` [PATCH 08/27] x86: single_step: share code Roland McGrath
2007-11-25 22:00 ` [PATCH 09/27] x86 single_step: TIF_FORCED_TF Roland McGrath
2007-11-25 22:01 ` [PATCH 10/27] ptrace: generic resume Roland McGrath
2007-11-25 22:23   ` Christoph Hellwig
2007-11-25 22:37     ` Roland McGrath
2007-11-25 22:01 ` [PATCH 11/27] x86-64: ptrace " Roland McGrath
2007-11-25 22:01 ` Roland McGrath [this message]
2007-11-25 22:03 ` [PATCH 13/27] powerpc: arch_has_single_step Roland McGrath
2007-11-25 22:04 ` [PATCH 14/27] powerpc: ptrace generic resume Roland McGrath
2007-12-03  8:12   ` Srinivasa Ds
2007-11-25 22:04 ` [PATCH 15/27] x86-32 ptrace: use task_pt_regs Roland McGrath
2007-11-25 22:04 ` [PATCH 16/27] x86-64 " Roland McGrath
2007-11-25 22:04 ` [PATCH 17/27] x86-64 ptrace debugreg cleanup Roland McGrath
2007-11-25 22:05 ` [PATCH 18/27] x86-64 ia32 " Roland McGrath
2007-11-25 22:05 ` [PATCH 19/27] x86-32 " Roland McGrath
2007-11-25 22:05 ` [PATCH 20/27] ptrace: arch_has_block_step Roland McGrath
2007-11-28 23:39   ` David Wilder
2007-11-28 23:58     ` Roland McGrath
2007-11-25 22:06 ` [PATCH 21/27] ptrace: generic PTRACE_SINGLEBLOCK Roland McGrath
2007-11-25 22:06 ` [PATCH 22/27] x86: debugctlmsr constants Roland McGrath
2007-11-25 22:08 ` [PATCH 23/27] x86: debugctlmsr kconfig Roland McGrath
2007-11-26  1:09   ` Denys Vlasenko
2007-11-26  7:51     ` Roland McGrath
2007-11-26 22:52       ` Denys Vlasenko
2007-11-26  1:57   ` Dave Jones
2007-11-26  8:06     ` Roland McGrath
2007-11-25 22:08 ` [PATCH 24/27] x86: debugctlmsr context switch Roland McGrath
2007-11-25 22:08 ` [PATCH 25/27] x86: debugctlmsr arch_has_block_step Roland McGrath
2007-11-25 22:08 ` [PATCH 26/27] x86: debugctlmsr kprobes Roland McGrath
2007-11-25 22:08 ` [PATCH 27/27] x86: PTRACE_SINGLEBLOCK Roland McGrath
2007-11-25 22:22 ` [PATCH 01/27] ptrace: arch_has_single_step Christoph Hellwig
2007-11-25 22:59   ` Roland McGrath
2007-11-27  8:53 ` Andrew Morton
2007-11-27 10:38   ` Ingo Molnar
2007-11-27 23:05   ` Roland McGrath
2007-11-27 23:58     ` Ingo Molnar
2007-11-28  0:08       ` Roland McGrath

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=20071125220128.DBD2D26F8E1@magilla.localdomain \
    --to=roland@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    /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

all inboxes | Powered by JetHome®