mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-24 10:35:12 +08:00
cf141dd8cc
This commit aims to address a problem that exists with the current approach to displaced stepping, and was identified in PR gdb/22921. Displaced stepping is currently supported on AArch64, ARM, amd64, i386, rs6000 (ppc), and s390. Of these, I believe there is a problem with the current approach which will impact amd64 and ARM, and can lead to random register corruption when the inferior makes use of asynchronous signals and GDB is using displaced stepping. The problem can be found in displaced_step_buffers::finish in displaced-stepping.c, and is this; after GDB tries to perform a displaced step, and the inferior stops, GDB classifies the stop into one of two states, either the displaced step succeeded, or the displaced step failed. If the displaced step succeeded then gdbarch_displaced_step_fixup is called, which has the job of fixing up the state of the current inferior as if the step had not been performed in a displaced manner. This all seems just fine. However, if the displaced step is considered to have not completed then GDB doesn't call gdbarch_displaced_step_fixup, instead GDB remains in displaced_step_buffers::finish and just performs a minimal fixup which involves adjusting the program counter back to its original value. The problem here is that for amd64 and ARM setting up for a displaced step can involve changing the values in some temporary registers. If the displaced step succeeds then this is fine; after the step the temporary registers are restored to their original values in the architecture specific code. But if the displaced step does not succeed then the temporary registers are never restored, and they retain their modified values. In this context a temporary register is simply any register that is not otherwise used by the instruction being stepped that the architecture specific code considers safe to borrow for the lifetime of the instruction being stepped. In the bug PR gdb/22921, the amd64 instruction being stepped is an rip-relative instruction like this: jmp *0x2fe2(%rip) When we displaced step this instruction we borrow a register, and modify the instruction to something like: jmp *0x2fe2(%rcx) with %rcx having its value adjusted to contain the original %rip value. Now if the displaced step does not succeed, then %rcx will be left with a corrupted value. Obviously corrupting any register is bad; in the bug report this problem was spotted because %rcx is used as a function argument register. And finally, why might a displaced step not succeed? Asynchronous signals provides one reason. GDB sets up for the displaced step and, at that precise moment, the OS delivers a signal (SIGALRM in the bug report), the signal stops the inferior at the address of the displaced instruction. GDB cancels the displaced instruction, handles the signal, and then tries again with the displaced step. But it is that first cancellation of the displaced step that causes the problem; in that case GDB (correctly) sees the displaced step as having not completed, and so does not perform the architecture specific fixup, leaving the register corrupted. The reason why I think AArch64, rs600, i386, and s390 are not effected by this problem is that I don't believe these architectures make use of any temporary registers, so when a displaced step is not completed successfully, the minimal fix up is sufficient. On amd64 we use at most one temporary register. On ARM, looking at arm_displaced_step_copy_insn_closure, we could modify up to 16 temporary registers, and the instruction being displaced stepped could be expanded to multiple replacement instructions, which increases the chances of this bug triggering. This commit only aims to address the issue on amd64 for now, though I believe that the approach I'm proposing here might be applicable for ARM too. What I propose is that we always call gdbarch_displaced_step_fixup. We will now pass an extra argument to gdbarch_displaced_step_fixup, this a boolean that indicates whether GDB thinks the displaced step completed successfully or not. When this flag is false this indicates that the displaced step halted for some "other" reason. On ARM GDB can potentially read the inferior's program counter in order figure out how far through the sequence of replacement instructions we got, and from that GDB can figure out what fixup needs to be performed. On targets like amd64 the problem is slightly easier as displaced stepping only uses a single replacement instruction. If the displaced step didn't complete the GDB knows that the single instruction didn't execute. The point is that by always calling gdbarch_displaced_step_fixup, each architecture can now ensure that the inferior state is fixed up correctly in all cases, not just the success case. On amd64 this ensures that we always restore the temporary register value, and so bug PR gdb/22921 is resolved. In order to move all architectures to this new API, I have moved the minimal roll-back version of the code inside the architecture specific fixup functions for AArch64, rs600, s390, and ARM. For all of these except ARM I think this is good enough, as no temporaries are used all that's needed is the program counter restore anyway. For ARM the minimal code is no worse than what we had before, though I do consider this architecture's displaced-stepping broken. I've updated the gdb.arch/amd64-disp-step.exp test to cover the 'jmpq*' instruction that was causing problems in the original bug, and also added support for testing the displaced step in the presence of asynchronous signal delivery. I've also added two new tests (for amd64 and i386) that check that GDB can correctly handle displaced stepping over a single instruction that branches to itself. I added these tests after a first version of this patch relied too much on checking the program-counter value in order to see if the displaced instruction had executed. This works fine in almost all cases, but when an instruction branches to itself a pure program counter check is not sufficient. The new tests expose this problem. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=22921 Approved-By: Pedro Alves <pedro@palves.net>
148 lines
5.0 KiB
C++
148 lines
5.0 KiB
C++
/* Target-dependent definitions for AMD64.
|
||
|
||
Copyright (C) 2001-2023 Free Software Foundation, Inc.
|
||
Contributed by Jiri Smid, SuSE Labs.
|
||
|
||
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/>. */
|
||
|
||
#ifndef AMD64_TDEP_H
|
||
#define AMD64_TDEP_H
|
||
|
||
struct gdbarch;
|
||
class frame_info_ptr;
|
||
struct regcache;
|
||
|
||
#include "i386-tdep.h"
|
||
#include "infrun.h"
|
||
|
||
/* Register numbers of various important registers. */
|
||
|
||
enum amd64_regnum
|
||
{
|
||
AMD64_RAX_REGNUM, /* %rax */
|
||
AMD64_RBX_REGNUM, /* %rbx */
|
||
AMD64_RCX_REGNUM, /* %rcx */
|
||
AMD64_RDX_REGNUM, /* %rdx */
|
||
AMD64_RSI_REGNUM, /* %rsi */
|
||
AMD64_RDI_REGNUM, /* %rdi */
|
||
AMD64_RBP_REGNUM, /* %rbp */
|
||
AMD64_RSP_REGNUM, /* %rsp */
|
||
AMD64_R8_REGNUM, /* %r8 */
|
||
AMD64_R9_REGNUM, /* %r9 */
|
||
AMD64_R10_REGNUM, /* %r10 */
|
||
AMD64_R11_REGNUM, /* %r11 */
|
||
AMD64_R12_REGNUM, /* %r12 */
|
||
AMD64_R13_REGNUM, /* %r13 */
|
||
AMD64_R14_REGNUM, /* %r14 */
|
||
AMD64_R15_REGNUM, /* %r15 */
|
||
AMD64_RIP_REGNUM, /* %rip */
|
||
AMD64_EFLAGS_REGNUM, /* %eflags */
|
||
AMD64_CS_REGNUM, /* %cs */
|
||
AMD64_SS_REGNUM, /* %ss */
|
||
AMD64_DS_REGNUM, /* %ds */
|
||
AMD64_ES_REGNUM, /* %es */
|
||
AMD64_FS_REGNUM, /* %fs */
|
||
AMD64_GS_REGNUM, /* %gs */
|
||
AMD64_ST0_REGNUM = 24, /* %st0 */
|
||
AMD64_ST1_REGNUM, /* %st1 */
|
||
AMD64_FCTRL_REGNUM = AMD64_ST0_REGNUM + 8,
|
||
AMD64_FSTAT_REGNUM = AMD64_ST0_REGNUM + 9,
|
||
AMD64_FTAG_REGNUM = AMD64_ST0_REGNUM + 10,
|
||
AMD64_XMM0_REGNUM = 40, /* %xmm0 */
|
||
AMD64_XMM1_REGNUM, /* %xmm1 */
|
||
AMD64_MXCSR_REGNUM = AMD64_XMM0_REGNUM + 16,
|
||
AMD64_YMM0H_REGNUM, /* %ymm0h */
|
||
AMD64_YMM15H_REGNUM = AMD64_YMM0H_REGNUM + 15,
|
||
AMD64_BND0R_REGNUM = AMD64_YMM15H_REGNUM + 1,
|
||
AMD64_BND3R_REGNUM = AMD64_BND0R_REGNUM + 3,
|
||
AMD64_BNDCFGU_REGNUM,
|
||
AMD64_BNDSTATUS_REGNUM,
|
||
AMD64_XMM16_REGNUM,
|
||
AMD64_XMM31_REGNUM = AMD64_XMM16_REGNUM + 15,
|
||
AMD64_YMM16H_REGNUM,
|
||
AMD64_YMM31H_REGNUM = AMD64_YMM16H_REGNUM + 15,
|
||
AMD64_K0_REGNUM,
|
||
AMD64_K7_REGNUM = AMD64_K0_REGNUM + 7,
|
||
AMD64_ZMM0H_REGNUM,
|
||
AMD64_ZMM31H_REGNUM = AMD64_ZMM0H_REGNUM + 31,
|
||
AMD64_PKRU_REGNUM,
|
||
AMD64_FSBASE_REGNUM,
|
||
AMD64_GSBASE_REGNUM
|
||
};
|
||
|
||
/* Number of general purpose registers. */
|
||
#define AMD64_NUM_GREGS 24
|
||
|
||
#define AMD64_NUM_REGS (AMD64_GSBASE_REGNUM + 1)
|
||
|
||
extern displaced_step_copy_insn_closure_up amd64_displaced_step_copy_insn
|
||
(struct gdbarch *gdbarch, CORE_ADDR from, CORE_ADDR to,
|
||
struct regcache *regs);
|
||
extern void amd64_displaced_step_fixup
|
||
(struct gdbarch *gdbarch, displaced_step_copy_insn_closure *closure,
|
||
CORE_ADDR from, CORE_ADDR to, struct regcache *regs, bool completed_p);
|
||
|
||
/* Initialize the ABI for amd64. Uses DEFAULT_TDESC as fallback
|
||
tdesc, if INFO does not specify one. */
|
||
extern void amd64_init_abi (struct gdbarch_info info,
|
||
struct gdbarch *gdbarch,
|
||
const target_desc *default_tdesc);
|
||
|
||
/* Initialize the ABI for x32. Uses DEFAULT_TDESC as fallback tdesc,
|
||
if INFO does not specify one. */
|
||
extern void amd64_x32_init_abi (struct gdbarch_info info,
|
||
struct gdbarch *gdbarch,
|
||
const target_desc *default_tdesc);
|
||
extern const struct target_desc *amd64_target_description (uint64_t xcr0,
|
||
bool segments);
|
||
|
||
/* Fill register REGNUM in REGCACHE with the appropriate
|
||
floating-point or SSE register value from *FXSAVE. If REGNUM is
|
||
-1, do this for all registers. This function masks off any of the
|
||
reserved bits in *FXSAVE. */
|
||
|
||
extern void amd64_supply_fxsave (struct regcache *regcache, int regnum,
|
||
const void *fxsave);
|
||
|
||
/* Similar to amd64_supply_fxsave, but use XSAVE extended state. */
|
||
extern void amd64_supply_xsave (struct regcache *regcache, int regnum,
|
||
const void *xsave);
|
||
|
||
/* Fill register REGNUM (if it is a floating-point or SSE register) in
|
||
*FXSAVE with the value from REGCACHE. If REGNUM is -1, do this for
|
||
all registers. This function doesn't touch any of the reserved
|
||
bits in *FXSAVE. */
|
||
|
||
extern void amd64_collect_fxsave (const struct regcache *regcache, int regnum,
|
||
void *fxsave);
|
||
/* Similar to amd64_collect_fxsave, but use XSAVE extended state. */
|
||
extern void amd64_collect_xsave (const struct regcache *regcache,
|
||
int regnum, void *xsave, int gcore);
|
||
|
||
/* Floating-point register set. */
|
||
extern const struct regset amd64_fpregset;
|
||
|
||
/* Variables exported from amd64-linux-tdep.c. */
|
||
extern int amd64_linux_gregset_reg_offset[];
|
||
|
||
/* Variables exported from amd64-netbsd-tdep.c. */
|
||
extern int amd64nbsd_r_reg_offset[];
|
||
|
||
/* Variables exported from amd64-obsd-tdep.c. */
|
||
extern int amd64obsd_r_reg_offset[];
|
||
|
||
#endif /* amd64-tdep.h */
|