Commit 7118e7e6 authored by Ananth N Mavinakayanahalli's avatar Ananth N Mavinakayanahalli Committed by Benjamin Herrenschmidt
Browse files

powerpc: Consolidate {k,u}probe definitions 



Move is_trap() and relatives to a common file to be shared between kprobes
and uprobes.

Code movement only; no change in functionality.

Suggested by Michael Ellerman.

Signed-off-by: default avatarAnanth N Mavinakayanahalli <ananth@in.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent d3dbeef6

arch/powerpc/include/asm/kprobes.h

+2 −13
Original line number Diff line number Diff line
@@ -29,21 +29,16 @@ 
#include <linux/types.h>

#include <linux/ptrace.h>

#include <linux/percpu.h>

#include <asm/probes.h>



#define  __ARCH_WANT_KPROBES_INSN_SLOT



struct pt_regs;

struct kprobe;



typedef unsigned int kprobe_opcode_t;

#define BREAKPOINT_INSTRUCTION	0x7fe00008	/* trap */

typedef opcode_t kprobe_opcode_t;

#define MAX_INSN_SIZE 1



#define IS_TW(instr)		(((instr) & 0xfc0007fe) == 0x7c000008)

#define IS_TD(instr)		(((instr) & 0xfc0007fe) == 0x7c000088)

#define IS_TDI(instr)		(((instr) & 0xfc000000) == 0x08000000)

#define IS_TWI(instr)		(((instr) & 0xfc000000) == 0x0c000000)



#ifdef CONFIG_PPC64

/*

 * 64bit powerpc uses function descriptors.
@@ -72,12 +67,6 @@ typedef unsigned int kprobe_opcode_t; 
		addr = (kprobe_opcode_t *)kallsyms_lookup_name(dot_name); \

	}								\

}



#define is_trap(instr)	(IS_TW(instr) || IS_TD(instr) || \

			IS_TWI(instr) || IS_TDI(instr))

#else

/* Use stock kprobe_lookup_name since ppc32 doesn't use function descriptors */

#define is_trap(instr)	(IS_TW(instr) || IS_TWI(instr))

#endif



#define flush_insn_slot(p)	do { } while (0)

arch/powerpc/include/asm/probes.h

0 → 100644
+42 −0
Original line number Diff line number Diff line 
#ifndef _ASM_POWERPC_PROBES_H

#define _ASM_POWERPC_PROBES_H

#ifdef __KERNEL__

/*

 * Definitions common to probes files

 *

 * 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 IBM Corporation, 2012

 */

#include <linux/types.h>



typedef u32 opcode_t;

#define BREAKPOINT_INSTRUCTION	0x7fe00008	/* trap */



/* Trap definitions per ISA */

#define IS_TW(instr)		(((instr) & 0xfc0007fe) == 0x7c000008)

#define IS_TD(instr)		(((instr) & 0xfc0007fe) == 0x7c000088)

#define IS_TDI(instr)		(((instr) & 0xfc000000) == 0x08000000)

#define IS_TWI(instr)		(((instr) & 0xfc000000) == 0x0c000000)



#ifdef CONFIG_PPC64

#define is_trap(instr)		(IS_TW(instr) || IS_TD(instr) || \

				IS_TWI(instr) || IS_TDI(instr))

#else

#define is_trap(instr)		(IS_TW(instr) || IS_TWI(instr))

#endif /* CONFIG_PPC64 */



#endif /* __KERNEL__ */

#endif	/* _ASM_POWERPC_PROBES_H */