Skip to content

Commit

Permalink
[S390] add kprobes annotations
Browse files Browse the repository at this point in the history
Add kprobes annotations to get the massive 'probe kernel.function("*") {}'
stress test working.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  • Loading branch information
Martin Schwidefsky authored and Martin Schwidefsky committed Jan 5, 2011
1 parent 4a18863 commit 860dba4
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 9 deletions.
4 changes: 4 additions & 0 deletions arch/s390/kernel/entry.S
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@ STACK_SIZE = 1 << STACK_SHIFT
ssm __SF_EMPTY(%r15)
.endm

.section .kprobes.text, "ax"

/*
* Scheduler resume function, called by switch_to
* gpr2 = (task_struct *) prev
Expand Down Expand Up @@ -861,6 +863,8 @@ restart_crash:
restart_go:
#endif

.section .kprobes.text, "ax"

#ifdef CONFIG_CHECK_STACK
/*
* The synchronous or the asynchronous stack overflowed. We are dead.
Expand Down
4 changes: 4 additions & 0 deletions arch/s390/kernel/entry64.S
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,8 @@ _TIF_SYSCALL = (_TIF_SYSCALL_TRACE>>8 | _TIF_SYSCALL_AUDIT>>8 | \
ssm __SF_EMPTY(%r15)
.endm

.section .kprobes.text, "ax"

/*
* Scheduler resume function, called by switch_to
* gpr2 = (task_struct *) prev
Expand Down Expand Up @@ -868,6 +870,8 @@ restart_crash:
restart_go:
#endif

.section .kprobes.text, "ax"

#ifdef CONFIG_CHECK_STACK
/*
* The synchronous or the asynchronous stack overflowed. We are dead.
Expand Down
2 changes: 2 additions & 0 deletions arch/s390/kernel/mcount.S
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#include <asm/asm-offsets.h>

.section .kprobes.text, "ax"

.globl ftrace_stub
ftrace_stub:
br %r14
Expand Down
2 changes: 2 additions & 0 deletions arch/s390/kernel/mcount64.S
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#include <asm/asm-offsets.h>

.section .kprobes.text, "ax"

.globl ftrace_stub
ftrace_stub:
br %r14
Expand Down
9 changes: 6 additions & 3 deletions arch/s390/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include <linux/kernel_stat.h>
#include <linux/syscalls.h>
#include <linux/compat.h>
#include <linux/kprobes.h>
#include <asm/compat.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
Expand Down Expand Up @@ -116,15 +117,17 @@ void cpu_idle(void)
}
}

extern void kernel_thread_starter(void);
extern void __kprobes kernel_thread_starter(void);

asm(
".align 4\n"
".section .kprobes.text, \"ax\"\n"
".global kernel_thread_starter\n"
"kernel_thread_starter:\n"
" la 2,0(10)\n"
" basr 14,9\n"
" la 2,0\n"
" br 11\n");
" br 11\n"
".previous\n");

int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
{
Expand Down
3 changes: 2 additions & 1 deletion arch/s390/kernel/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#include <linux/clocksource.h>
#include <linux/clockchips.h>
#include <linux/gfp.h>
#include <linux/kprobes.h>
#include <asm/uaccess.h>
#include <asm/delay.h>
#include <asm/s390_ext.h>
Expand All @@ -60,7 +61,7 @@ static DEFINE_PER_CPU(struct clock_event_device, comparators);
/*
* Scheduler clock - returns current time in nanosec units.
*/
unsigned long long notrace sched_clock(void)
unsigned long long notrace __kprobes sched_clock(void)
{
return (get_clock_monotonic() * 125) >> 9;
}
Expand Down
6 changes: 3 additions & 3 deletions arch/s390/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -451,8 +451,8 @@ static inline void do_fp_trap(struct pt_regs *regs, void __user *location,
"floating point exception", regs, &si);
}

static void illegal_op(struct pt_regs *regs, long pgm_int_code,
unsigned long trans_exc_code)
static void __kprobes illegal_op(struct pt_regs *regs, long pgm_int_code,
unsigned long trans_exc_code)
{
siginfo_t info;
__u8 opcode[6];
Expand Down Expand Up @@ -688,7 +688,7 @@ static void space_switch_exception(struct pt_regs *regs, long pgm_int_code,
do_trap(pgm_int_code, SIGILL, "space switch event", regs, &info);
}

asmlinkage void kernel_stack_overflow(struct pt_regs * regs)
asmlinkage void __kprobes kernel_stack_overflow(struct pt_regs * regs)
{
bust_spinlocks(1);
printk("Kernel stack overflow.\n");
Expand Down
5 changes: 3 additions & 2 deletions arch/s390/kernel/vtime.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <linux/rcupdate.h>
#include <linux/posix-timers.h>
#include <linux/cpu.h>
#include <linux/kprobes.h>

#include <asm/s390_ext.h>
#include <asm/timer.h>
Expand Down Expand Up @@ -122,7 +123,7 @@ void account_system_vtime(struct task_struct *tsk)
}
EXPORT_SYMBOL_GPL(account_system_vtime);

void vtime_start_cpu(__u64 int_clock, __u64 enter_timer)
void __kprobes vtime_start_cpu(__u64 int_clock, __u64 enter_timer)
{
struct s390_idle_data *idle = &__get_cpu_var(s390_idle);
struct vtimer_queue *vq = &__get_cpu_var(virt_cpu_timer);
Expand Down Expand Up @@ -162,7 +163,7 @@ void vtime_start_cpu(__u64 int_clock, __u64 enter_timer)
idle->sequence++;
}

void vtime_stop_cpu(void)
void __kprobes vtime_stop_cpu(void)
{
struct s390_idle_data *idle = &__get_cpu_var(s390_idle);
struct vtimer_queue *vq = &__get_cpu_var(virt_cpu_timer);
Expand Down

0 comments on commit 860dba4

Please sign in to comment.