kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kprobes/x86: Move kprobes stuff under arch/x86/kernel/kprobes/

Browse source 
Move arch-dep kprobes stuff under arch/x86/kernel/kprobes.

Link: http://lkml.kernel.org/r/20120928081522.3560.75469.stgit@ltc138.sdl.hitachi.co.jp

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
[ fixed whitespace and s/__attribute__((packed))/__packed/ ]
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Masami Hiramatsu 2012-09-28 17:15:22 +09:00 committed by Steven Rostedt
parent e7dbfe349d
commit f684199f5d
6 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/x86/kernel/Makefile
View file

@ -65,9 +65,7 @@ obj-$(CONFIG_X86_TSC) += trace_clock.o
obj-$(CONFIG_KEXEC) += machine_kexec_$(BITS).o obj-$(CONFIG_KEXEC) += machine_kexec_$(BITS).o
obj-$(CONFIG_KEXEC) += relocate_kernel_$(BITS).o crash.o obj-$(CONFIG_KEXEC) += relocate_kernel_$(BITS).o crash.o
obj-$(CONFIG_CRASH_DUMP) += crash_dump_$(BITS).o obj-$(CONFIG_CRASH_DUMP) += crash_dump_$(BITS).o
obj-$(CONFIG_KPROBES) += kprobes.o obj-y += kprobes/
obj-$(CONFIG_OPTPROBES) += kprobes-opt.o
obj-$(CONFIG_KPROBES_ON_FTRACE) += kprobes-ftrace.o
obj-$(CONFIG_MODULES) += module.o obj-$(CONFIG_MODULES) += module.o
obj-$(CONFIG_DOUBLEFAULT) += doublefault_32.o obj-$(CONFIG_DOUBLEFAULT) += doublefault_32.o
obj-$(CONFIG_KGDB) += kgdb.o obj-$(CONFIG_KGDB) += kgdb.o

7
arch/x86/kernel/kprobes/Makefile Normal file
View file

@ -0,0 +1,7 @@
#
# Makefile for kernel probes
#
obj-$(CONFIG_KPROBES) += core.o
obj-$(CONFIG_OPTPROBES) += opt.o
obj-$(CONFIG_KPROBES_ON_FTRACE) += ftrace.o

0
arch/x86/kernel/kprobes-common.h → arch/x86/kernel/kprobes/common.h
View file

6
arch/x86/kernel/kprobes.c → arch/x86/kernel/kprobes/core.c
View file

@ -58,7 +58,7 @@
#include <asm/insn.h> #include <asm/insn.h>
#include <asm/debugreg.h> #include <asm/debugreg.h>
#include "kprobes-common.h" #include "common.h"
void jprobe_return_end(void); void jprobe_return_end(void);
@ -78,7 +78,7 @@ DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);
* Groups, and some special opcodes can not boost. * Groups, and some special opcodes can not boost.
* This is non-const and volatile to keep gcc from statically * This is non-const and volatile to keep gcc from statically
* optimizing it out, as variable_test_bit makes gcc think only * optimizing it out, as variable_test_bit makes gcc think only
* *(unsigned long*) is used. * *(unsigned long*) is used.
*/ */
static volatile u32 twobyte_is_boostable[256 / 32] = { static volatile u32 twobyte_is_boostable[256 / 32] = {
/* 0 1 2 3 4 5 6 7 8 9 a b c d e f */ /* 0 1 2 3 4 5 6 7 8 9 a b c d e f */
@ -117,7 +117,7 @@ static void __kprobes __synthesize_relative_insn(void *from, void *to, u8 op)
struct __arch_relative_insn { struct __arch_relative_insn {
u8 op; u8 op;
s32 raddr; s32 raddr;
} __attribute__((packed)) *insn; } __packed *insn;
insn = (struct __arch_relative_insn *)from; insn = (struct __arch_relative_insn *)from;
insn->raddr = (s32)((long)(to) - ((long)(from) + 5)); insn->raddr = (s32)((long)(to) - ((long)(from) + 5));

2
arch/x86/kernel/kprobes-ftrace.c → arch/x86/kernel/kprobes/ftrace.c
View file

@ -23,7 +23,7 @@
#include <linux/preempt.h> #include <linux/preempt.h>
#include <linux/ftrace.h> #include <linux/ftrace.h>
#include "kprobes-common.h" #include "common.h"
static int __skip_singlestep(struct kprobe *p, struct pt_regs *regs, static int __skip_singlestep(struct kprobe *p, struct pt_regs *regs,
struct kprobe_ctlblk *kcb) struct kprobe_ctlblk *kcb)

2
arch/x86/kernel/kprobes-opt.c → arch/x86/kernel/kprobes/opt.c
View file

@ -37,7 +37,7 @@
#include <asm/insn.h> #include <asm/insn.h>
#include <asm/debugreg.h> #include <asm/debugreg.h>
#include "kprobes-common.h" #include "common.h"
unsigned long __recover_optprobed_insn(kprobe_opcode_t *buf, unsigned long addr) unsigned long __recover_optprobed_insn(kprobe_opcode_t *buf, unsigned long addr)
{ {