From patchwork Wed Feb 10 15:52:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corneliu ZUZU X-Patchwork-Id: 8273071 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 51492BEEE5 for ; Wed, 10 Feb 2016 15:55:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 81A6120398 for ; Wed, 10 Feb 2016 15:55:43 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 56C432039E for ; Wed, 10 Feb 2016 15:55:40 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aTX4P-0000Ug-G3; Wed, 10 Feb 2016 15:52:45 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aTX4N-0000UX-NS for xen-devel@lists.xen.org; Wed, 10 Feb 2016 15:52:44 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id CE/0F-09708-BCC5BB65; Wed, 10 Feb 2016 15:52:43 +0000 X-Env-Sender: czuzu@bitdefender.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1455119561!10643664!1 X-Originating-IP: [91.199.104.161] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 57192 invoked from network); 10 Feb 2016 15:52:42 -0000 Received: from mx01.buh.bitdefender.com (HELO mx01.buh.bitdefender.com) (91.199.104.161) by server-16.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 10 Feb 2016 15:52:42 -0000 Comment: DomainKeys? See http://domainkeys.sourceforge.net/ DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=bitdefender.com; b=eCwb3bBwuIw5AbHQaAaBRaFb4ZplzXB90cfcfS6Q4Fv73u3bTMNhgfCF8/ikC4m1lQS5dK9sciqKFYja0zC/dqT9oRhOpH0cHRU7C8TVB4uQvePeEj+KCkM06tIHEtLUQjDPACX/SEPLSJAw7jWLpOmK2VlUdeZ/jhCGFHWEdnRlPx0BuysYad5CWHrVK/sWzh7193GsaopsNXyt4mcKtcQVf4pelbAo3SV96ICdhQY/LZ0TmdyrDs1BBlH8S+XZKnP5CjJpV271luehTHdTPDPUeao7T5EPgr5iAtrSUS3Z07ZoXD3WbKWa9wTYmsvGLSmqc4FfHuj/0qDLRutzgQ==; h=Received:Received:Received:Received:Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References:X-BitDefender-Scanner:X-BitDefender-Spam:X-BitDefender-SpamStamp:X-BitDefender-CF-Stamp; DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=bitdefender.com; h=from:to :cc:subject:date:message-id:in-reply-to:references; s=default; bh=Q7x2mkZWsb7q8MIY67EzNLdCpzc=; b=A4QGPhq5tfXszIibX03V6JKjjR7l GIEB0dpC0o2wlYMQ36bYms92xUyW/jFrRozA3VcWywa15aa+u/BmgSKszyfx64Uq h+L9Ti7sjz+67eszPstjOCp7WJNMapCHWGjOTuZALAdeVGiCmLvIEsutQcXwyIkM rDAQxjpwKRZnNbjAWrH0iHsSkin6LdCtAM05qqOHhznkgtJLCuJzbVc5ggr2aeK/ LQaGwrFfdUBOTDM1PA/QR+t6dYYe3NoxnqTb4gcwZnz8b1cZIbJ0VM4mFTGjPfzr wJ89KA3BisG4ILFhA4AqNqvYGmt3u7kwRNq6mnw9vgFWwBXU92thxkrRJg== Received: (qmail 19216 invoked from network); 10 Feb 2016 17:52:40 +0200 Received: from unknown (HELO mx-sr.buh.bitdefender.com) (10.17.80.103) by mx01.buh.bitdefender.com with AES256-GCM-SHA384 encrypted SMTP; 10 Feb 2016 17:52:40 +0200 Received: from smtp03.buh.bitdefender.org (unknown [10.17.80.77]) by mx-sr.buh.bitdefender.com (Postfix) with ESMTP id 4BD477FBDB for ; Wed, 10 Feb 2016 17:52:40 +0200 (EET) Received: (qmail 915 invoked from network); 10 Feb 2016 17:52:40 +0200 Received: from 82-137-14-90.rdsnet.ro (HELO localhost.localdomain) (czuzu@bitdefender.com@82.137.14.90) by smtp03.buh.bitdefender.org with AES128-SHA256 encrypted SMTP; 10 Feb 2016 17:52:38 +0200 From: Corneliu ZUZU To: xen-devel@lists.xen.org Date: Wed, 10 Feb 2016 17:52:28 +0200 Message-Id: <1455119548-2401-1-git-send-email-czuzu@bitdefender.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1455119259-2161-1-git-send-email-czuzu@bitdefender.com> References: <1455119259-2161-1-git-send-email-czuzu@bitdefender.com> X-BitDefender-Scanner: Clean, Agent: BitDefender qmail 3.1.4 on smtp03.buh.bitdefender.org, sigver: 7.64459 X-BitDefender-Spam: No (0) X-BitDefender-SpamStamp: Build: [Engines: 2.15.6.743, Dats: 414080, Stamp: 3], Multi: [Enabled, t: (0.000013, 0.016317)], BW: [Enabled, t: (0.000006,0.000001)], RBL DNSBL: [Disabled], APM: [Enabled, Score: 500, t: (0.013935), Flags: 2A917CE3; NN_LARGISH_BIGGISH; NN_TP_TAG_HTTP; NN_NO_CONTENT_TYPE; NN_LEGIT_SUMM_400_WORDS; NN_LEGIT_BITDEFENDER; NN_LEGIT_S_SQARE_BRACKETS; NN_LEGIT_MAILING_LIST_TO], SGN: [Enabled, t: (0.015224)], URL: [Enabled, t: (0.000024)], RTDA: [Enabled, t: (0.035911), Hit: No, Details: v2.3.3; Id: 2m1ghdo.1aaoi9nek.465f9], total: 0(775) X-BitDefender-CF-Stamp: none Cc: Kevin Tian , Tamas K Lengyel , Keir Fraser , Ian Campbell , Razvan Cojocaru , Jun Nakajima , Andrew Cooper , Stefano Stabellini , Jan Beulich Subject: [Xen-devel] [PATCH v2 3/7] xen/vm-events: Move monitor_domctl to common-side. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 1. Kconfig: * Added Kconfigs for common monitor vm-events: # see files: common/Kconfig, x86/Kconfig HAS_VM_EVENT_WRITE_CTRLREG HAS_VM_EVENT_SINGLESTEP HAS_VM_EVENT_SOFTWARE_BREAKPOINT HAS_VM_EVENT_GUEST_REQUEST 2. Moved monitor_domctl from arch-side to common-side 2.1. Moved arch/x86/monitor.c to common/monitor.c # see files: arch/x86/Makefile, xen/common/Makefile, xen/common/monitor.c # changes: - removed status_check (we would have had to duplicate it in X86 arch_monitor_domctl_event otherwise) - moved get_capabilities to arch-side (arch_monitor_get_capabilities) - moved XEN_DOMCTL_MONITOR_OP_EMULATE_EACH_REP to arch-side (see arch_monitor_domctl_op) - put XEN_DOMCTL_MONITOR_EVENT_MOV_TO_MSR to x86-side (see arch_monitor_domctl_event) - surrounded switch cases w/ CONFIG_HAS_VM_EVENT_* 2.2. Moved asm-x86/monitor.h to xen/monitor.h # see files: arch/x86/hvm/event.c, arch/x86/hvm/hvm.c, arch/x86/hvm/vmx/vmx.c, xen/common/domctl.c 2.3. Removed asm-arm/monitor.h (no longer needed) 3. Added x86/monitor_x86.c => will rename in next commit to monitor.c (not done in this commit to avoid git seeing this as being the modified old monitor.c => keeping the same name would have rendered an unnecessarily bulky diff) # see files: arch/x86/Makefile # implements X86-side arch_monitor_domctl_event 4. Added asm-x86/monitor_arch.h, asm-arm/monitor_arch.h (renamed to monitor.h in next commit, reason is the same as @ (3.). # define/implement: arch_monitor_get_capabilities, arch_monitor_domctl_op and arch_monitor_domctl_event Signed-off-by: Corneliu ZUZU --- xen/arch/x86/Kconfig | 4 + xen/arch/x86/Makefile | 2 +- xen/arch/x86/hvm/event.c | 2 +- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/monitor_x86.c | 72 ++++++++ xen/common/Kconfig | 20 +++ xen/common/Makefile | 1 + xen/common/domctl.c | 2 +- xen/{arch/x86 => common}/monitor.c | 195 +++++++++------------- xen/include/asm-arm/{monitor.h => monitor_arch.h} | 34 +++- xen/include/asm-x86/monitor_arch.h | 74 ++++++++ xen/include/{asm-x86 => xen}/monitor.h | 17 +- 13 files changed, 293 insertions(+), 134 deletions(-) create mode 100644 xen/arch/x86/monitor_x86.c rename xen/{arch/x86 => common}/monitor.c (44%) rename xen/include/asm-arm/{monitor.h => monitor_arch.h} (46%) create mode 100644 xen/include/asm-x86/monitor_arch.h rename xen/include/{asm-x86 => xen}/monitor.h (74%) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 3a90f47..e46be1b 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -14,6 +14,10 @@ config X86 select HAS_MEM_ACCESS select HAS_MEM_PAGING select HAS_MEM_SHARING + select HAS_VM_EVENT_WRITE_CTRLREG + select HAS_VM_EVENT_SINGLESTEP + select HAS_VM_EVENT_SOFTWARE_BREAKPOINT + select HAS_VM_EVENT_GUEST_REQUEST select HAS_NS16550 select HAS_PASSTHROUGH select HAS_PCI diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 8e6e901..6e80cf0 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -36,7 +36,7 @@ obj-y += microcode_intel.o # This must come after the vendor specific files. obj-y += microcode.o obj-y += mm.o x86_64/mm.o -obj-y += monitor.o +obj-y += monitor_x86.o obj-y += mpparse.o obj-y += nmi.o obj-y += numa.o diff --git a/xen/arch/x86/hvm/event.c b/xen/arch/x86/hvm/event.c index e3444db..04faa72 100644 --- a/xen/arch/x86/hvm/event.c +++ b/xen/arch/x86/hvm/event.c @@ -23,8 +23,8 @@ #include #include +#include #include -#include #include #include diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 930d0e3..e93a648 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -51,7 +52,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index cf0e642..be67b60 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -57,7 +58,6 @@ #include #include #include -#include #include static bool_t __initdata opt_force_ept; diff --git a/xen/arch/x86/monitor_x86.c b/xen/arch/x86/monitor_x86.c new file mode 100644 index 0000000..d19fd15 --- /dev/null +++ b/xen/arch/x86/monitor_x86.c @@ -0,0 +1,72 @@ +/* + * arch/x86/monitor_x86.c + * + * Arch-specific monitor_op domctl handler. + * + * Copyright (c) 2015 Tamas K Lengyel (tamas@tklengyel.com) + * Copyright (c) 2016, Bitdefender S.R.L. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License v2 as published by the Free Software Foundation. + * + * 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 . + */ + +#include + +bool_t arch_monitor_domctl_event(struct domain *d, + struct xen_domctl_monitor_op *mop, + int *rc) +{ + struct arch_domain *ad = &d->arch; + bool_t requested_status = (XEN_DOMCTL_MONITOR_OP_ENABLE == mop->op); + + switch ( mop->event ) + { + case XEN_DOMCTL_MONITOR_EVENT_MOV_TO_MSR: + { + bool_t old_status = ad->monitor.mov_to_msr_enabled; + + if ( unlikely(old_status == requested_status) ) + return -EEXIST; + + if ( XEN_DOMCTL_MONITOR_OP_ENABLE == mop->op && + mop->u.mov_to_msr.extended_capture && + !hvm_enable_msr_exit_interception(d) ) + return -EOPNOTSUPP; + + domain_pause(d); + + if ( XEN_DOMCTL_MONITOR_OP_ENABLE == mop->op && + mop->u.mov_to_msr.extended_capture ) + ad->monitor.mov_to_msr_extended = 1; + else + ad->monitor.mov_to_msr_extended = 0; + + ad->monitor.mov_to_msr_enabled = !old_status; + domain_unpause(d); + break; + } + + default: + return 0; + } + + return 1; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 6f404b4..172da13 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -36,6 +36,26 @@ config HAS_MEM_PAGING config HAS_MEM_SHARING bool +config HAS_VM_EVENT_WRITE_CTRLREG + bool + ---help--- + Select if ctrl-reg write monitor vm-events are supported + +config HAS_VM_EVENT_SINGLESTEP + bool + ---help--- + Select if single-step monitor vm-events are supported + +config HAS_VM_EVENT_SOFTWARE_BREAKPOINT + bool + ---help--- + Select if software-breakpoint monitor vm-events are supported + +config HAS_VM_EVENT_GUEST_REQUEST + bool + ---help--- + Select if guest-request monitor vm-events are supported + # Select HAS_PDX if PDX is supported config HAS_PDX bool diff --git a/xen/common/Makefile b/xen/common/Makefile index 6e82b33..0d76efe 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -20,6 +20,7 @@ obj-y += lib.o obj-y += lzo.o obj-$(CONFIG_HAS_MEM_ACCESS) += mem_access.o obj-y += memory.o +obj-y += monitor.o obj-y += multicall.o obj-y += notifier.o obj-y += page_alloc.o diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 121a34a..4b1dec1 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -25,11 +25,11 @@ #include #include #include +#include #include #include #include #include -#include #include #include diff --git a/xen/arch/x86/monitor.c b/xen/common/monitor.c similarity index 44% rename from xen/arch/x86/monitor.c rename to xen/common/monitor.c index 1d43880..a4899c3 100644 --- a/xen/arch/x86/monitor.c +++ b/xen/common/monitor.c @@ -1,9 +1,10 @@ /* - * arch/x86/monitor.c + * xen/common/monitor.c * - * Architecture-specific monitor_op domctl handler. + * Common monitor_op domctl handler. * * Copyright (c) 2015 Tamas K Lengyel (tamas@tklengyel.com) + * Copyright (c) 2016, Bitdefender S.R.L. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public @@ -18,101 +19,66 @@ * License along with this program; If not, see . */ -#include -#include -#include -#include -#include -#include +#include +#include /* for domain_pause, ... */ +#include /* for XENLOG_WARNING */ #include +#include -/* - * Sanity check whether option is already enabled/disabled - */ -static inline -int status_check(struct xen_domctl_monitor_op *mop, bool_t status) -{ - bool_t requested_status = (mop->op == XEN_DOMCTL_MONITOR_OP_ENABLE); - - if ( status == requested_status ) - return -EEXIST; - - return 0; -} - -static inline uint32_t 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. - */ - if ( !is_hvm_domain(d) || !cpu_has_vmx ) - return capabilities; - - capabilities = (1 << XEN_DOMCTL_MONITOR_EVENT_WRITE_CTRLREG) | - (1 << XEN_DOMCTL_MONITOR_EVENT_MOV_TO_MSR) | - (1 << XEN_DOMCTL_MONITOR_EVENT_SOFTWARE_BREAKPOINT) | - (1 << XEN_DOMCTL_MONITOR_EVENT_GUEST_REQUEST); - - /* Since we know this is on VMX, we can just call the hvm func */ - if ( hvm_is_singlestep_supported() ) - capabilities |= (1 << XEN_DOMCTL_MONITOR_EVENT_SINGLESTEP); - - return capabilities; -} +#include /* for monitor_arch_# */ +#if CONFIG_X86 +#include /* for VM_EVENT_X86_CR3 */ +#include /* for hvm_update_guest_cr, ... */ +#endif int monitor_domctl(struct domain *d, struct xen_domctl_monitor_op *mop) { int rc; - struct arch_domain *ad = &d->arch; - uint32_t capabilities = get_capabilities(d); + bool_t requested_status = 0; - if ( current->domain == d ) /* no domain_pause() */ + if ( unlikely(current->domain == d) ) /* no domain_pause() */ return -EPERM; rc = xsm_vm_event_control(XSM_PRIV, d, mop->op, mop->event); - if ( rc ) + if ( unlikely(rc) ) return rc; switch ( mop->op ) { - case XEN_DOMCTL_MONITOR_OP_GET_CAPABILITIES: - mop->event = capabilities; - return 0; + case XEN_DOMCTL_MONITOR_OP_ENABLE: + requested_status = 1; + /* fallthrough */ + case XEN_DOMCTL_MONITOR_OP_DISABLE: + /* Check if event type is available. */ + if ( unlikely(!(arch_monitor_get_capabilities(d) & (1 << mop->event))) ) + return -EOPNOTSUPP; + break; - case XEN_DOMCTL_MONITOR_OP_EMULATE_EACH_REP: - domain_pause(d); - ad->mem_access_emulate_each_rep = !!mop->event; - domain_unpause(d); + case XEN_DOMCTL_MONITOR_OP_GET_CAPABILITIES: + mop->event = arch_monitor_get_capabilities(d); return 0; - } - - /* - * Sanity check - */ - if ( mop->op != XEN_DOMCTL_MONITOR_OP_ENABLE && - mop->op != XEN_DOMCTL_MONITOR_OP_DISABLE ) - return -EOPNOTSUPP; - /* Check if event type is available. */ - if ( !(capabilities & (1 << mop->event)) ) + default: + /* The monitor op is probably handled on the arch-side. */ + if ( likely(arch_monitor_domctl_op(d, mop, &rc)) ) + return rc; + /* unrecognized op */ return -EOPNOTSUPP; + } switch ( mop->event ) { +#if CONFIG_HAS_VM_EVENT_WRITE_CTRLREG case XEN_DOMCTL_MONITOR_EVENT_WRITE_CTRLREG: { + struct arch_domain *ad = &d->arch; unsigned int ctrlreg_bitmask = monitor_ctrlreg_bitmask(mop->u.mov_to_cr.index); - bool_t status = + bool_t old_status = !!(ad->monitor.write_ctrlreg_enabled & ctrlreg_bitmask); - struct vcpu *v; - rc = status_check(mop, status); - if ( rc ) - return rc; + if ( unlikely(old_status == requested_status) ) + return -EEXIST; domain_pause(d); @@ -126,93 +92,92 @@ int monitor_domctl(struct domain *d, struct xen_domctl_monitor_op *mop) else ad->monitor.write_ctrlreg_onchangeonly &= ~ctrlreg_bitmask; - if ( !status ) + if ( !old_status ) ad->monitor.write_ctrlreg_enabled |= ctrlreg_bitmask; else ad->monitor.write_ctrlreg_enabled &= ~ctrlreg_bitmask; - if ( mop->u.mov_to_cr.index == VM_EVENT_X86_CR3 ) - /* Latches new CR3 mask through CR0 code */ +#if CONFIG_X86 + if ( VM_EVENT_X86_CR3 == mop->u.mov_to_cr.index ) + { + struct vcpu *v; + /* Latches new CR3 mask through CR0 code. */ for_each_vcpu ( d, v ) hvm_update_guest_cr(v, 0); + } +#endif domain_unpause(d); break; } +#endif // HAS_VM_EVENT_WRITE_CTRLREG - case XEN_DOMCTL_MONITOR_EVENT_MOV_TO_MSR: - { - bool_t status = ad->monitor.mov_to_msr_enabled; - - rc = status_check(mop, status); - if ( rc ) - return rc; - - if ( mop->op == XEN_DOMCTL_MONITOR_OP_ENABLE && - mop->u.mov_to_msr.extended_capture && - !hvm_enable_msr_exit_interception(d) ) - return -EOPNOTSUPP; - - domain_pause(d); - - if ( mop->op == XEN_DOMCTL_MONITOR_OP_ENABLE && - mop->u.mov_to_msr.extended_capture ) - ad->monitor.mov_to_msr_extended = 1; - else - ad->monitor.mov_to_msr_extended = 0; - - ad->monitor.mov_to_msr_enabled = !status; - domain_unpause(d); - break; - } - +#if CONFIG_HAS_VM_EVENT_SINGLESTEP case XEN_DOMCTL_MONITOR_EVENT_SINGLESTEP: { - bool_t status = ad->monitor.singlestep_enabled; + struct arch_domain *ad = &d->arch; + bool_t old_status = ad->monitor.singlestep_enabled; - rc = status_check(mop, status); - if ( rc ) - return rc; + if ( unlikely(old_status == requested_status) ) + return -EEXIST; domain_pause(d); - ad->monitor.singlestep_enabled = !status; + ad->monitor.singlestep_enabled = !old_status; domain_unpause(d); break; } +#endif // HAS_VM_EVENT_SINGLESTEP +#if CONFIG_HAS_VM_EVENT_SOFTWARE_BREAKPOINT case XEN_DOMCTL_MONITOR_EVENT_SOFTWARE_BREAKPOINT: { - bool_t status = ad->monitor.software_breakpoint_enabled; + struct arch_domain *ad = &d->arch; + bool_t old_status = ad->monitor.software_breakpoint_enabled; - rc = status_check(mop, status); - if ( rc ) - return rc; + if ( unlikely(old_status == requested_status) ) + return -EEXIST; domain_pause(d); - ad->monitor.software_breakpoint_enabled = !status; + ad->monitor.software_breakpoint_enabled = !old_status; domain_unpause(d); break; } +#endif // HAS_VM_EVENT_SOFTWARE_BREAKPOINT +#if CONFIG_HAS_VM_EVENT_GUEST_REQUEST case XEN_DOMCTL_MONITOR_EVENT_GUEST_REQUEST: { - bool_t status = ad->monitor.guest_request_enabled; + struct arch_domain *ad = &d->arch; + bool_t old_status = ad->monitor.guest_request_enabled; - rc = status_check(mop, status); - if ( rc ) - return rc; + if ( unlikely(old_status == requested_status) ) + return -EEXIST; domain_pause(d); ad->monitor.guest_request_sync = mop->u.guest_request.sync; - ad->monitor.guest_request_enabled = !status; + ad->monitor.guest_request_enabled = !old_status; domain_unpause(d); break; } +#endif // HAS_VM_EVENT_GUEST_REQUEST default: - return -EOPNOTSUPP; + /* Give arch-side the chance to handle this event */ + if ( likely(arch_monitor_domctl_event(d, mop, &rc)) ) + return rc; + + /* + * Should not be reached unless arch_monitor_get_capabilities() is not + * properly implemented. In that case, since reaching this point does + * not really break anything, don't crash the hypervisor, issue a + * warning instead of BUG(). + */ + printk(XENLOG_WARNING + "WARNING, BUG: arch_monitor_get_capabilities() not implemented" + "properly.\n"); + return -EOPNOTSUPP; }; return 0; diff --git a/xen/include/asm-arm/monitor.h b/xen/include/asm-arm/monitor_arch.h similarity index 46% rename from xen/include/asm-arm/monitor.h rename to xen/include/asm-arm/monitor_arch.h index a3a9703..d0df66c 100644 --- a/xen/include/asm-arm/monitor.h +++ b/xen/include/asm-arm/monitor_arch.h @@ -1,9 +1,10 @@ /* - * include/asm-arm/monitor.h + * include/asm-arm/monitor_arch.h * - * Architecture-specific monitor_op domctl handler. + * Arch-specific monitor_op domctl handler. * * Copyright (c) 2015 Tamas K Lengyel (tamas@tklengyel.com) + * Copyright (c) 2016, Bitdefender S.R.L. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public @@ -18,16 +19,35 @@ * License along with this program; If not, see . */ -#ifndef __ASM_ARM_MONITOR_H__ -#define __ASM_ARM_MONITOR_H__ +#ifndef __ASM_ARM_MONITOR_ARCH_H__ +#define __ASM_ARM_MONITOR_ARCH_H__ #include #include static inline -int monitor_domctl(struct domain *d, struct xen_domctl_monitor_op *op) +uint32_t arch_monitor_get_capabilities(struct domain *d) { - return -ENOSYS; + /* No monitor vm-events implemented on ARM. */ + return 0; } -#endif /* __ASM_X86_MONITOR_H__ */ +static inline +bool_t arch_monitor_domctl_op(struct domain *d, + struct xen_domctl_monitor_op *mop, + int *rc) +{ + /* No arch-specific monitor ops on ARM. */ + return 0; +} + +static inline +bool_t arch_monitor_domctl_event(struct domain *d, + struct xen_domctl_monitor_op *mop, + int *rc) +{ + /* No arch-specific monitor vm-events on ARM. */ + return 0; +} + +#endif /* __ASM_ARM_MONITOR_ARCH_H__ */ diff --git a/xen/include/asm-x86/monitor_arch.h b/xen/include/asm-x86/monitor_arch.h new file mode 100644 index 0000000..d9daf65 --- /dev/null +++ b/xen/include/asm-x86/monitor_arch.h @@ -0,0 +1,74 @@ +/* + * include/asm-x86/monitor_arch.h + * + * Arch-specific monitor_op domctl handler. + * + * Copyright (c) 2015 Tamas K Lengyel (tamas@tklengyel.com) + * Copyright (c) 2016, Bitdefender S.R.L. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License v2 as published by the Free Software Foundation. + * + * 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 . + */ + +#ifndef __ASM_X86_MONITOR_ARCH_H__ +#define __ASM_X86_MONITOR_ARCH_H__ + +#include /* for struct domain, is_hvm_domain, ... */ +#include /* for XEN_DOMCTL_MONITOR_#, ... */ +#include /* for cpu_has_vmx */ +#include /* for hvm_is_singlestep_supported */ + +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. + */ + if ( !is_hvm_domain(d) || !cpu_has_vmx ) + return capabilities; + + capabilities = (1 << XEN_DOMCTL_MONITOR_EVENT_WRITE_CTRLREG) | + (1 << XEN_DOMCTL_MONITOR_EVENT_MOV_TO_MSR) | + (1 << XEN_DOMCTL_MONITOR_EVENT_SOFTWARE_BREAKPOINT) | + (1 << XEN_DOMCTL_MONITOR_EVENT_GUEST_REQUEST); + + /* Since we know this is on VMX, we can just call the hvm func */ + if ( hvm_is_singlestep_supported() ) + capabilities |= (1 << XEN_DOMCTL_MONITOR_EVENT_SINGLESTEP); + + return capabilities; +} + +static inline +bool_t arch_monitor_domctl_op(struct domain *d, + struct xen_domctl_monitor_op *mop, + int *rc) +{ + if( likely(XEN_DOMCTL_MONITOR_OP_EMULATE_EACH_REP == mop->op) ) + { + domain_pause(d); + d->arch.mem_access_emulate_each_rep = !!mop->event; + domain_unpause(d); + *rc = 0; + return 1; + } + return 0; +} + +bool_t arch_monitor_domctl_event(struct domain *d, + struct xen_domctl_monitor_op *mop, + int *rc); + +#endif /* __ASM_X86_MONITOR_ARCH_H__ */ diff --git a/xen/include/asm-x86/monitor.h b/xen/include/xen/monitor.h similarity index 74% rename from xen/include/asm-x86/monitor.h rename to xen/include/xen/monitor.h index 7c8280b..edeff78 100644 --- a/xen/include/asm-x86/monitor.h +++ b/xen/include/xen/monitor.h @@ -1,9 +1,10 @@ /* - * include/asm-x86/monitor.h + * include/xen/monitor.h * - * Architecture-specific monitor_op domctl handler. + * Common monitor_op domctl handler. * * Copyright (c) 2015 Tamas K Lengyel (tamas@tklengyel.com) + * Copyright (c) 2016, Bitdefender S.R.L. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public @@ -18,14 +19,16 @@ * License along with this program; If not, see . */ -#ifndef __ASM_X86_MONITOR_H__ -#define __ASM_X86_MONITOR_H__ +#ifndef __MONITOR_H__ +#define __MONITOR_H__ -struct domain; -struct xen_domctl_monitor_op; +#include +#include +#if CONFIG_HAS_VM_EVENT_WRITE_CTRLREG #define monitor_ctrlreg_bitmask(ctrlreg_index) (1U << (ctrlreg_index)) +#endif int monitor_domctl(struct domain *d, struct xen_domctl_monitor_op *op); -#endif /* __ASM_X86_MONITOR_H__ */ +#endif /* __MONITOR_H__ */