Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 857fb252 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

h8300: use generic ptrace_resume code 



Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT,
PTRACE_KILL and PTRACE_SINGLESTEP.  This implies defining
arch_has_single_step in <asm/ptrace.h> and implementing the
user_enable_single_step and user_disable_single_step functions, which also
causes the breakpoint information to be cleared on fork, which could be
considered a bug fix.

Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which
it previously wasn't which is consistent with all architectures using the
modern ptrace code.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Roland McGrath <roland@redhat.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1d839317

arch/h8300/include/asm/ptrace.h

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ struct pt_regs { 
/* Find the stack offset for a register, relative to thread.esp0. */

#define PT_REG(reg)	((long)&((struct pt_regs *)0)->reg)



#define arch_has_single_step()	(1)



#define user_mode(regs) (!((regs)->ccr & PS_S))

#define instruction_pointer(regs) ((regs)->pc)

#define profile_pc(regs) instruction_pointer(regs)

arch/h8300/kernel/ptrace.c

+6 −46
Original line number Diff line number Diff line
@@ -34,8 +34,11 @@ 
/* cpu depend functions */

extern long h8300_get_reg(struct task_struct *task, int regno);

extern int  h8300_put_reg(struct task_struct *task, int regno, unsigned long data);

extern void h8300_disable_trace(struct task_struct *child);

extern void h8300_enable_trace(struct task_struct *child);





void user_disable_single_step(struct task_struct *child)

{

}



/*

 * does not yet catch signals sent when the child dies.
@@ -44,7 +47,7 @@ extern void h8300_enable_trace(struct task_struct *child); 


void ptrace_disable(struct task_struct *child)

{

	h8300_disable_trace(child);

	user_disable_single_step(child);

}



long arch_ptrace(struct task_struct *child, long request, long addr, long data)
@@ -107,49 +110,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
			}

			ret = -EIO;

			break ;

		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_SYSCALL)

				set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);

			else

				clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);

			child->exit_code = data;

			wake_up_process(child);

			/* make sure the single step bit is not set. */

			h8300_disable_trace(child);

			ret = 0;

		}



/*

 * 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;

			h8300_disable_trace(child);

			wake_up_process(child);

			break;

		}



		case PTRACE_SINGLESTEP: {  /* set the trap flag. */

			ret = -EIO;

			if (!valid_signal(data))

				break;

			clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);

			child->exit_code = data;

			h8300_enable_trace(child);

			wake_up_process(child);

			ret = 0;

			break;

		}



		case PTRACE_GETREGS: { /* Get all gp regs from the child. */

		  	int i;

arch/h8300/platform/h8300h/ptrace_h8300h.c

+3 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ int h8300_put_reg(struct task_struct *task, int regno, unsigned long data) 
}



/* disable singlestep */

void h8300_disable_trace(struct task_struct *child)

void user_disable_single_step(struct task_struct *child)

{

	if((long)child->thread.breakinfo.addr != -1L) {

		*child->thread.breakinfo.addr = child->thread.breakinfo.inst;
@@ -264,7 +264,7 @@ static unsigned short *getnextpc(struct task_struct *child, unsigned short *pc) 


/* Set breakpoint(s) to simulate a single step from the current PC.  */



void h8300_enable_trace(struct task_struct *child)

void user_enable_single_step(struct task_struct *child)

{

	unsigned short *nextpc;

	nextpc = getnextpc(child,(unsigned short *)h8300_get_reg(child, PT_PC));
@@ -276,7 +276,7 @@ void h8300_enable_trace(struct task_struct *child) 
asmlinkage void trace_trap(unsigned long bp)

{

	if ((unsigned long)current->thread.breakinfo.addr == bp) {

		h8300_disable_trace(current);

		user_disable_single_step(current);

		force_sig(SIGTRAP,current);

	} else

	        force_sig(SIGILL,current);

arch/h8300/platform/h8s/ptrace_h8s.c

+2 −2
Original line number Diff line number Diff line
@@ -65,13 +65,13 @@ int h8300_put_reg(struct task_struct *task, int regno, unsigned long data) 
}



/* disable singlestep */

void h8300_disable_trace(struct task_struct *child)

void user_disable_single_step(struct task_struct *child)

{

	*(unsigned short *)(child->thread.esp0 + h8300_register_offset[PT_EXR]) &= ~EXR_TRACE;

}



/* enable singlestep */

void h8300_enable_trace(struct task_struct *child)

void user_enable_single_step(struct task_struct *child)

{

	*(unsigned short *)(child->thread.esp0 + h8300_register_offset[PT_EXR]) |= EXR_TRACE;

}