Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id ; Tue, 10 Sep 2002 14:11:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id ; Tue, 10 Sep 2002 14:11:38 -0400 Received: from nameservices.net ([208.234.25.16]:9152 "EHLO opersys.com") by vger.kernel.org with ESMTP id ; Tue, 10 Sep 2002 14:09:06 -0400 Message-ID: <3D7E371D.C7549C88@opersys.com> Date: Tue, 10 Sep 2002 14:17:01 -0400 From: Karim Yaghmour Reply-To: karim@opersys.com X-Mailer: Mozilla 4.75 [en] (X11; U; Linux 2.4.19 i686) X-Accept-Language: en, French/Canada, French/France, fr-FR, fr-CA MIME-Version: 1.0 To: linux-kernel CC: LTT-Dev Subject: [PATCH] 6/8 LTT for 2.5.34: S/390 trace support Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 17795 Lines: 504 This patch adds S/390 trace support. These are the files modified: arch/s390/config.in arch/s390/kernel/entry.S arch/s390/kernel/process.c arch/s390/kernel/sys_s390.c arch/s390/kernel/traps.c arch/s390/mm/fault.c drivers/s390/cio/cio.c drivers/s390/s390mach.c include/asm-s390/trace.h diff -urN linux-2.5.34/arch/s390/config.in linux-2.5.34-ltt/arch/s390/config.in --- linux-2.5.34/arch/s390/config.in Mon Sep 9 13:35:06 2002 +++ linux-2.5.34-ltt/arch/s390/config.in Mon Sep 9 19:06:34 2002 @@ -65,6 +65,8 @@ source fs/Config.in +source drivers/trace/Config.in + mainmenu_option next_comment comment 'Kernel hacking' diff -urN linux-2.5.34/arch/s390/kernel/entry.S linux-2.5.34-ltt/arch/s390/kernel/entry.S --- linux-2.5.34/arch/s390/kernel/entry.S Mon Sep 9 13:35:04 2002 +++ linux-2.5.34-ltt/arch/s390/kernel/entry.S Mon Sep 9 19:06:34 2002 @@ -7,6 +7,7 @@ * Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com), * Hartmut Penner (hp@de.ibm.com), * Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com), + * Portions added by T. Halloran: (C) Copyright 2002 IBM Poughkeepsie, IBM Corporation */ #include @@ -183,6 +184,14 @@ sll %r8,2 GET_THREAD_INFO # load pointer to task_struct to R9 stosm 24(%r15),0x03 # reenable interrupts +/* call to ltt trace done here. R8 has the syscall (svc) number to trace */ +#if (CONFIG_TRACE || CONFIG_TRACE_MODULE) /* tjh - ltt port */ + /* add call to trace_real_syscall_entry */ + la %r2,SP_PTREGS(%r15) # load pt_regs as first parameter + l %r1,BASED(.Ltracesysent) + basr %r14,%r1 + lm %r0,%r6,SP_R0(%r15) /* restore call clobbered regs tjh */ +#endif l %r8,sys_call_table-entry_base(%r8,%r13) # get system call addr. tm __TI_flags+3(%r9),_TIF_SYSCALL_TRACE bo BASED(sysc_tracesys) @@ -191,6 +200,13 @@ # ATTENTION: check sys_execve_glue before # changing anything here !! +#if (CONFIG_TRACE || CONFIG_TRACE_MODULE) /* tjh - ltt port * + /* add call to trace_real_syscall_exit */ + la %r2,SP_PTREGS(%r15) # load pt_regs as first parameter + l %r1,BASED(.Ltracesysext) + basr %r14,%r1 + lm %r0,%r6,SP_R0(%r15) /* restore call clobbered regs */ +#endif sysc_return: stnsm 24(%r15),0xfc # disable I/O and ext. interrupts tm __TI_flags+3(%r9),_TIF_WORK_MASK @@ -896,6 +912,8 @@ .Lsigaltstack: .long sys_sigaltstack .Ltrace: .long syscall_trace .Lvfork: .long sys_vfork +.Ltracesysent: .long trace_real_syscall_entry +.Ltracesysext: .long trace_real_syscall_exit #ifdef CONFIG_SMP .Lschedtail: .long schedule_tail #endif diff -urN linux-2.5.34/arch/s390/kernel/process.c linux-2.5.34-ltt/arch/s390/kernel/process.c --- linux-2.5.34/arch/s390/kernel/process.c Mon Sep 9 13:35:15 2002 +++ linux-2.5.34-ltt/arch/s390/kernel/process.c Mon Sep 9 19:06:34 2002 @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -145,6 +146,10 @@ : "d" (clone_arg), "i" (__NR_clone), "i" (__NR_exit), "d" (arg), "d" (fn), "i" (__LC_KERNEL_STACK) , "i" (-STACK_FRAME_OVERHEAD) : "2", "3", "4" ); +#if (CONFIG_TRACE || CONFIG_TRACE_MODULE) + if (retval > 0) + TRACE_PROCESS(TRACE_EV_PROCESS_KTHREAD, retval, (int) fn); +#endif return retval; } diff -urN linux-2.5.34/arch/s390/kernel/sys_s390.c linux-2.5.34-ltt/arch/s390/kernel/sys_s390.c --- linux-2.5.34/arch/s390/kernel/sys_s390.c Mon Sep 9 13:35:08 2002 +++ linux-2.5.34-ltt/arch/s390/kernel/sys_s390.c Mon Sep 9 19:06:34 2002 @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -144,6 +145,8 @@ { struct ipc_kludge tmp; int ret; + + TRACE_IPC(TRACE_EV_IPC_CALL, call, first); switch (call) { case SEMOP: diff -urN linux-2.5.34/arch/s390/kernel/traps.c linux-2.5.34-ltt/arch/s390/kernel/traps.c --- linux-2.5.34/arch/s390/kernel/traps.c Mon Sep 9 13:35:08 2002 +++ linux-2.5.34-ltt/arch/s390/kernel/traps.c Mon Sep 9 23:50:50 2002 @@ -5,6 +5,7 @@ * Copyright (C) 1999,2000 IBM Deutschland Entwicklung GmbH, IBM Corporation * Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com), * Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com), + * Portions added by T. Halloran: (C) Copyright 2002 IBM Poughkeepsie, IBM Corporation * * Derived from "arch/i386/kernel/traps.c" * Copyright (C) 1991, 1992 Linus Torvalds @@ -28,6 +29,8 @@ #include #include +#include + #include #include #include @@ -275,6 +278,9 @@ static void inline do_trap(long interruption_code, int signr, char *str, struct pt_regs *regs, siginfo_t *info) { + trapid_t ltt_interruption_code; + char * ic_ptr = (char *) <t_interruption_code; + /* * We got all needed information from the lowcore and can * now safely switch on interrupts. @@ -282,6 +288,10 @@ if (regs->psw.mask & PSW_PROBLEM_STATE) local_irq_enable(); + memset(<t_interruption_code,0,sizeof(ltt_interruption_code)); + memcpy(ic_ptr+4,&interruption_code,sizeof(interruption_code)); + TRACE_TRAP_ENTRY(ltt_interruption_code, (regs->psw.addr & PSW_ADDR_MASK)); + if (regs->psw.mask & PSW_PROBLEM_STATE) { struct task_struct *tsk = current; @@ -310,6 +320,7 @@ else die(str, regs, interruption_code); } + TRACE_TRAP_EXIT(); } static inline void *get_check_address(struct pt_regs *regs) @@ -407,6 +418,8 @@ { __u8 opcode[6]; __u16 *location; + trapid_t ltt_interruption_code; + char * ic_ptr = (char *) <t_interruption_code; int signal = 0; location = (__u16 *)(regs->psw.addr-S390_lowcore.pgm_ilc); @@ -418,6 +431,10 @@ if (regs->psw.mask & PSW_PROBLEM_STATE) local_irq_enable(); + memset(<t_interruption_code,0,sizeof(ltt_interruption_code)); + memcpy(ic_ptr+4,&interruption_code,sizeof(interruption_code)); + TRACE_TRAP_ENTRY(ltt_interruption_code, (regs->psw.addr & PSW_ADDR_MASK)); + if (regs->psw.mask & PSW_PROBLEM_STATE) get_user(*((__u16 *) opcode), location); else @@ -458,6 +475,7 @@ else if (signal) do_trap(interruption_code, signal, "illegal operation", regs, NULL); + TRACE_TRAP_EXIT(); } @@ -468,6 +486,8 @@ { __u8 opcode[6]; __u16 *location = NULL; + trapid_t ltt_interruption_code; + char * ic_ptr = (char *) <t_interruption_code; int signal = 0; location = (__u16 *) get_check_address(regs); @@ -478,6 +498,10 @@ */ if (regs->psw.mask & PSW_PROBLEM_STATE) local_irq_enable(); + + memset(<t_interruption_code,0,sizeof(ltt_interruption_code)); + memcpy(ic_ptr+4,&interruption_code,sizeof(interruption_code)); + TRACE_TRAP_ENTRY(ltt_interruption_code, (regs->psw.addr & PSW_ADDR_MASK)); if (regs->psw.mask & PSW_PROBLEM_STATE) { get_user(*((__u16 *) opcode), location); @@ -522,6 +546,7 @@ do_trap(interruption_code, signal, "specification exception", regs, &info); } + TRACE_TRAP_EXIT(); } #else DO_ERROR_INFO(SIGILL, "specification exception", specification_exception, @@ -531,6 +556,8 @@ asmlinkage void data_exception(struct pt_regs * regs, long interruption_code) { __u16 *location; + trapid_t ltt_interruption_code; + char * ic_ptr = (char *) <t_interruption_code; int signal = 0; location = (__u16 *) get_check_address(regs); @@ -542,6 +569,10 @@ if (regs->psw.mask & PSW_PROBLEM_STATE) local_irq_enable(); + memset(<t_interruption_code,0,sizeof(ltt_interruption_code)); + memcpy(ic_ptr+4,&interruption_code,sizeof(interruption_code)); + TRACE_TRAP_ENTRY(ltt_interruption_code, (regs->psw.addr & PSW_ADDR_MASK)); + if (MACHINE_HAS_IEEE) __asm__ volatile ("stfpc %0\n\t" : "=m" (current->thread.fp_regs.fpc)); @@ -617,6 +648,7 @@ do_trap(interruption_code, signal, "data exception", regs, &info); } + TRACE_TRAP_EXIT(); } @@ -671,6 +703,11 @@ void handle_per_exception(struct pt_regs *regs) { + trapid_t ltt_interruption_code; + char * ic_ptr = (char *) <t_interruption_code; + memset(<t_interruption_code,0,sizeof(ltt_interruption_code)); + memcpy(ic_ptr+6,&S390_lowcore.pgm_code,2); /* copy the interrupt code */ + TRACE_TRAP_ENTRY(ltt_interruption_code,(regs->psw.addr & PSW_ADDR_MASK)); if(regs->psw.mask&PSW_PROBLEM_STATE) { per_struct *per_info=¤t->thread.per_info; @@ -687,5 +724,85 @@ /* Hopefully switching off per tracing will help us survive */ regs->psw.mask &= ~PSW_PER_MASK; } + TRACE_TRAP_EXIT(); +} + +#if (CONFIG_TRACE || CONFIG_TRACE_MODULE) +asmlinkage void trace_real_syscall_entry(struct pt_regs *regs) +{ + int use_depth; + int use_bounds; + int depth = 0; + int seek_depth; + unsigned long lower_bound; + unsigned long upper_bound; + unsigned long addr; + unsigned long *stack; + unsigned long temp_stack; + trace_syscall_entry trace_syscall_event; + /* Set the syscall ID */ + /* Register 8 is setup just prior to the call */ + /* This instruction is just following linkage */ + /* so it's ok. If moved and chance of R8 being */ + /* clobbered, would need to dig it out of the stack */ + __asm__ volatile (" stc 8,%0\n\t" + :"=m" (trace_syscall_event.syscall_id)); + /* get the psw address */ + trace_syscall_event.address = regs->psw.addr; + /* and off the hi-order bit */ + trace_syscall_event.address &= PSW_ADDR_MASK; + if (!(user_mode(regs))) /* if kernel mode, return */ + goto trace_syscall_end; + /* Get the trace configuration - if none, return */ + if (trace_get_config(&use_depth, + &use_bounds, + &seek_depth, + (void *) &lower_bound, + (void *) &upper_bound) < 0) + goto trace_syscall_end; + /* Do we have to search for an instruction pointer address range */ + if ((use_depth == 1) || (use_bounds == 1)) { + /* Start at the top of the stack */ + /* stack pointer is register 15 */ + stack = (unsigned long *) regs->gprs[15]; /* stack pointer */ + /* Keep on going until we reach the end of the process' stack limit */ + do { + get_user(addr, stack + 14); /* get the program address +0x38 */ + /* and off the hi-order bit */ + addr &= PSW_ADDR_MASK; + /* Does this LOOK LIKE an address in the program */ + if ((addr > current->mm->start_code) + && (addr < current->mm->end_code)) { + /* Does this address fit the description */ + if (((use_depth == 1) && (depth == seek_depth)) + || ((use_bounds == 1) && (addr > lower_bound) + && (addr < upper_bound))) { + /* Set the address */ + trace_syscall_event.address = addr; + /* We're done */ + goto trace_syscall_end; + } else + /* We're one depth more */ + depth++; + } + /* Go on to the next address */ + get_user(temp_stack, stack); /* get contents of stack */ + temp_stack &= PSW_ADDR_MASK; /* and off hi order bit */ + stack = (unsigned long *) temp_stack; /* move into stack */ + /* stack may or may not go to zero when end hit */ + /* using 0x7fffffff-_STK_LIM to validate that the address is */ + /* within the range of a valid stack address */ + /* If outside that range, exit the loop, stack end must have */ + /* been hit. */ + } while (stack >= (unsigned long *) (0x7fffffff - _STK_LIM)); + } +trace_syscall_end: + /* Trace the event */ + trace_event(TRACE_EV_SYSCALL_ENTRY, &trace_syscall_event); +} +asmlinkage void trace_real_syscall_exit(void) +{ + trace_event(TRACE_EV_SYSCALL_EXIT, NULL); } +#endif /* (CONFIG_TRACE || CONFIG_TRACE_MODULE) */ diff -urN linux-2.5.34/arch/s390/mm/fault.c linux-2.5.34-ltt/arch/s390/mm/fault.c --- linux-2.5.34/arch/s390/mm/fault.c Mon Sep 9 13:35:15 2002 +++ linux-2.5.34-ltt/arch/s390/mm/fault.c Mon Sep 9 19:06:34 2002 @@ -5,6 +5,7 @@ * Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation * Author(s): Hartmut Penner (hp@de.ibm.com) * Ulrich Weigand (uweigand@de.ibm.com) + * Portions added by T. Halloran: (C) Copyright 2002 IBM Poughkeepsie, IBM Corporation * * Derived from "arch/i386/mm/fault.c" * Copyright (C) 1995 Linus Torvalds @@ -25,6 +26,7 @@ #include #include #include +#include #include #include @@ -154,6 +156,8 @@ int user_address; unsigned long fixup; int si_code = SEGV_MAPERR; + trapid_t ltt_interruption_code; + char * ic_ptr = (char *) <t_interruption_code; tsk = current; mm = tsk->mm; @@ -201,6 +205,9 @@ */ local_irq_enable(); + memset(<t_interruption_code,0,sizeof(ltt_interruption_code)); + memcpy(ic_ptr+4,&error_code,sizeof(error_code)); + TRACE_TRAP_ENTRY(ltt_interruption_code,(regs->psw.addr & PSW_ADDR_MASK)); down_read(&mm->mmap_sem); vma = find_vma(mm, address); @@ -247,6 +254,7 @@ } up_read(&mm->mmap_sem); + TRACE_TRAP_EXIT(); return; /* @@ -261,6 +269,7 @@ tsk->thread.prot_addr = address; tsk->thread.trap_no = error_code; force_sigsegv(regs, error_code, si_code, address); + TRACE_TRAP_EXIT(); return; } @@ -268,6 +277,7 @@ /* Are we prepared to handle this kernel fault? */ if ((fixup = search_exception_table(regs->psw.addr)) != 0) { regs->psw.addr = fixup; + TRACE_TRAP_EXIT(); return; } @@ -315,6 +325,8 @@ /* Kernel mode? Handle exceptions or die */ if (!(regs->psw.mask & PSW_PROBLEM_STATE)) goto no_context; + + TRACE_TRAP_EXIT(); } void do_protection_exception(struct pt_regs *regs, unsigned long error_code) diff -urN linux-2.5.34/drivers/s390/cio/cio.c linux-2.5.34-ltt/drivers/s390/cio/cio.c --- linux-2.5.34/drivers/s390/cio/cio.c Mon Sep 9 13:35:26 2002 +++ linux-2.5.34-ltt/drivers/s390/cio/cio.c Mon Sep 9 19:06:34 2002 @@ -18,6 +18,8 @@ #include #include +#include + #include #include #include @@ -1002,9 +1004,11 @@ } irq_enter (cpu, irq); + TRACE_IRQ_ENTRY(irq, !(((regs).psw.mask&PSW_PROBLEM_STATE) != 0)); s390irq_spin_lock (irq); s390_process_IRQ (irq); s390irq_spin_unlock (irq); + TRACE_IRQ_EXIT(); irq_exit (cpu, irq); } diff -urN linux-2.5.34/drivers/s390/s390mach.c linux-2.5.34-ltt/drivers/s390/s390mach.c --- linux-2.5.34/drivers/s390/s390mach.c Mon Sep 9 13:35:28 2002 +++ linux-2.5.34-ltt/drivers/s390/s390mach.c Mon Sep 9 19:06:34 2002 @@ -5,12 +5,14 @@ * S390 version * Copyright (C) 2000 IBM Deutschland Entwicklung GmbH, IBM Corporation * Author(s): Ingo Adlung (adlung@de.ibm.com) + * Portions added by T. Halloran: (C) Copyright 2002 IBM Poughkeepsie, IBM Corporation */ #include #include #include #include +#include #ifdef CONFIG_SMP #include #endif @@ -152,10 +154,20 @@ { int crw_count; mcic_t mcic; + trapid_t ltt_interruption_code; + uint32_t ltt_old_psw; DBG(KERN_INFO "s390_do_machine_check : starting ...\n"); memcpy(&mcic, &S390_lowcore.mcck_interruption_code, sizeof (__u64)); + memcpy( <t_interruption_code, + &S390_lowcore.mcck_interruption_code, + sizeof(__u64)); + memcpy( <t_old_psw, + &S390_lowcore.mcck_old_psw, + sizeof(uint32_t)); + ltt_old_psw &= PSW_ADDR_MASK; + TRACE_TRAP_ENTRY(ltt_interruption_code,ltt_old_psw); if (mcic.mcc.mcd.sd) /* system damage */ s390_handle_damage("received system damage machine check\n"); diff -urN linux-2.5.34/include/asm-s390/trace.h linux-2.5.34-ltt/include/asm-s390/trace.h --- linux-2.5.34/include/asm-s390/trace.h Wed Dec 31 19:00:00 1969 +++ linux-2.5.34-ltt/include/asm-s390/trace.h Mon Sep 9 19:06:35 2002 @@ -0,0 +1,15 @@ +/* + * linux/include/asm-s390/trace.h + * + * Copyright (C) 2002, Karim Yaghmour + * + * S/390 definitions for tracing system + */ + +#include + +/* Current arch type */ +#define TRACE_ARCH_TYPE TRACE_ARCH_TYPE_S390 + +/* Current variant type */ +#define TRACE_ARCH_VARIANT TRACE_ARCH_VARIANT_NONE - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/