From b4a5ed1eeb9e838fc426244ceef0c6cd0e0dc201 Mon Sep 17 00:00:00 2001 From: Alexandru Isaila Date: Mon, 12 Feb 2018 17:08:15 +0200 Subject: [PATCH] asm-x86/monitor: Fix monitor capability reporting on SVM systems No monitor features are available on AMD and all capabilities are passed only to the Intel processor architecture. This means that the arch_monitor_get_capabilities returns capabilities = 0. This patch is separating out features which are implemented on both systems from those implemented only on Intel, so that we advertize the working capabilities on AMD. Signed-off-by: Alexandru Isaila Acked-by: Andrew Cooper Acked-by: Acked-by: Razvan Cojocaru --- xen/include/asm-x86/monitor.h | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/xen/include/asm-x86/monitor.h b/xen/include/asm-x86/monitor.h index a0444d105b..9ef6dff87c 100644 --- a/xen/include/asm-x86/monitor.h +++ b/xen/include/asm-x86/monitor.h @@ -71,24 +71,28 @@ static inline uint32_t arch_monitor_get_capabilities(struct domain *d) uint32_t capabilities = 0; /* - * At the moment only Intel HVM domains are supported. However, event - * delivery could be extended to AMD and PV domains. + * At the moment only Intel and AMD HVM domains are supported. However, + * event delivery could be extended to PV domains. */ - if ( !is_hvm_domain(d) || !cpu_has_vmx ) + if ( !is_hvm_domain(d) ) return capabilities; - capabilities = (1U << XEN_DOMCTL_MONITOR_EVENT_WRITE_CTRLREG) | - (1U << XEN_DOMCTL_MONITOR_EVENT_MOV_TO_MSR) | - (1U << XEN_DOMCTL_MONITOR_EVENT_SOFTWARE_BREAKPOINT) | - (1U << XEN_DOMCTL_MONITOR_EVENT_GUEST_REQUEST) | - (1U << XEN_DOMCTL_MONITOR_EVENT_DEBUG_EXCEPTION) | - (1U << XEN_DOMCTL_MONITOR_EVENT_CPUID) | - (1U << XEN_DOMCTL_MONITOR_EVENT_INTERRUPT) | - (1U << XEN_DOMCTL_MONITOR_EVENT_EMUL_UNIMPLEMENTED); - - /* Since we know this is on VMX, we can just call the hvm func */ - if ( hvm_is_singlestep_supported() ) - capabilities |= (1U << XEN_DOMCTL_MONITOR_EVENT_SINGLESTEP); + capabilities = (1U << XEN_DOMCTL_MONITOR_EVENT_GUEST_REQUEST); + + if ( cpu_has_vmx ) + { + capabilities |= ((1U << XEN_DOMCTL_MONITOR_EVENT_WRITE_CTRLREG) | + (1U << XEN_DOMCTL_MONITOR_EVENT_MOV_TO_MSR) | + (1U << XEN_DOMCTL_MONITOR_EVENT_SOFTWARE_BREAKPOINT) | + (1U << XEN_DOMCTL_MONITOR_EVENT_DEBUG_EXCEPTION) | + (1U << XEN_DOMCTL_MONITOR_EVENT_CPUID) | + (1U << XEN_DOMCTL_MONITOR_EVENT_INTERRUPT) | + (1U << XEN_DOMCTL_MONITOR_EVENT_EMUL_UNIMPLEMENTED)); + + /* Since we know this is on VMX, we can just call the hvm func */ + if ( hvm_is_singlestep_supported() ) + capabilities |= (1U << XEN_DOMCTL_MONITOR_EVENT_SINGLESTEP); + } if ( hvm_funcs.set_descriptor_access_exiting ) capabilities |= (1U << XEN_DOMCTL_MONITOR_EVENT_DESC_ACCESS); -- 2.39.5