8a8de66c4f
Currently xol_get_insn_slot() assumes that we should simply copy arch_uprobe->insn[] which is (ignoring arch_uprobe_analyze_insn) just the copy of the original insn. This is not true for arm which needs to create another insn to execute it out-of-line. So this patch simply adds the new member, ->ixol into the union. This doesn't make any difference for x86 and powerpc, but arm can divorce insn/ixol and initialize the correct xol insn in arch_uprobe_analyze_insn(). Signed-off-by: Oleg Nesterov <oleg@redhat.com>
55 lines
1.5 KiB
C
55 lines
1.5 KiB
C
#ifndef _ASM_UPROBES_H
|
|
#define _ASM_UPROBES_H
|
|
/*
|
|
* User-space Probes (UProbes) for x86
|
|
*
|
|
* 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, 2008-2011
|
|
* Authors:
|
|
* Srikar Dronamraju
|
|
* Jim Keniston
|
|
*/
|
|
|
|
#include <linux/notifier.h>
|
|
|
|
typedef u8 uprobe_opcode_t;
|
|
|
|
#define MAX_UINSN_BYTES 16
|
|
#define UPROBE_XOL_SLOT_BYTES 128 /* to keep it cache aligned */
|
|
|
|
#define UPROBE_SWBP_INSN 0xcc
|
|
#define UPROBE_SWBP_INSN_SIZE 1
|
|
|
|
struct arch_uprobe {
|
|
u16 fixups;
|
|
union {
|
|
u8 insn[MAX_UINSN_BYTES];
|
|
u8 ixol[MAX_UINSN_BYTES];
|
|
};
|
|
#ifdef CONFIG_X86_64
|
|
unsigned long rip_rela_target_address;
|
|
#endif
|
|
};
|
|
|
|
struct arch_uprobe_task {
|
|
#ifdef CONFIG_X86_64
|
|
unsigned long saved_scratch_register;
|
|
#endif
|
|
unsigned int saved_trap_nr;
|
|
unsigned int saved_tf;
|
|
};
|
|
|
|
#endif /* _ASM_UPROBES_H */
|