Fixes to debugging facilities
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v2 Latest8 patches 10 repliesIn review
- v15 patches 7 repliesSuperseded
Changes in v2 from the cover letter
- S-o-b fixes (sorry)
- Drop RFC patch entirely, replace with a more conservative approach
- Add *_get_pending_event fixes (for hvm_monitor_interrupt)
- Fix must-be-zero constant in adjust_dr7_rsvd: 0xffff23ff -> 0xffff2fff
- Define X86_DR{6,7}_* constants in x86-defns.h instead of open-coding naked numbers (thanks Jan)
- Update DR6 for gdbsx when trapped in PV guest kernel mode
- Commit message fixes
Patches in v2 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/8 | x86: Fix calculation of %dr6/7 reserved bitsxen/ xen/ xen/ +2 more | +70 | 2 replies | |
| 2/8 | x86/hvm: Only populate info->cr2 for #PF in hvm_get_pending_event()xen/ | +7 | 3 replies | |
| 3/8 | x86/emul: Add pending_dbg field to x86_eventxen/ xen/ xen/ +11 more | +79 | 5 replies | |
| 4/8 | x86/emul: Populate pending_dbg field of x86_event from {svm,vmx}_get_pending_event()xen/ xen/ | +16 | 0 replies | |
| 5/8 | x86: Don't assume #DB is always caused by singlestep if EFLAGS.TF is setxen/ xen/ | +6 | 0 replies | |
| 6/8 | x86/hvm: Add comments about #DB exception behavior to {svm,vmx}_inject_event()xen/ xen/ | +16 | 0 replies | |
| 7/8 | x86: Fix merging of new status bits into %dr6xen/ xen/ xen/ +2 more | +31 | 0 replies | |
| 8/8 | x86/dbg: Cleanup of legacy dr6 constantsxen/ xen/ xen/ +1 more | +3 | 0 replies |
Reviews trailers per patch
5 of 8 patches have a Reviewed-by or Acked-by.
| Patch | Roger Pau Monné | Jan Beulich |
|---|---|---|
| 1/8 | R-b | |
| 2/8 | ||
| 3/8 | R-b | R-b |
| 4/8 | ||
| 5/8 | ||
| 6/8 | R-b | |
| 7/8 | R-b | R-b |
| 8/8 | R-b | A-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v2 0/8] Fixes to debugging facilities
This is a rebased version of Andrew Cooper's debugging facilities patch:
https://lore.kernel.org/xen-devel/[email protected]/
Quoted 8 lines
So this started as a small fix for the vmentry failure (penultimate patch), and has snowballed...
I'm fairly confident that everything involving DEBUGCTL.BTF is broken, and there are definitely bugs with configuring DEBUGCTL.RTM (which really isn't helped by the fact that the GCC TSX intrinsics render the resulting code un-debuggable.) I'll defer fixing these swamps for now.
Quoted 8 lines
The first 4 patches probably want backporting to the stable trees, so I've taken care to move them ahead of patch 6 for backport reasons. While all fixes would ideally be backported, I can't find a way of fixing %dr6 merging (as it needs to be done precicely once) without a behavioural change in the monitor subsystem.
Patch 8 probably breaks introspection, so can't be taken at this point. See that patch for discussion of the problem and my best guess at a solution.
6 out of 11 patches from the 2018 patch series above, including the vmentry failure fix, have already been committed. This covers the remaining 5 patches--except the aforementioned patch 8, which is replaced with a more conservative approach with (hopefully) minimal impact on introspection.
(Re dropped defer-monitor-to-injection patch: I think this could be
fixed independently of DR6 handling in a separate patchset, since IIUC the introspection/monitor events are already in a broken state anyway.)
One particular bug that the patch series fixes involves simultaneous hardware breakpoint exception and single-stepping exception occurring at the same PC (IP). Xen blindly sets singlestep (DR6.BS := 1) in this case, which interferes with userland debugging and allows (otherwise restricted) usermode programs to detect Xen HVM (or PVH). The following Linux x86-64 program demonstrates the bug:
-----------------------------------8<-----------------------------------
#include <stddef.h>
#include <stdlib.h>
#include <assert.h>
#include <unistd.h>
#include <signal.h>
#include <sys/ptrace.h>
#include <sys/wait.h>
#include <sys/user.h>
#include <stdio.h>
#define ABORT_ON_ERR(x) if ((x) == -1) abort();
int main(void)
{
unsigned long cur_rip, cur_eflags, cur_dr6;
int wstatus, exit_code;
pid_t pid;
ABORT_ON_ERR(pid = fork());
if (pid == 0) {
ABORT_ON_ERR(ptrace(PTRACE_TRACEME, 0, NULL, NULL));
ABORT_ON_ERR(raise(SIGSTOP));
_exit(0);
}
/* Wait for first ptrace event */
if (waitpid(pid, &wstatus, 0) != pid) abort();
if (!WIFSTOPPED(wstatus)) abort();
/* Obtain current RIP value and perform sanity check */
cur_rip = ptrace(PTRACE_PEEKUSER, pid, (void *)offsetof(struct user, regs.rip), &cur_rip);
cur_dr6 = ptrace(PTRACE_PEEKUSER, pid, (void *)offsetof(struct user, u_debugreg[6]), &cur_dr6);
assert(cur_dr6 == 0xffff0ff0UL);
/* Set up debug registers and set EFLAGS.TF */
cur_eflags = ptrace(PTRACE_PEEKUSER, pid, (void *)offsetof(struct user, regs.eflags), &cur_eflags);
ABORT_ON_ERR(ptrace(PTRACE_POKEUSER, pid, (void *)offsetof(struct user, regs.eflags), (void *)(cur_eflags | 0x100UL)));
ABORT_ON_ERR(ptrace(PTRACE_POKEUSER, pid, (void *)offsetof(struct user, u_debugreg[0]), (void *)cur_rip));
ABORT_ON_ERR(ptrace(PTRACE_POKEUSER, pid, (void *)offsetof(struct user, u_debugreg[7]), (void *)1L));
/* Continue execution to trigger hardware breakpoint */
ABORT_ON_ERR(ptrace(PTRACE_CONT, pid, NULL, (unsigned long)0));
if (waitpid(pid, &wstatus, 0) != pid) abort();
if (!(WIFSTOPPED(wstatus) && WSTOPSIG(wstatus) == SIGTRAP)) abort();
/* Detect if Xen has tampered with DR6 */
cur_dr6 = ptrace(PTRACE_PEEKUSER, pid, (void *)offsetof(struct user, u_debugreg[6]), &cur_dr6);
fprintf(stderr, "DR6 = 0x%08lx\n", cur_dr6);
if (cur_dr6 == 0xffff0ff1UL)
{
fputs("Running on bare-metal, Xen PV, or non-Xen VMM\n", stdout);
exit_code = EXIT_FAILURE;
}
else
{
fputs("Running on Xen HVM\n", stdout);
exit_code = EXIT_SUCCESS;
}
/* Tear down debug registers and unset EFLAGS.TF */
cur_eflags = ptrace(PTRACE_PEEKUSER, pid, (void *)offsetof(struct user, regs.eflags), &cur_eflags);
ABORT_ON_ERR(ptrace(PTRACE_POKEUSER, pid, (void *)offsetof(struct user, regs.eflags), (void *)(cur_eflags & ~0x100UL)));
ABORT_ON_ERR(ptrace(PTRACE_POKEUSER, pid, (void *)offsetof(struct user, u_debugreg[7]), (void *)0L));
/* Continue execution to let child process exit */
ABORT_ON_ERR(ptrace(PTRACE_CONT, pid, NULL, (unsigned long)0));
if (waitpid(pid, &wstatus, 0) != pid) abort();
if (!(WIFEXITED(wstatus) && WEXITSTATUS(wstatus) == 0)) abort();
return exit_code;
}-----------------------------------8<-----------------------------------
Changelog:
v1 -> v2:
- S-o-b fixes (sorry)
- Drop RFC patch entirely, replace with a more conservative approach
- Add *_get_pending_event fixes (for hvm_monitor_interrupt)
- Fix must-be-zero constant in adjust_dr7_rsvd: 0xffff23ff -> 0xffff2fff
- Define X86_DR{6,7}_* constants in x86-defns.h instead of open-coding naked numbers (thanks Jan)
- Update DR6 for gdbsx when trapped in PV guest kernel mode
- Commit message fixes
Andrew Cooper (5):
x86: Fix calculation of %dr6/7 reserved bits x86/emul: Add pending_dbg field to x86_event x86/hvm: Add comments about #DB exception behavior to
{svm,vmx}_inject_event() x86: Fix merging of new status bits into %dr6
x86/dbg: Cleanup of legacy dr6 constants
Jinoh Kang (3):
x86/hvm: Only populate info->cr2 for #PF in hvm_get_pending_event() x86/emul: Populate pending_dbg field of x86_event from
{svm,vmx}_get_pending_event() x86: Don't assume #DB is always caused by singlestep if EFLAGS.TF is
set
xen/arch/x86/domain.c | 7 +-- xen/arch/x86/hvm/emulate.c | 3 +- xen/arch/x86/hvm/hvm.c | 17 +++++-- xen/arch/x86/hvm/svm/svm.c | 35 ++++++++++---- xen/arch/x86/hvm/vmx/vmx.c | 45 +++++++++++------- xen/arch/x86/include/asm/debugreg.h | 63 ++++++++++++++++---------- xen/arch/x86/include/asm/domain.h | 12 +++++ xen/arch/x86/include/asm/hvm/hvm.h | 15 +++++- xen/arch/x86/include/asm/x86-defns.h | 47 +++++++++++++++++++ xen/arch/x86/mm/shadow/multi.c | 5 +- xen/arch/x86/pv/emul-priv-op.c | 13 +++--- xen/arch/x86/pv/emulate.c | 6 +-- xen/arch/x86/pv/misc-hypercalls.c | 16 ++----- xen/arch/x86/pv/ro-page-fault.c | 3 +- xen/arch/x86/pv/traps.c | 17 +++++-- xen/arch/x86/traps.c | 12 ++--- xen/arch/x86/x86_emulate/x86_emulate.h | 5 +- 17 files changed, 225 insertions(+), 96 deletions(-)
Signature · 1 line
2.41.0