kprobes code for x86 unification
PATCH 6/6 kprobes code for x86 unification
This patch unifies kprobes code.
- Unify kprobes_*.h to kprobes.h
- Unify kprobes_*.c to kprobes.c
(Differences are separated by ifdefs)
- Most differences are related to REX prefix and rip relatives.
- Two inline assembly code are different.
- One difference in kprobe_handlre()
- One fixup exception code is different, but it will be unified if mm/extable_*.c are unified.
- Merge history logs into arch/x86/kernel/kprobes.c.
--- arch/x86/kernel/Makefile_32 | 2 arch/x86/kernel/Makefile_64 | 2 arch/x86/kernel/kprobes.c | 1045 +++++++++++++++++++++++++++++++++++++++++++ arch/x86/kernel/kprobes_32.c | 848 ---------------------------------- arch/x86/kernel/kprobes_64.c | 953 --------------------------------------- include/asm-x86/kprobes.h | 103 ++++ include/asm-x86/kprobes_32.h | 102 ---- include/asm-x86/kprobes_64.h | 102 ---- 8 files changed, 1145 insertions(+), 2012 deletions(-)
include/asm-x86/kprobes.h +98 -5
@@ -1,5 +1,98 @@ -#ifdef CONFIG_X86_32 -# include "kprobes_32.h" -#else -# include "kprobes_64.h" -#endif +#ifndef _ASM_KPROBES_H +#define _ASM_KPROBES_H +/* +* Kernel Probes (KProbes) +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* +* Copyright (C) IBM Corporation, 2002, 2004 +* +* See arch/x86/kernel/kprobes.c for x86 kprobes history. +*/ +#include <linux/types.h> +#include <linux/ptrace.h> +#include <linux/percpu.h> + +#define __ARCH_WANT_KPROBES_INSN_SLOT + +struct pt_regs ; +struct kprobe ; + +typedef u8 kprobe_opcode_t ; +#define BREAKPOINT_INSTRUCTION 0xcc +#define RELATIVEJUMP_INSTRUCTION 0xe9 +#define MAX_INSN_SIZE 16 +#define MAX_STACK_SIZE 64 +#define MIN_STACK_SIZE (ADDR ) (((MAX_STACK_SIZE) < \ + (((unsigned long)current_thread_info()) + THREAD_SIZE \ + - (unsigned long)(ADDR))) \ + ? (MAX_STACK_SIZE) \ + : (((unsigned long)current_thread_info()) + THREAD_SIZE \ + - (unsigned long)(ADDR))) + +#define ARCH_SUPPORTS_KRETPROBES +#define flush_insn_slot (p) do { } while (0) + +extern const int kretprobe_blacklist_size; + +void arch_remove_kprobe (struct kprobe *p); +void kretprobe_trampoline (void ); + +/* Architecture specific copy of original instruction*/ +struct arch_specific_insn { +/* copy of the original instruction */ +kprobe_opcode_t *insn; +/* +* boostable = -1: This instruction type is not boostable. +* boostable = 0: This instruction type is boostable. +* boostable = 1: This instruction has been boosted: we have +* added a relative jump after the instruction copy in insn, +* so no single-step and fixup are needed (unless there's +* a post_handler or break_handler). +*/ +int boostable; +}; + +struct prev_kprobe { +struct kprobe *kp; +unsigned long status; +unsigned long old_flags; +unsigned long saved_flags; +}; + +/* per-cpu kprobe control block */ +struct kprobe_ctlblk { +unsigned long kprobe_status; +unsigned long kprobe_old_flags; +unsigned long kprobe_saved_flags; +unsigned long *jprobe_saved_sp; +struct pt_regs jprobe_saved_regs; +kprobe_opcode_t jprobes_stack[MAX_STACK_SIZE ]; +struct prev_kprobe prev_kprobe; +}; + +/* trap3/1 are intr gates for kprobes. So, restore the status of IF, +* if necessary, before executing the original int3/1 (trap) handler. +*/ +static inline void restore_interrupts (struct pt_regs *regs) +{ +if (regs->flags &IF_MASK ) +local_irq_enable (); +} + +extern int kprobe_fault_handler (struct pt_regs *regs,int trapnr); +extern int kprobe_exceptions_notify (struct notifier_block *self, +unsigned long val,void *data); +#endif /* _ASM_KPROBES_H */
include/asm-x86/kprobes_32.h deleted +0 -102
102 lines not on this page · raw message
include/asm-x86/kprobes_64.h deleted +0 -102
102 lines not on this page · raw message
arch/x86/kernel/Makefile_32 +1 -1
@@ -34,7 +34,7 @@ obj-$(CONFIG_KEXEC) += machine_kexec_32 obj-$(CONFIG_CRASH_DUMP) += crash_dump_32.o obj-$(CONFIG_X86_NUMAQ) += numaq_32.o obj-$(CONFIG_X86_SUMMIT_NUMA) += summit_32.o -obj-$(CONFIG_KPROBES) += kprobes_32.o +obj-$(CONFIG_KPROBES) += kprobes.o obj-$(CONFIG_MODULES) += module_32.o obj-$(CONFIG_ACPI_SRAT) += srat_32.o obj-$(CONFIG_EFI) += efi.o efi_32.o efi_stub_32.o
arch/x86/kernel/Makefile_64 +1 -1
@@ -33,7 +33,7 @@ obj-$(CONFIG_EARLY_PRINTK) += early_prin obj-$(CONFIG_GART_IOMMU) += pci-gart_64.o aperture_64.o obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary_64.o tce_64.o obj-$(CONFIG_SWIOTLB) += pci-swiotlb_64.o -obj-$(CONFIG_KPROBES) += kprobes_64.o +obj-$(CONFIG_KPROBES) += kprobes.o obj-$(CONFIG_X86_PM_TIMER) += pmtimer_64.o obj-$(CONFIG_X86_VSMP) += vsmp_64.o obj-$(CONFIG_K8_NB) += k8.o
arch/x86/kernel/kprobes.c new file +1045 -0
1,045 lines not on this page · raw message
arch/x86/kernel/kprobes_32.c deleted +0 -848
848 lines not on this page · raw message
arch/x86/kernel/kprobes_64.c deleted +0 -953
784 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 7 lines
Masami Hiramatsu Software Engineer Hitachi Computer Products (America) Inc. Software Solutions Division e-mail: [email protected], [email protected]
Part of the diff is not shown here. View the raw message.