Mailing List Archive

commit 540645212a1485d5adfb75dc6f93c2af8f06de9d
Author: Tamas K Lengyel <tamas.lengyel@intel.com>
AuthorDate: Fri Mar 11 20:43:55 2022 +0000
Commit: Andrew Cooper <andrew.cooper3@citrix.com>
CommitDate: Wed May 18 18:31:11 2022 +0100

x86/monitor: Add new monitor event to catch all vmexits

Add monitor event that hooks the vmexit handler allowing for both sync and
async monitoring of events. With async monitoring an event is placed on the
monitor ring for each exit and the rest of the vmexit handler resumes normally.
If there are additional monitor events configured those will also place their
respective events on the monitor ring.

With the sync version an event is placed on the monitor ring but the handler
does not get resumed, thus the sync version is only useful when the VM is not
expected to resume normally after the vmexit. Our use-case is primarily with
the sync version with VM forks where the fork gets reset after sync vmexit
event, thus the rest of the vmexit handler can be safely skipped. This is
very useful when we want to avoid Xen crashing the VM under any circumstance,
for example during fuzzing. Collecting all vmexit information regardless of
the root cause makes it easier to reason about the state of the VM on the
monitor side, hence we opt to receive all events, even for external interrupt
and NMI exits and let the monitor agent decide how to proceed.

Signed-off-by: Tamas K Lengyel <tamas.lengyel@intel.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
---
tools/include/xenctrl.h | 2 ++
tools/libs/ctrl/xc_monitor.c | 15 +++++++++++++++
xen/arch/x86/hvm/monitor.c | 18 ++++++++++++++++++
xen/arch/x86/hvm/vmx/vmx.c | 12 ++++++++++++
xen/arch/x86/include/asm/domain.h | 2 ++
xen/arch/x86/include/asm/hvm/monitor.h | 2 ++
xen/arch/x86/include/asm/monitor.h | 3 ++-
xen/arch/x86/monitor.c | 14 ++++++++++++++
xen/include/public/domctl.h | 6 ++++++
xen/include/public/vm_event.h | 12 ++++++++++++
10 files changed, 85 insertions(+), 1 deletion(-)

diff --git a/tools/include/xenctrl.h b/tools/include/xenctrl.h
index 1b089a2c02..159eaac050 100644
--- a/tools/include/xenctrl.h
+++ b/tools/include/xenctrl.h
@@ -2096,6 +2096,8 @@ int xc_monitor_privileged_call(xc_interface *xch, uint32_t domain_id,
bool enable);
int xc_monitor_emul_unimplemented(xc_interface *xch, uint32_t domain_id,
bool enable);
+int xc_monitor_vmexit(xc_interface *xch, uint32_t domain_id, bool enable,
+ bool sync);
/**
* This function enables / disables emulation for each REP for a
* REP-compatible instruction.
diff --git a/tools/libs/ctrl/xc_monitor.c b/tools/libs/ctrl/xc_monitor.c
index 4ac823e775..c5fa62ff30 100644
--- a/tools/libs/ctrl/xc_monitor.c
+++ b/tools/libs/ctrl/xc_monitor.c
@@ -246,6 +246,21 @@ int xc_monitor_emul_unimplemented(xc_interface *xch, uint32_t domain_id,
return do_domctl(xch, &domctl);
}

+int xc_monitor_vmexit(xc_interface *xch, uint32_t domain_id, bool enable,
+ bool sync)
+{
+ DECLARE_DOMCTL;
+
+ domctl.cmd = XEN_DOMCTL_monitor_op;
+ domctl.domain = domain_id;
+ domctl.u.monitor_op.op = enable ? XEN_DOMCTL_MONITOR_OP_ENABLE
+ : XEN_DOMCTL_MONITOR_OP_DISABLE;
+ domctl.u.monitor_op.event = XEN_DOMCTL_MONITOR_EVENT_VMEXIT;
+ domctl.u.monitor_op.u.vmexit.sync = sync;
+
+ return do_domctl(xch, &domctl);
+}
+
/*
* Local variables:
* mode: C
diff --git a/xen/arch/x86/hvm/monitor.c b/xen/arch/x86/hvm/monitor.c
index b44a1e1dfe..a11cd76f4d 100644
--- a/xen/arch/x86/hvm/monitor.c
+++ b/xen/arch/x86/hvm/monitor.c
@@ -328,6 +328,24 @@ bool hvm_monitor_check_p2m(unsigned long gla, gfn_t gfn, uint32_t pfec,
return monitor_traps(curr, true, &req) >= 0;
}

+int hvm_monitor_vmexit(unsigned long exit_reason,
+ unsigned long exit_qualification)
+{
+ struct vcpu *curr = current;
+ struct arch_domain *ad = &curr->domain->arch;
+ vm_event_request_t req = {};
+
+ ASSERT(ad->monitor.vmexit_enabled);
+
+ req.reason = VM_EVENT_REASON_VMEXIT;
+ req.u.vmexit.arch.vmx.reason = exit_reason;
+ req.u.vmexit.arch.vmx.qualification = exit_qualification;
+
+ set_npt_base(curr, &req);
+
+ return monitor_traps(curr, ad->monitor.vmexit_sync, &req);
+}
+
/*
* Local variables:
* mode: C
diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
index d03e78bf0d..f08a00dcbb 100644
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -4040,6 +4040,18 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs)
}
}

+ if ( unlikely(currd->arch.monitor.vmexit_enabled) )
+ {
+ int rc;
+
+ __vmread(EXIT_QUALIFICATION, &exit_qualification);
+ rc = hvm_monitor_vmexit(exit_reason, exit_qualification);
+ if ( rc < 0 )
+ goto exit_and_crash;
+ if ( rc )
+ return;
+ }
+
/* XXX: This looks ugly, but we need a mechanism to ensure
* any pending vmresume has really happened
*/
diff --git a/xen/arch/x86/include/asm/domain.h b/xen/arch/x86/include/asm/domain.h
index 35898d725f..3aa0919fa6 100644
--- a/xen/arch/x86/include/asm/domain.h
+++ b/xen/arch/x86/include/asm/domain.h
@@ -430,6 +430,8 @@ struct arch_domain
*/
unsigned int inguest_pagefault_disabled : 1;
unsigned int control_register_values : 1;
+ unsigned int vmexit_enabled : 1;
+ unsigned int vmexit_sync : 1;
struct monitor_msr_bitmap *msr_bitmap;
uint64_t write_ctrlreg_mask[4];
} monitor;
diff --git a/xen/arch/x86/include/asm/hvm/monitor.h b/xen/arch/x86/include/asm/hvm/monitor.h
index a75cd8545c..639f6dfa37 100644
--- a/xen/arch/x86/include/asm/hvm/monitor.h
+++ b/xen/arch/x86/include/asm/hvm/monitor.h
@@ -51,6 +51,8 @@ bool hvm_monitor_emul_unimplemented(void);

bool hvm_monitor_check_p2m(unsigned long gla, gfn_t gfn, uint32_t pfec,
uint16_t kind);
+int hvm_monitor_vmexit(unsigned long exit_reason,
+ unsigned long exit_qualification);

#endif /* __ASM_X86_HVM_MONITOR_H__ */

diff --git a/xen/arch/x86/include/asm/monitor.h b/xen/arch/x86/include/asm/monitor.h
index 01c6d63bb9..d8d54c5f23 100644
--- a/xen/arch/x86/include/asm/monitor.h
+++ b/xen/arch/x86/include/asm/monitor.h
@@ -89,7 +89,8 @@ static inline uint32_t arch_monitor_get_capabilities(struct domain *d)
(1U << XEN_DOMCTL_MONITOR_EVENT_DEBUG_EXCEPTION) |
(1U << XEN_DOMCTL_MONITOR_EVENT_WRITE_CTRLREG) |
(1U << XEN_DOMCTL_MONITOR_EVENT_EMUL_UNIMPLEMENTED) |
- (1U << XEN_DOMCTL_MONITOR_EVENT_INGUEST_PAGEFAULT));
+ (1U << XEN_DOMCTL_MONITOR_EVENT_INGUEST_PAGEFAULT) |
+ (1U << XEN_DOMCTL_MONITOR_EVENT_VMEXIT));

if ( hvm_is_singlestep_supported() )
capabilities |= (1U << XEN_DOMCTL_MONITOR_EVENT_SINGLESTEP);
diff --git a/xen/arch/x86/monitor.c b/xen/arch/x86/monitor.c
index 3079726a8b..30ca71432c 100644
--- a/xen/arch/x86/monitor.c
+++ b/xen/arch/x86/monitor.c
@@ -332,6 +332,20 @@ int arch_monitor_domctl_event(struct domain *d,
break;
}

+ case XEN_DOMCTL_MONITOR_EVENT_VMEXIT:
+ {
+ bool old_status = ad->monitor.vmexit_enabled;
+
+ if ( unlikely(old_status == requested_status) )
+ return -EEXIST;
+
+ domain_pause(d);
+ ad->monitor.vmexit_enabled = requested_status;
+ ad->monitor.vmexit_sync = mop->u.vmexit.sync;
+ domain_unpause(d);
+ break;
+ }
+
default:
/*
* Should not be reached unless arch_monitor_get_capabilities() is
diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h
index 84e75829b9..b2ae839c36 100644
--- a/xen/include/public/domctl.h
+++ b/xen/include/public/domctl.h
@@ -1060,6 +1060,7 @@ struct xen_domctl_psr_cmt_op {
#define XEN_DOMCTL_MONITOR_EVENT_EMUL_UNIMPLEMENTED 10
/* Enabled by default */
#define XEN_DOMCTL_MONITOR_EVENT_INGUEST_PAGEFAULT 11
+#define XEN_DOMCTL_MONITOR_EVENT_VMEXIT 12

struct xen_domctl_monitor_op {
uint32_t op; /* XEN_DOMCTL_MONITOR_OP_* */
@@ -1110,6 +1111,11 @@ struct xen_domctl_monitor_op {
/* Pause vCPU until response */
uint8_t sync;
} debug_exception;
+
+ struct {
+ /* Send event and don't process vmexit */
+ uint8_t sync;
+ } vmexit;
} u;
};

diff --git a/xen/include/public/vm_event.h b/xen/include/public/vm_event.h
index 1673bb8703..56b429a975 100644
--- a/xen/include/public/vm_event.h
+++ b/xen/include/public/vm_event.h
@@ -175,6 +175,8 @@
#define VM_EVENT_REASON_DESCRIPTOR_ACCESS 13
/* Current instruction is not implemented by the emulator */
#define VM_EVENT_REASON_EMUL_UNIMPLEMENTED 14
+/* VMEXIT */
+#define VM_EVENT_REASON_VMEXIT 15

/* Supported values for the vm_event_write_ctrlreg index. */
#define VM_EVENT_X86_CR0 0
@@ -394,6 +396,15 @@ struct vm_event_emul_insn_data {
uint8_t data[16]; /* Has to be completely filled */
};

+struct vm_event_vmexit {
+ struct {
+ struct {
+ uint64_t reason;
+ uint64_t qualification;
+ } vmx;
+ } arch;
+};
+
typedef struct vm_event_st {
uint32_t version; /* VM_EVENT_INTERFACE_VERSION */
uint32_t flags; /* VM_EVENT_FLAG_* */
@@ -414,6 +425,7 @@ typedef struct vm_event_st {
struct vm_event_debug software_breakpoint;
struct vm_event_debug debug_exception;
struct vm_event_cpuid cpuid;
+ struct vm_event_vmexit vmexit;
union {
struct vm_event_interrupt_x86 x86;
} interrupt;
--
generated by git-patchbot for /home/xen/git/xen.git#staging