MN10300: Don't set the dirty bit in the DTLB entries in the TLB-miss handler
Subsystems (2)
PATCH 1/2 MN10300: Don't set the dirty bit in the DTLB entries in the TLB-miss handler
Remove the special handling for the Data TLB entry dirty bit in the TLB-miss handler. As the code stands, all that it does is to cause us to take a second data address exception to set the dirty bit. Instead, we can just let pte_mkdirty() set the bit.
Signed-off-by David Howells <[email protected]>
---
arch/mn10300/mm/tlb-mn10300.S | 18 ------------------ 1 files changed, 0 insertions(+), 18 deletions(-)
arch/mn10300/mm/tlb-mn10300.S +0 -18
@@ -165,24 +165,6 @@ ENTRY(itlb_aerror) ENTRY(dtlb_aerror) and ~EPSW_NMID,epsw add -4,sp - mov d1,(sp) - - movhu (MMUFCR_DFC),d1 # is it the initial valid write - # to this page? - and MMUFCR_xFC_INITWR,d1 - beq dtlb_pagefault # jump if not - - mov (DPTEL),d1 # set the dirty bit - # (don't replace with BSET!) - or _PAGE_DIRTY,d1 - mov d1,(DPTEL) - mov (sp),d1 - add 4,sp - rti - - ALIGN -dtlb_pagefault: - mov (sp),d1 SAVE_ALL add -4,sp # need to pass three params
PATCH 2/2 MN10300: Add utrace/tracehooks support
Add utrace/tracehooks support to MN10300.
Signed-off-by David Howells <[email protected]>
---
arch/mn10300/Kconfig | 1 arch/mn10300/include/asm/elf.h | 3 arch/mn10300/include/asm/processor.h | 8 - arch/mn10300/include/asm/ptrace.h | 8 + arch/mn10300/kernel/entry.S | 13 - arch/mn10300/kernel/ptrace.c | 454 +++++++++++++++++----------------- arch/mn10300/kernel/signal.c | 9 + 7 files changed, 257 insertions(+), 239 deletions(-)
arch/mn10300/Kconfig +1 -0
@@ -8,6 +8,7 @@ mainmenu "Linux Kernel Configuration" config MN10300 def_bool y select HAVE_OPROFILE + select HAVE_ARCH_TRACEHOOK config AM33 def_bool y
arch/mn10300/include/asm/elf.h +2 -1
@@ -34,7 +34,7 @@*/ typedef unsigned long elf_greg_t ; -#define ELF_NGREG (sizeof (struct pt_regs) / sizeof(elf_greg_t)) +#define ELF_NGREG ((sizeof(struct pt_regs) / sizeof(elf_greg_t)) - 1)typedef elf_greg_t elf_gregset_t [ELF_NGREG ];#define ELF_NFPREG 32
@@ -76,6 +76,7 @@ do { \ } while (0)#define USE_ELF_CORE_DUMP +#define CORE_DUMP_USE_REGSET #define ELF_EXEC_PAGESIZE 4096/*
arch/mn10300/include/asm/processor.h +1 -7
@@ -143,13 +143,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);unsigned long get_wchan (struct task_struct *p); -#define task_pt_regs (task) \ -({ \ - struct pt_regs *__regs__; \ - __regs__ = (struct pt_regs *) (KSTK_TOP(task_stack_page(task)) - 8); \ - __regs__ - 1; \ -}) - +#define task_pt_regs (task) ((task)->thread.uregs)#define KSTK_EIP (task) (task_pt_regs(task)->pc)#define KSTK_ESP (task) (task_pt_regs(task)->sp)
arch/mn10300/include/asm/ptrace.h +8 -0
@@ -91,9 +91,17 @@ extern struct pt_regs *__frame; /* current frame pointer */#if defined(__KERNEL__)#if !defined(__ASSEMBLY__) +struct task_struct ; +#define user_mode (regs) (((regs)->epsw & EPSW_nSL) == EPSW_nSL)#define instruction_pointer (regs) ((regs)->pc) +#define user_stack_pointer (regs) ((regs)->sp)extern void show_regs (struct pt_regs *); + +#define arch_has_single_step () (1) +extern void user_enable_single_step (struct task_struct *); +extern void user_disable_single_step (struct task_struct *); +#endif /* !__ASSEMBLY */ #define profile_pc (regs) ((regs)->pc)
arch/mn10300/kernel/entry.S +5 -8
@@ -76,7 +76,7 @@ ENTRY(system_call) cmp nr_syscalls,d0 bcc syscall_badsys btst _TIF_SYSCALL_TRACE,(TI_flags,a2) - bne syscall_trace_entry + bne syscall_entry_trace syscall_call: add d0,d0,a1 add a1,a1
@@ -104,11 +104,10 @@ restore_all: syscall_exit_work: btst _TIF_SYSCALL_TRACE,d2 beq work_pending - __sti # could let do_syscall_trace() call + __sti # could let syscall_trace_exit() call # schedule() instead mov fp,d0 - mov 1,d1 - call do_syscall_trace[],0 # do_syscall_trace(regs,entryexit) + call syscall_trace_exit[],0 # do_syscall_trace(regs) jmp resume_userspace ALIGN
@@ -138,13 +137,11 @@ work_notifysig: jmp resume_userspace # perform syscall entry tracing -syscall_trace_entry: +syscall_entry_trace: mov -ENOSYS,d0 mov d0,(REG_D0,fp) mov fp,d0 - clr d1 - call do_syscall_trace[],0 - mov (REG_ORIG_D0,fp),d0 + call syscall_trace_entry[],0 # returns the syscall number to actually use mov (REG_D1,fp),d1 cmp nr_syscalls,d0 bcs syscall_call
arch/mn10300/kernel/ptrace.c +231 -223
535 lines not on this page · raw message
arch/mn10300/kernel/signal.c +9 -0
@@ -23,6 +23,7 @@#include <linux/tty.h> #include <linux/personality.h> #include <linux/suspend.h> +#include <linux/tracehook.h> #include <asm/cacheflush.h> #include <asm/ucontext.h> #include <asm/uaccess.h>
@@ -511,6 +512,9 @@ static void do_signal(struct pt_regs *regs)* clear the TIF_RESTORE_SIGMASK flag */ if (test_thread_flag (TIF_RESTORE_SIGMASK ))clear_thread_flag (TIF_RESTORE_SIGMASK ); + +tracehook_signal_handler (signr, &info, &ka, regs, +test_thread_flag (TIF_SINGLESTEP )); }return ;
@@ -561,4 +565,9 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, u32 thread_info_flags)/* deal with pending signal delivery */ if (thread_info_flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK))do_signal (regs); + +if (thread_info_flags & _TIF_NOTIFY_RESUME) { +clear_thread_flag (TIF_NOTIFY_RESUME ); +tracehook_notify_resume (__frame); + } }