gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

signal handler support gdb stepi command

Browse Source
This commit is contained in:
Tomoki Shirasawa
2016-02-21 14:55:34 +09:00
parent 2c50b716fd
commit e2b28da32f
3 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/cpu.c
View File

@@ -893,6 +893,7 @@ void debug_handler(struct x86_user_context *regs)
struct siginfo info; struct siginfo info;
set_cputime(interrupt_from_user(regs)? 1: 2); set_cputime(interrupt_from_user(regs)? 1: 2);
kprintf("debug_handler rip=%lx\n", regs->gpr.rip);
#ifdef DEBUG_PRINT_CPU #ifdef DEBUG_PRINT_CPU
kprintf("debug exception (err: %lx, %lx:%lx)\n", kprintf("debug exception (err: %lx, %lx:%lx)\n",
regs->gpr.error, regs->gpr.cs, regs->gpr.rip); regs->gpr.error, regs->gpr.cs, regs->gpr.rip);
@@ -920,6 +921,7 @@ void int3_handler(struct x86_user_context *regs)
struct siginfo info; struct siginfo info;
set_cputime(interrupt_from_user(regs)? 1: 2); set_cputime(interrupt_from_user(regs)? 1: 2);
kprintf("int3_handler rip=%lx\n", regs->gpr.rip);
#ifdef DEBUG_PRINT_CPU #ifdef DEBUG_PRINT_CPU
kprintf("int3 exception (err: %lx, %lx:%lx)\n", kprintf("int3 exception (err: %lx, %lx:%lx)\n",
regs->gpr.error, regs->gpr.cs, regs->gpr.rip); regs->gpr.error, regs->gpr.cs, regs->gpr.rip);

23
arch/x86/kernel/syscall.c
View File

@@ -32,6 +32,8 @@ int write_process_vm(struct process_vm *vm, void *dst, const void *src, size_t s
long do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact); long do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact);
long syscall(int num, ihk_mc_user_context_t *ctx); long syscall(int num, ihk_mc_user_context_t *ctx);
extern void save_fp_regs(struct thread *proc); extern void save_fp_regs(struct thread *proc);
void set_signal(int sig, void *regs0, siginfo_t *info);
void check_signal(unsigned long rc, void *regs0, int num);
//#define DEBUG_PRINT_SC //#define DEBUG_PRINT_SC
@@ -178,6 +180,17 @@ SYSCALL_DECLARE(rt_sigreturn)
if(sigsp->restart){ if(sigsp->restart){
return syscall(sigsp->num, (ihk_mc_user_context_t *)regs); return syscall(sigsp->num, (ihk_mc_user_context_t *)regs);
} }
if(regs->gpr.rflags & RFLAGS_TF){
struct siginfo info;
regs->gpr.rax = sigsp->sigrc;
memset(&info, '\0', sizeof info);
regs->gpr.rflags &= ~RFLAGS_TF;
info.si_code = TRAP_TRACE;
set_signal(SIGTRAP, regs, &info);
check_signal(0, regs, 0);
check_need_resched();
}
return sigsp->sigrc; return sigsp->sigrc;
} }
@@ -595,6 +608,16 @@ do_signal(unsigned long rc, void *regs0, struct thread *thread, struct sig_pendi
thread->sigmask.__val[0] |= pending->sigmask.__val[0]; thread->sigmask.__val[0] |= pending->sigmask.__val[0];
kfree(pending); kfree(pending);
ihk_mc_spinlock_unlock(&thread->sigcommon->lock, irqstate); ihk_mc_spinlock_unlock(&thread->sigcommon->lock, irqstate);
if(regs->gpr.rflags & RFLAGS_TF){
struct siginfo info;
memset(&info, '\0', sizeof info);
regs->gpr.rflags &= ~RFLAGS_TF;
info.si_code = TRAP_TRACE;
set_signal(SIGTRAP, regs, &info);
check_signal(0, regs, 0);
check_need_resched();
}
} }
else { else {
int coredumped = 0; int coredumped = 0;

3
kernel/procfs.c
View File

@@ -261,6 +261,9 @@ process_procfs_request(unsigned long rarg)
} }
#endif #endif
if(readwrite == 0)
reason = PF_POPULATE | PF_USER;
while(left){ while(left){
unsigned long pa; unsigned long pa;
char *va; char *va;