mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-21 04:42:53 +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>
292 lines
7.4 KiB
C
292 lines
7.4 KiB
C
/* GNU/Linux/x86-64 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"
|
|
|
|
/* Defined in auto-generated file amd64-linux.c. */
|
|
void init_registers_amd64_linux (void);
|
|
extern const struct target_desc *tdesc_amd64_linux;
|
|
|
|
/* fast tracepoints collect registers. */
|
|
|
|
#define FT_CR_RIP 0
|
|
#define FT_CR_EFLAGS 1
|
|
#define FT_CR_R8 2
|
|
#define FT_CR_R9 3
|
|
#define FT_CR_R10 4
|
|
#define FT_CR_R11 5
|
|
#define FT_CR_R12 6
|
|
#define FT_CR_R13 7
|
|
#define FT_CR_R14 8
|
|
#define FT_CR_R15 9
|
|
#define FT_CR_RAX 10
|
|
#define FT_CR_RBX 11
|
|
#define FT_CR_RCX 12
|
|
#define FT_CR_RDX 13
|
|
#define FT_CR_RSI 14
|
|
#define FT_CR_RDI 15
|
|
#define FT_CR_RBP 16
|
|
#define FT_CR_RSP 17
|
|
|
|
static const int x86_64_ft_collect_regmap[] = {
|
|
FT_CR_RAX * 8, FT_CR_RBX * 8, FT_CR_RCX * 8, FT_CR_RDX * 8,
|
|
FT_CR_RSI * 8, FT_CR_RDI * 8, FT_CR_RBP * 8, FT_CR_RSP * 8,
|
|
FT_CR_R8 * 8, FT_CR_R9 * 8, FT_CR_R10 * 8, FT_CR_R11 * 8,
|
|
FT_CR_R12 * 8, FT_CR_R13 * 8, FT_CR_R14 * 8, FT_CR_R15 * 8,
|
|
FT_CR_RIP * 8, FT_CR_EFLAGS * 8
|
|
};
|
|
|
|
#define X86_64_NUM_FT_COLLECT_GREGS \
|
|
(sizeof (x86_64_ft_collect_regmap) / sizeof(x86_64_ft_collect_regmap[0]))
|
|
|
|
void
|
|
supply_fast_tracepoint_registers (struct regcache *regcache,
|
|
const unsigned char *buf)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < X86_64_NUM_FT_COLLECT_GREGS; i++)
|
|
supply_register (regcache, i,
|
|
((char *) buf) + x86_64_ft_collect_regmap[i]);
|
|
}
|
|
|
|
ULONGEST
|
|
get_raw_reg (const unsigned char *raw_regs, int regnum)
|
|
{
|
|
if (regnum >= X86_64_NUM_FT_COLLECT_GREGS)
|
|
return 0;
|
|
|
|
return *(ULONGEST *) (raw_regs + x86_64_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 RIP, 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;
|
|
} x86_64_st_collect_regmap[] =
|
|
{
|
|
ST_REGENTRY(rax),
|
|
ST_REGENTRY(rbx),
|
|
ST_REGENTRY(rcx),
|
|
ST_REGENTRY(rdx),
|
|
ST_REGENTRY(rsi),
|
|
ST_REGENTRY(rdi),
|
|
ST_REGENTRY(rbp),
|
|
ST_REGENTRY(rsp),
|
|
ST_REGENTRY(r8),
|
|
ST_REGENTRY(r9),
|
|
ST_REGENTRY(r10),
|
|
ST_REGENTRY(r11),
|
|
ST_REGENTRY(r12),
|
|
ST_REGENTRY(r13),
|
|
ST_REGENTRY(r14),
|
|
ST_REGENTRY(r15),
|
|
{ -1, 0 },
|
|
ST_REGENTRY(rflags),
|
|
ST_REGENTRY(cs),
|
|
ST_REGENTRY(ss),
|
|
};
|
|
|
|
#define X86_64_NUM_ST_COLLECT_GREGS \
|
|
(sizeof (x86_64_st_collect_regmap) / sizeof (x86_64_st_collect_regmap[0]))
|
|
|
|
/* GDB's RIP register number. */
|
|
#define AMD64_RIP_REGNUM 16
|
|
|
|
void
|
|
supply_static_tracepoint_registers (struct regcache *regcache,
|
|
const unsigned char *buf,
|
|
CORE_ADDR pc)
|
|
{
|
|
int i;
|
|
unsigned long newpc = pc;
|
|
|
|
supply_register (regcache, AMD64_RIP_REGNUM, &newpc);
|
|
|
|
for (i = 0; i < X86_64_NUM_ST_COLLECT_GREGS; i++)
|
|
if (x86_64_st_collect_regmap[i].offset != -1)
|
|
{
|
|
switch (x86_64_st_collect_regmap[i].size)
|
|
{
|
|
case 8:
|
|
supply_register (regcache, i,
|
|
((char *) buf)
|
|
+ x86_64_st_collect_regmap[i].offset);
|
|
break;
|
|
case 2:
|
|
{
|
|
unsigned long reg
|
|
= * (short *) (((char *) buf)
|
|
+ x86_64_st_collect_regmap[i].offset);
|
|
reg &= 0xffff;
|
|
supply_register (regcache, i, ®);
|
|
}
|
|
break;
|
|
default:
|
|
internal_error (__FILE__, __LINE__,
|
|
"unhandled register size: %d",
|
|
x86_64_st_collect_regmap[i].size);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
#endif /* HAVE_UST */
|
|
|
|
/* Return target_desc to use for IPA, given the tdesc index passed by
|
|
gdbserver. */
|
|
|
|
const struct target_desc *
|
|
get_ipa_tdesc (int idx)
|
|
{
|
|
#if defined __ILP32__
|
|
switch (idx)
|
|
{
|
|
case X86_TDESC_SSE:
|
|
return tdesc_x32_linux;
|
|
case X86_TDESC_AVX:
|
|
return tdesc_x32_avx_linux;
|
|
case X86_TDESC_AVX512:
|
|
return tdesc_x32_avx512_linux;
|
|
default:
|
|
break;
|
|
}
|
|
#else
|
|
switch (idx)
|
|
{
|
|
case X86_TDESC_SSE:
|
|
return tdesc_amd64_linux;
|
|
case X86_TDESC_AVX:
|
|
return tdesc_amd64_avx_linux;
|
|
case X86_TDESC_MPX:
|
|
return tdesc_amd64_mpx_linux;
|
|
case X86_TDESC_AVX_MPX:
|
|
return tdesc_amd64_avx_mpx_linux;
|
|
case X86_TDESC_AVX_MPX_AVX512_PKU:
|
|
return tdesc_amd64_avx_mpx_avx512_pku_linux;
|
|
case X86_TDESC_AVX_AVX512:
|
|
return tdesc_amd64_avx_avx512_linux;
|
|
default:
|
|
internal_error (__FILE__, __LINE__,
|
|
"unknown ipa tdesc index: %d", idx);
|
|
return tdesc_amd64_linux;
|
|
}
|
|
#endif
|
|
|
|
internal_error (__FILE__, __LINE__,
|
|
"unknown ipa tdesc index: %d", idx);
|
|
}
|
|
|
|
/* Allocate buffer for the jump pads. The branch instruction has a
|
|
reach of +/- 31-bit, and the executable is loaded at low addresses.
|
|
|
|
64-bit: Use MAP_32BIT to allocate in the first 2GB. Shared
|
|
libraries, being allocated at the top, are unfortunately out of
|
|
luck.
|
|
|
|
x32: Since MAP_32BIT is 64-bit only, do the placement manually.
|
|
Try allocating at '0x80000000 - SIZE' initially, decreasing until
|
|
we hit a free area. This ensures the executable is fully covered,
|
|
and is as close as possible to the shared libraries, which are
|
|
usually mapped at the top of the first 4GB of the address space.
|
|
*/
|
|
|
|
void *
|
|
alloc_jump_pad_buffer (size_t size)
|
|
{
|
|
#if __ILP32__
|
|
uintptr_t addr;
|
|
int pagesize;
|
|
|
|
pagesize = sysconf (_SC_PAGE_SIZE);
|
|
if (pagesize == -1)
|
|
perror_with_name ("sysconf");
|
|
|
|
addr = 0x80000000 - size;
|
|
|
|
/* size should already be page-aligned, but this can't hurt. */
|
|
addr &= ~(pagesize - 1);
|
|
|
|
/* Search for a free area. If we hit 0, we're out of luck. */
|
|
for (; addr; addr -= pagesize)
|
|
{
|
|
void *res;
|
|
|
|
/* No MAP_FIXED - we don't want to zap someone's mapping. */
|
|
res = mmap ((void *) addr, size,
|
|
PROT_READ | PROT_WRITE | PROT_EXEC,
|
|
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
|
|
|
|
/* If we got what we wanted, return. */
|
|
if ((uintptr_t) res == addr)
|
|
return res;
|
|
|
|
/* If we got a mapping, but at a wrong address, undo it. */
|
|
if (res != MAP_FAILED)
|
|
munmap (res, size);
|
|
}
|
|
|
|
return NULL;
|
|
#else
|
|
void *res = mmap (NULL, size, PROT_READ | PROT_WRITE | PROT_EXEC,
|
|
MAP_PRIVATE | MAP_ANONYMOUS | MAP_32BIT, -1, 0);
|
|
|
|
if (res == MAP_FAILED)
|
|
return NULL;
|
|
|
|
return res;
|
|
#endif
|
|
}
|
|
|
|
void
|
|
initialize_low_tracepoint (void)
|
|
{
|
|
#if defined __ILP32__
|
|
init_registers_x32_linux ();
|
|
init_registers_x32_avx_linux ();
|
|
init_registers_x32_avx512_linux ();
|
|
#else
|
|
init_registers_amd64_linux ();
|
|
init_registers_amd64_avx_linux ();
|
|
init_registers_amd64_mpx_linux ();
|
|
init_registers_amd64_avx_mpx_linux ();
|
|
init_registers_amd64_avx_avx512_linux ();
|
|
init_registers_amd64_avx_mpx_avx512_pku_linux ();
|
|
#endif
|
|
}
|