mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-24 10:35:12 +08:00
51547df62c
This patch adds support for the registers added by the Memory Protection Keys for Userspace (PKU aka PKEYs) feature. Native and remote debugging are covered by this patch. The XSAVE area is extended with a new state containing the 32-bit wide PKRU register. The new register is added to amd64-avx-mpx_avx512-* tdesc, thus it is renamed accordingly. Also, respective xstate mask X86_XSTATE_AVX_MPX_AVX512_MASK is renamed to X86_XSTATE_AVX_MPX_AVX512_PKU_MASK to reflect the new feature set it supports. For more information, please refer to the Intel(R) 64 and IA-32 Architectures Software Developer's Manual - Septemper 2015 http://www.intel.com/content/dam/www/public/us/en/documents/ manuals/64-ia-32-architectures-software-developer-manual-325462.pdf gdb/Changelog: 2015-12-08 Michael Sturm <michael.sturm@intel.com> * NEWS: Mention addition of PKU feature. * amd64-linux-nat.c (amd64_linux_gregset32_reg_offset): Add PKRU register. * amd64-linux-tdep.c (features/i386/amd64-avx-mpx-avx512-linux.c): Rename to... (features/i386/amd64-avx-mpx-avx512-pku-linux.c): ...this. (amd64_linux_gregset_reg_offset): Add PKRU register. (amd64_linux_core_read_description): Rename X86_XSTATE_AVX_MPX_AVX512_MASK, rename tdesc_amd64_avx_mpx_avx512_pku_linux. (_initialize_amd64_linux_tdep): Rename initialize_tdesc_amd64_avx_mpx_avx512_linux. * amd64-linux-tdep.h (AMD64_LINUX_ORIG_RAX_REGNUM): Adjust regnum calculation. (tdesc_amd64_avx_mpx_avx512_linux): Rename to... (tdesc_amd64_avx_mpx_avx512_pku_linux): ...this. * amd64-tdep.c (features/i386/amd64-avx-mpx-avx512-pku.c): Rename to... (features/i386/amd64-avx-mpx-avx512-pku.c): ...this. (amd64_pkeys_names): New register name for raw register PKRU. (amd64_init_abi): Add code to initialize PKRU tdep variables if feature is present. (amd64_target_description): Rename X86_XSTATE_AVX_MPX_AVX512_MASK, rename tdesc_amd64_avx_mpx_avx512. (_initialize_amd64_tdep): Rename initialize_tdesc_amd64_avx_mpx_avx512. * amd64-tdep.h (enum amd64_regnum): Add PKRU register. (AMD64_NUM_REGS): Adjust regnum calculation. * i386-linux.nat.c (GETXSTATEREGS_SUPPLIES): Extend range of registers supplied via XSTATE by PKRU register. * common/x86-xstate.h (X86_XSTATE_PKRU): New macro. (X86_XSTATE_AVX_MPX_AVX512_MASK): Add PKRU and renamed mask. (X86_XSTATE_ALL_MASK): Rename X86_XSTATE_AVX_MPX_AVX512_MASK. (X86_XSTATE_PKRU_SIZE): New macro. (X86_XSTATE_MAX_SIZE): Adjust size. (HAS_PKRU(XCR0)): New macro. (X86_XSTATE_SIZE): Add checkfor PKRU. * features/Makefile (WHICH): Rename i386/i386-avx-mpx-avx512, i386/i386-avx-mpx-avx512-linux, i386/amd64-avx-mpx-avx512, i386/amd64-avx-mpx-avx512-linux. (i386/i386-avx-mpx-avx512-expedite): Rename expedite. (i386/i386-avx-mpx-avx512-linux-expedite): Likewise. (i386/amd64-avx-mpx-avx512-expedite): Likewise. (i386/amd64-avx-mpx-avx512-linux-expedite): Likewise. (XMLTOC): Rename i386/amd64-avx-mpx-avx512-linux.xml, i386/amd64-avx-mpx-avx512.xml, i386/i386-avx-mpx-avx512-linux.xml, i386/i386-avx-mpx-avx512.xml. ((outdir)/i386/i386-avx-mpx-avx512.dat): Rename rule, add i386/32bit-pkeys.xml. ((outdir)/i386/i386-avx-mpx-avx512-pku-linux.dat): Likewise. ((outdir)/i386/amd64-avx-mpx-avx512.dat): Rename rule, add i386/64bit-pkeys.xml. ((outdir)/i386/amd64-avx-mpx-avx512-linux.dat): Likewise. * features/i386/32bit-pkeys.xml: New file. * features/i386/64bit-pkeys.xml: Likewise. * features/i386/amd64-avx-mpx-avx512-linux-pku.c: Regenerate from renamed XML file. * features/i386/amd64-avx-mpx-avx512-linux.xml: Rename to amd64-avx-mpx-avx512-pku-linux.xml, add 64bit-pkeys.xml * features/i386/amd64-avx-mpx-avx512.c: Regenerate from renamed XML file. * features/i386/amd64-avx-mpx-avx512.xml: Rename to amd64-avx-mpx-avx512-pku.xml, add 64bit-pkeys.xml. * features/i386/i386-avx-mpx-avx512-linux.c: Regenerate from renamed XML file. * features/i386/i386-avx-mpx-avx512-linux.xml: Rename to i386-avx-mpx-avx512-pku-linux.xml, add 32bit-pkeys.xml. * features/i386/i386-avx-mpx-avx512.c: Regenerate from renamed XML file. * features/i386/i386-avx-mpx-avx512.xml: Rename to i386-avx-mpx-avx512-pku.xml, add 32bit-pkeys.xml. * i386-linux-nat.c (GETXSTATEREGS_SUPPLIES): Change to use I386_PKEYS_NUM_REGS. * i386-linux-tdep.c (features/i386/i386-avx-mpx-avx512-linux.c): Rename include. (i386_linux_gregset_reg_offset): Add PKRU register. (i386_linux_core_read_description): Rename xstate mask and returned tdesc for X86_XSTATE_AVX_MPX_AVX512_PKU_MASK. (_initialize_i386_linux_tdep): Rename initialize_tdesc_i386_avx_mpx_avx512_linux. * i386-linux-tdep.h (I386_LINUX_ORIG_EAX_REGNUM): Adjuste regnum calculation. (tdesc_i386_avx_mpx_avx512_linux): Rename prototype. (/* Format of XSAVE...): Add pkru register. * i386-tdep.c (i386-avx-mpx-avx512.c): Rename include. (i386_pkeys_names): New register name for raw register PKRU. (i386_pkru_regnum_p): Add function to look up register number of PKRU raw register. (i386_register_reggroup_p): Add code to exclude PKRU from general register group. (i386_validate_tdesc_p): Add code to handle PKRU feature, add PKRU registers if feature is present in xcr0. (i386_gdbarch_init): Adjust number of registers in architecture. Add code to initialize PKRU feature variables in tdep structure. (i386_target_description): Rename xstate mask and returned tdesc for X86_XSTATE_AVX_MPX_AVX512_PKU_MASK. (_initialize_i386_tdep): Rename initialize_tdesc_i386_avx_mpx_avx512. * i386-tdep.h (struct gdbarch_tdep): Add feature variables to tdep structure. (enum i386_regnum): Add PKRU register. (I386_PKEYS_NUM_REGS): New define for number of registers in PKRU feature. (i386_pkru_regnum_p): New prototype. * i387-tdep.c (xsave_pkeys_offset): New table for PKRU offsets in XSAVE buffer. (XSAVE_PKEYS_ADDR): New macro. (i387_supply_xsave): Add code to handle PKRU register. (i387_collect_xsave): Likewise. * i387-tdep.h (I387_NUM_PKEYS_REGS): New define for number of registers in PKRU feature. (I387_PKRU_REGNUM): New macro. (I387_PKEYSEND_REGNUM): Likewise. * regformats/i386/amd64_avx_mpx_avx512_pku_linux.dat: Regenerate from renamed XML file. * regformats/i386/amd64_avx_mpx_avx512_pku.dat: Likewise. * regformats/i386/i386/amd64-avx-mpx-avx512-pku.dat: Likewise. * regformats/i386/i386_avx_mpx_avx512_pku_linux.dat: Likewise. testsuite/Changelog: 2016-04-18 Michael Sturm <michael.sturm@intel.com> * gdb.arch/i386-pkru.c: New file. * gdb.arch/i386-pkru.exp: Likewise. gdbserver/Changelog: 2016-04-18 Michael Sturm <michael.sturm@intel.com> * Makefile.in (clean): Rename i386-avx-mpx-avx512.c, i386-avx-mpx-avx512-linux.c, amd64-avx-mpx-avx512.c, amd64-avx-mpx-avx512-linux.c. (i386-avx-mpx-avx512-linux-ipa.o:): Rename rule and source file. (amd64-avx-mpx-avx512-linux-ipa.o:): Likewise. (i386-avx-mpx-avx512.c :): Rename rule, source files and dat files. (i386-avx-mpx-avx512-linux.c :): Likewise. (amd64-avx-mpx-avx512.c :): Likewise. (amd64-avx-mpx-avx512-linux.c :): Likewise. * configure.srv (srv_i386_regobj): Rename i386-avx-mpx-avx512.o. (srv_i386_linux_regobj): Rename i386-avx-mpx-avx512-linux.o. (srv_amd64_regobj): Rename amd64-avx-mpx-avx512.o. (srv_amd64_linux_regobj): Rename amd64-avx-mpx-avx512-linux.o. (ipa_i386_linux_regobj): Rename i386-avx-mpx-avx512-linux-ipa.o. (ipa_amd64_linux_regobj): Rename amd64-avx-mpx-avx512-pku-linux-ipa.o. (srv_i386_32bit_xmlfiles): Add 32bit-pkeys.xml. (srv_i386_64bit_xmlfiles): Add 64bit-pkeys.xml. (srv_i386_xmlfiles): Rename i386/i386-avx-mpx-avx512.xml. (srv_amd64_xmlfiles): Rename i386/amd64-avx-mpx-avx512.xml. (srv_i386_linux_xmlfiles): Rename i386/i386-avx-mpx-avx512-linux.xml. (srv_amd64_linux_xmlfiles): Rename di386/amd64-avx-mpx-avx512-linux.xml. * i387-fp.c (num_pkeys_registers): New variable. (struct i387_xsave): Add space for pkru values. (i387_cache_to_fsave): Add code to handle PKRU register. (i387_xsave_to_cache): Likewise. * linux-amd64-ipa.c (get_ipa_tdesc): Rename tdesc_amd64_avx_mpx_avx512_linux. (initialize_low_tracepoint): Rename init_registers_amd64_avx_mpx_avx512_linux. * linux-i386-ipa.c (get_ipa_desc): Rename tdesc_i386_avx_mpx_avx512_linux. (initialize_low_tracepoint): Rename init_registers_i386_avx_mpx_avx512_linux. * linux-x86-low.c (x86_64_regmap[]): Add PKRU register. (x86_linux_read_description): Rename X86_XSTATE_AVX_MPX_AVX512_MASK, rename tdesc_amd64_avx_mpx_avx512_linux, rename tdesc_i386_avx_mpx_avx512_linux. (x86_get_ipa_tdesc_idx): Rename tdesc_amd64_avx_mpx_avx512_linux, rename tdesc_i386_avx_mpx_avx512_linux. (initialize_low_arch): Rename init_registers_amd64_avx_mpx_avx512_linux, rename init_registers_i386_avx_mpx_avx512_linux. * linux-x86-tdesc.h (init_registers_amd64_avx_mpx_avx512_linux): Renamed prototype. (tdesc_amd64_avx_mpx_avx512_linux): Likewise. (init_registers_i386_avx_mpx_avx512_linux): Likewise. (tdesc_i386_avx_mpx_avx512_linux): Likewise. doc/Changelog: 2016-04-18 Michael Sturm <michael.sturm@intel.com> * gdb.texinfo (i386 Features): Add description of PKRU register. Change-Id: If75ce5aba7dfd33fdbe3d8b47f04ef3f550c52be Signed-off-by: Michael Sturm <michael.sturm@intel.com>
303 lines
7.8 KiB
C
303 lines
7.8 KiB
C
/* GNU/Linux/x86 specific low level interface, for the in-process
|
|
agent library for GDB.
|
|
|
|
Copyright (C) 2010-2017 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
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 3 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, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "server.h"
|
|
#include <sys/mman.h>
|
|
#include "tracepoint.h"
|
|
#include "linux-x86-tdesc.h"
|
|
|
|
/* GDB register numbers. */
|
|
|
|
enum i386_gdb_regnum
|
|
{
|
|
I386_EAX_REGNUM, /* %eax */
|
|
I386_ECX_REGNUM, /* %ecx */
|
|
I386_EDX_REGNUM, /* %edx */
|
|
I386_EBX_REGNUM, /* %ebx */
|
|
I386_ESP_REGNUM, /* %esp */
|
|
I386_EBP_REGNUM, /* %ebp */
|
|
I386_ESI_REGNUM, /* %esi */
|
|
I386_EDI_REGNUM, /* %edi */
|
|
I386_EIP_REGNUM, /* %eip */
|
|
I386_EFLAGS_REGNUM, /* %eflags */
|
|
I386_CS_REGNUM, /* %cs */
|
|
I386_SS_REGNUM, /* %ss */
|
|
I386_DS_REGNUM, /* %ds */
|
|
I386_ES_REGNUM, /* %es */
|
|
I386_FS_REGNUM, /* %fs */
|
|
I386_GS_REGNUM, /* %gs */
|
|
I386_ST0_REGNUM /* %st(0) */
|
|
};
|
|
|
|
#define i386_num_regs 16
|
|
|
|
#define FT_CR_EAX 15
|
|
#define FT_CR_ECX 14
|
|
#define FT_CR_EDX 13
|
|
#define FT_CR_EBX 12
|
|
#define FT_CR_UESP 11
|
|
#define FT_CR_EBP 10
|
|
#define FT_CR_ESI 9
|
|
#define FT_CR_EDI 8
|
|
#define FT_CR_EIP 7
|
|
#define FT_CR_EFL 6
|
|
#define FT_CR_DS 5
|
|
#define FT_CR_ES 4
|
|
#define FT_CR_FS 3
|
|
#define FT_CR_GS 2
|
|
#define FT_CR_SS 1
|
|
#define FT_CR_CS 0
|
|
|
|
/* Mapping between the general-purpose registers in jump tracepoint
|
|
format and GDB's register array layout. */
|
|
|
|
static const int i386_ft_collect_regmap[] =
|
|
{
|
|
FT_CR_EAX * 4, FT_CR_ECX * 4, FT_CR_EDX * 4, FT_CR_EBX * 4,
|
|
FT_CR_UESP * 4, FT_CR_EBP * 4, FT_CR_ESI * 4, FT_CR_EDI * 4,
|
|
FT_CR_EIP * 4, FT_CR_EFL * 4, FT_CR_CS * 4, FT_CR_SS * 4,
|
|
FT_CR_DS * 4, FT_CR_ES * 4, FT_CR_FS * 4, FT_CR_GS * 4
|
|
};
|
|
|
|
void
|
|
supply_fast_tracepoint_registers (struct regcache *regcache,
|
|
const unsigned char *buf)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < i386_num_regs; i++)
|
|
{
|
|
int regval;
|
|
|
|
if (i >= I386_CS_REGNUM && i <= I386_GS_REGNUM)
|
|
regval = *(short *) (((char *) buf) + i386_ft_collect_regmap[i]);
|
|
else
|
|
regval = *(int *) (((char *) buf) + i386_ft_collect_regmap[i]);
|
|
|
|
supply_register (regcache, i, ®val);
|
|
}
|
|
}
|
|
|
|
ULONGEST
|
|
get_raw_reg (const unsigned char *raw_regs, int regnum)
|
|
{
|
|
/* This should maybe be allowed to return an error code, or perhaps
|
|
better, have the emit_reg detect this, and emit a constant zero,
|
|
or something. */
|
|
|
|
if (regnum > i386_num_regs)
|
|
return 0;
|
|
else if (regnum >= I386_CS_REGNUM && regnum <= I386_GS_REGNUM)
|
|
return *(short *) (raw_regs + i386_ft_collect_regmap[regnum]);
|
|
else
|
|
return *(int *) (raw_regs + i386_ft_collect_regmap[regnum]);
|
|
}
|
|
|
|
#ifdef HAVE_UST
|
|
|
|
#include <ust/processor.h>
|
|
|
|
/* "struct registers" is the UST object type holding the registers at
|
|
the time of the static tracepoint marker call. This doesn't
|
|
contain EIP, but we know what it must have been (the marker
|
|
address). */
|
|
|
|
#define ST_REGENTRY(REG) \
|
|
{ \
|
|
offsetof (struct registers, REG), \
|
|
sizeof (((struct registers *) NULL)->REG) \
|
|
}
|
|
|
|
static struct
|
|
{
|
|
int offset;
|
|
int size;
|
|
} i386_st_collect_regmap[] =
|
|
{
|
|
ST_REGENTRY(eax),
|
|
ST_REGENTRY(ecx),
|
|
ST_REGENTRY(edx),
|
|
ST_REGENTRY(ebx),
|
|
ST_REGENTRY(esp),
|
|
ST_REGENTRY(ebp),
|
|
ST_REGENTRY(esi),
|
|
ST_REGENTRY(edi),
|
|
{ -1, 0 }, /* eip */
|
|
ST_REGENTRY(eflags),
|
|
ST_REGENTRY(cs),
|
|
ST_REGENTRY(ss),
|
|
};
|
|
|
|
#define i386_NUM_ST_COLLECT_GREGS \
|
|
(sizeof (i386_st_collect_regmap) / sizeof (i386_st_collect_regmap[0]))
|
|
|
|
void
|
|
supply_static_tracepoint_registers (struct regcache *regcache,
|
|
const unsigned char *buf,
|
|
CORE_ADDR pc)
|
|
{
|
|
int i;
|
|
unsigned int newpc = pc;
|
|
|
|
supply_register (regcache, I386_EIP_REGNUM, &newpc);
|
|
|
|
for (i = 0; i < i386_NUM_ST_COLLECT_GREGS; i++)
|
|
if (i386_st_collect_regmap[i].offset != -1)
|
|
{
|
|
switch (i386_st_collect_regmap[i].size)
|
|
{
|
|
case 4:
|
|
supply_register (regcache, i,
|
|
((char *) buf)
|
|
+ i386_st_collect_regmap[i].offset);
|
|
break;
|
|
case 2:
|
|
{
|
|
unsigned long reg
|
|
= * (short *) (((char *) buf)
|
|
+ i386_st_collect_regmap[i].offset);
|
|
reg &= 0xffff;
|
|
supply_register (regcache, i, ®);
|
|
}
|
|
break;
|
|
default:
|
|
internal_error (__FILE__, __LINE__, "unhandled register size: %d",
|
|
i386_st_collect_regmap[i].size);
|
|
}
|
|
}
|
|
}
|
|
|
|
#endif /* HAVE_UST */
|
|
|
|
|
|
/* This is only needed because reg-i386-linux-lib.o references it. We
|
|
may use it proper at some point. */
|
|
const char *gdbserver_xmltarget;
|
|
|
|
/* Attempt to allocate memory for trampolines in the first 64 KiB of
|
|
memory to enable smaller jump patches. */
|
|
|
|
static void
|
|
initialize_fast_tracepoint_trampoline_buffer (void)
|
|
{
|
|
const CORE_ADDR buffer_end = 64 * 1024;
|
|
/* Ensure that the buffer will be at least 1 KiB in size, which is
|
|
enough space for over 200 fast tracepoints. */
|
|
const int min_buffer_size = 1024;
|
|
char buf[IPA_BUFSIZ];
|
|
CORE_ADDR mmap_min_addr = buffer_end + 1;
|
|
ULONGEST buffer_size;
|
|
FILE *f = fopen ("/proc/sys/vm/mmap_min_addr", "r");
|
|
|
|
if (!f)
|
|
{
|
|
snprintf (buf, sizeof (buf), "mmap_min_addr open failed: %s",
|
|
strerror (errno));
|
|
set_trampoline_buffer_space (0, 0, buf);
|
|
return;
|
|
}
|
|
|
|
if (fgets (buf, IPA_BUFSIZ, f))
|
|
sscanf (buf, "%llu", &mmap_min_addr);
|
|
|
|
fclose (f);
|
|
|
|
buffer_size = buffer_end - mmap_min_addr;
|
|
|
|
if (buffer_size >= min_buffer_size)
|
|
{
|
|
if (mmap ((void *) (uintptr_t) mmap_min_addr, buffer_size,
|
|
PROT_READ | PROT_EXEC | PROT_WRITE,
|
|
MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS,
|
|
-1, 0)
|
|
!= MAP_FAILED)
|
|
set_trampoline_buffer_space (mmap_min_addr, buffer_end, NULL);
|
|
else
|
|
{
|
|
snprintf (buf, IPA_BUFSIZ, "low-64K-buffer mmap() failed: %s",
|
|
strerror (errno));
|
|
set_trampoline_buffer_space (0, 0, buf);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
snprintf (buf, IPA_BUFSIZ, "mmap_min_addr is %d, must be %d or less",
|
|
(int) mmap_min_addr, (int) buffer_end - min_buffer_size);
|
|
set_trampoline_buffer_space (0, 0, buf);
|
|
}
|
|
}
|
|
|
|
/* Return target_desc to use for IPA, given the tdesc index passed by
|
|
gdbserver. */
|
|
|
|
const struct target_desc *
|
|
get_ipa_tdesc (int idx)
|
|
{
|
|
switch (idx)
|
|
{
|
|
case X86_TDESC_MMX:
|
|
return tdesc_i386_mmx_linux;
|
|
case X86_TDESC_SSE:
|
|
return tdesc_i386_linux;
|
|
case X86_TDESC_AVX:
|
|
return tdesc_i386_avx_linux;
|
|
case X86_TDESC_MPX:
|
|
return tdesc_i386_mpx_linux;
|
|
case X86_TDESC_AVX_MPX:
|
|
return tdesc_i386_avx_mpx_linux;
|
|
case X86_TDESC_AVX_AVX512:
|
|
return tdesc_i386_avx_avx512_linux;
|
|
case X86_TDESC_AVX_MPX_AVX512_PKU:
|
|
return tdesc_i386_avx_mpx_avx512_pku_linux;
|
|
default:
|
|
internal_error (__FILE__, __LINE__,
|
|
"unknown ipa tdesc index: %d", idx);
|
|
return tdesc_i386_linux;
|
|
}
|
|
}
|
|
|
|
/* Allocate buffer for the jump pads. On i386, we can reach an arbitrary
|
|
address with a jump instruction, so just allocate normally. */
|
|
|
|
void *
|
|
alloc_jump_pad_buffer (size_t size)
|
|
{
|
|
void *res = mmap (NULL, size, PROT_READ | PROT_WRITE | PROT_EXEC,
|
|
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
|
|
|
|
if (res == MAP_FAILED)
|
|
return NULL;
|
|
|
|
return res;
|
|
}
|
|
|
|
void
|
|
initialize_low_tracepoint (void)
|
|
{
|
|
init_registers_i386_mmx_linux ();
|
|
init_registers_i386_linux ();
|
|
init_registers_i386_avx_linux ();
|
|
init_registers_i386_mpx_linux ();
|
|
init_registers_i386_avx_avx512_linux ();
|
|
init_registers_i386_avx_mpx_avx512_pku_linux ();
|
|
|
|
initialize_fast_tracepoint_trampoline_buffer ();
|
|
}
|