From patchwork Mon Feb 8 16:58:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corneliu ZUZU X-Patchwork-Id: 8252221 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 25A22BEEE5 for ; Mon, 8 Feb 2016 17:01:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1AA1C203DB for ; Mon, 8 Feb 2016 17:01:06 +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 F40F7203C3 for ; Mon, 8 Feb 2016 17:01:04 +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 1aSp8v-0005SN-01; Mon, 08 Feb 2016 16:58:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aSp8t-0005Qc-3H for xen-devel@lists.xen.org; Mon, 08 Feb 2016 16:58:27 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 2F/A3-16618-239C8B65; Mon, 08 Feb 2016 16:58:26 +0000 X-Env-Sender: czuzu@bitdefender.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1454950705!20343400!1 X-Originating-IP: [91.199.104.161] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26278 invoked from network); 8 Feb 2016 16:58:25 -0000 Received: from mx01.buh.bitdefender.com (HELO mx01.buh.bitdefender.com) (91.199.104.161) by server-2.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 8 Feb 2016 16:58:25 -0000 Comment: DomainKeys? See http://domainkeys.sourceforge.net/ DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=bitdefender.com; b=LqtByh+qW/n4RAyrTIneUybMm5GnqKL0iXYVfKCR1gGzeWJyX9rvWO2U7Zvli1w0zg90+5jPxABMVwWvgzZEqVExnv+QTuBsMu5ZwaSdB4vOX+obYBsWT+FI06M4eI/YU+PYxGw4+gWqVKkdMKiaF/3Yi7ScinmKCH/EzvXcAfC+rQwCXb23yKRbpKcjpr/czjbexpcmpwss00wwbZNs86snarFOaQKw1LNDDjeFxH2zZ/3MFSItR7JY0F0eSbMUv2SWTH9NbulKuYEoapdbKZu7fLbgW/nhZ3+6yHjz9lFdl+ZTYRy3AQ2l4sfDeVXbJE2hl6RMaSOd8mgkiIjKDw==; 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=Sx3r2fdMkBDNIMuXHQO6rKY8YJY=; b=hPAf57pxmRktjPSl54HkPX6j4YPb zALWix+AB4QMmUvMUTcl7W5nLJITsniUU4g6R3HmvgDI+dJG1GAoYqhqxfG3Q2YQ vBZApyERlHnhvei7mWp3w77zvOFrU6scSdESUp4VGRSScuJzyufeu/9ZuomQFxKa 4MfHEb4QLdbqqbMAUOhJqXdf/LOgvdPjPH4PKtnN+RjVAnjDgGZ0F1EfcX+bnxue S+3x74lXA5QrApZNdA8vmY9HGGGpTwKX1qPu4KK3URgzn2luKVGik1tGm11j2MH+ slnTY/8DoL1Qe5fJi+aXu9petwHEW9qzeYDcv6Hw397B5xeYLiZGiZe24g== Received: (qmail 25986 invoked from network); 8 Feb 2016 18:58:23 +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; 8 Feb 2016 18:58:23 +0200 Received: from smtp02.buh.bitdefender.net (unknown [10.17.80.76]) by mx-sr.buh.bitdefender.com (Postfix) with ESMTP id C890E7FBD8 for ; Mon, 8 Feb 2016 18:58:23 +0200 (EET) Received: (qmail 31614 invoked from network); 8 Feb 2016 18:58:23 +0200 Received: from 82-137-8-119.rdsnet.ro (HELO localhost.localdomain) (czuzu@bitdefender.com@82.137.8.119) by smtp02.buh.bitdefender.net with AES128-SHA256 encrypted SMTP; 8 Feb 2016 18:58:23 +0200 From: Corneliu ZUZU To: xen-devel@lists.xen.org Date: Mon, 8 Feb 2016 18:58:02 +0200 Message-Id: <1454950682-9459-8-git-send-email-czuzu@bitdefender.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1454950682-9459-1-git-send-email-czuzu@bitdefender.com> References: <1454950682-9459-1-git-send-email-czuzu@bitdefender.com> X-BitDefender-Scanner: Clean, Agent: BitDefender qmail 3.1.4 on smtp02.buh.bitdefender.net, sigver: 7.64434 X-BitDefender-Spam: No (0) X-BitDefender-SpamStamp: Build: [Engines: 2.15.6.743, Dats: 413947, Stamp: 3], Multi: [Enabled, t: (0.000010, 0.005660)], BW: [Enabled, t: (0.000007,0.000001)], RBL DNSBL: [Disabled], APM: [Enabled, Score: 500, t: (0.004319), Flags: 2A917CE3; NN_LARGISH_BIGGISH; NN_NO_CONTENT_TYPE; NN_LEGIT_SUMM_400_WORDS; NN_NO_LINK_NMD; NN_LEGIT_BITDEFENDER; NN_LEGIT_S_SQARE_BRACKETS; NN_LEGIT_MAILING_LIST_TO], SGN: [Enabled, t: (0.011038)], URL: [Enabled, t: (0.000005)], RTDA: [Enabled, t: (0.014796), Hit: No, Details: v2.3.3; Id: 2m1ghdn.1aaoi919p.2ap7n], 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 7/7] arch.monitor: move bits to common (arch_domain to domain) 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 This patch moves bitfield members for single-step, software-breakpoint and guest-request monitor vm-events from the arch-side (struct arch_domain) to the common-side (struct domain). Ctrl-reg bits (i.e. write_ctrlreg_* members) are left on the arch-side, because control-registers number can vary across architectures. Signed-off-by: Corneliu ZUZU --- xen/arch/x86/hvm/vmx/vmcs.c | 4 ++-- xen/common/hvm/event.c | 12 ++++++------ xen/common/monitor.c | 17 +++++++---------- xen/include/asm-x86/domain.h | 16 ++++++---------- xen/include/xen/sched.h | 16 ++++++++++++++++ 5 files changed, 37 insertions(+), 28 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 5bc3c74..07acbf2 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1706,8 +1706,8 @@ void vmx_do_resume(struct vcpu *v) } debug_state = v->domain->debugger_attached - || v->domain->arch.monitor.software_breakpoint_enabled - || v->domain->arch.monitor.singlestep_enabled; + || v->domain->monitor.software_breakpoint_enabled + || v->domain->monitor.singlestep_enabled; if ( unlikely(v->arch.hvm_vcpu.debug_state_latch != debug_state) ) { diff --git a/xen/common/hvm/event.c b/xen/common/hvm/event.c index d4ce97a..2660093 100644 --- a/xen/common/hvm/event.c +++ b/xen/common/hvm/event.c @@ -110,16 +110,16 @@ bool_t hvm_event_cr(unsigned int index, void hvm_event_guest_request(void) { struct vcpu *curr = current; - struct arch_domain *ad = &curr->domain->arch; + struct domain *d = curr->domain; - if ( ad->monitor.guest_request_enabled ) + if ( d->monitor.guest_request_enabled ) { vm_event_request_t req = { .reason = VM_EVENT_REASON_GUEST_REQUEST, .vcpu_id = curr->vcpu_id, }; - hvm_event_traps(curr, ad->monitor.guest_request_sync, &req); + hvm_event_traps(curr, d->monitor.guest_request_sync, &req); } } @@ -131,9 +131,9 @@ int hvm_event_software_breakpoint(unsigned long ip, bool_t single_step) { int rc = 0; struct vcpu *curr = current; - struct arch_domain *ad = &curr->domain->arch; - bool_t enabled = ( single_step ? ad->monitor.singlestep_enabled - : ad->monitor.software_breakpoint_enabled ); + struct domain *d = curr->domain; + bool_t enabled = ( single_step ? d->monitor.singlestep_enabled + : d->monitor.software_breakpoint_enabled ); if ( enabled ) { diff --git a/xen/common/monitor.c b/xen/common/monitor.c index 1165aeb..b745aa4 100644 --- a/xen/common/monitor.c +++ b/xen/common/monitor.c @@ -121,14 +121,13 @@ int monitor_domctl(struct domain *d, struct xen_domctl_monitor_op *mop) case XEN_DOMCTL_MONITOR_EVENT_SINGLESTEP: { - struct arch_domain *ad = &d->arch; - bool_t old_status = ad->monitor.singlestep_enabled; + bool_t old_status = d->monitor.singlestep_enabled; if ( unlikely(old_status == requested_status) ) return -EEXIST; domain_pause(d); - ad->monitor.singlestep_enabled = !old_status; + d->monitor.singlestep_enabled = !old_status; domain_unpause(d); break; } @@ -139,14 +138,13 @@ int monitor_domctl(struct domain *d, struct xen_domctl_monitor_op *mop) case XEN_DOMCTL_MONITOR_EVENT_SOFTWARE_BREAKPOINT: { - struct arch_domain *ad = &d->arch; - bool_t old_status = ad->monitor.software_breakpoint_enabled; + bool_t old_status = d->monitor.software_breakpoint_enabled; if ( unlikely(old_status == requested_status) ) return -EEXIST; domain_pause(d); - ad->monitor.software_breakpoint_enabled = !old_status; + d->monitor.software_breakpoint_enabled = !old_status; domain_unpause(d); break; } @@ -157,15 +155,14 @@ int monitor_domctl(struct domain *d, struct xen_domctl_monitor_op *mop) case XEN_DOMCTL_MONITOR_EVENT_GUEST_REQUEST: { - struct arch_domain *ad = &d->arch; - bool_t old_status = ad->monitor.guest_request_enabled; + bool_t old_status = d->monitor.guest_request_enabled; 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 = !old_status; + d->monitor.guest_request_sync = mop->u.guest_request.sync; + d->monitor.guest_request_enabled = !old_status; domain_unpause(d); break; } diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 4072e27..6254060 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -376,17 +376,13 @@ struct arch_domain unsigned long *pirq_eoi_map; unsigned long pirq_eoi_map_mfn; - /* Monitor options */ + /* Arch-specific monitor vm-event options */ struct { - unsigned int write_ctrlreg_enabled : 4; - unsigned int write_ctrlreg_sync : 4; - unsigned int write_ctrlreg_onchangeonly : 4; - unsigned int mov_to_msr_enabled : 1; - unsigned int mov_to_msr_extended : 1; - unsigned int singlestep_enabled : 1; - unsigned int software_breakpoint_enabled : 1; - unsigned int guest_request_enabled : 1; - unsigned int guest_request_sync : 1; + uint16_t write_ctrlreg_enabled : 4; + uint16_t write_ctrlreg_sync : 4; + uint16_t write_ctrlreg_onchangeonly : 4; + uint16_t mov_to_msr_enabled : 1; + uint16_t mov_to_msr_extended : 1; } monitor; /* Mem_access emulation control */ diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index b47a3fe..5b01a7f 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -464,6 +464,22 @@ struct domain /* vNUMA topology accesses are protected by rwlock. */ rwlock_t vnuma_rwlock; struct vnuma_info *vnuma; + + /* Common monitor vm-events options */ + struct { +#if CONFIG_HAS_VM_EVENT_SINGLESTEP + uint8_t singlestep_enabled : 1; +#endif // HAS_VM_EVENT_SINGLESTEP + +#if CONFIG_HAS_VM_EVENT_SOFTWARE_BREAKPOINT + uint8_t software_breakpoint_enabled : 1; +#endif // HAS_VM_EVENT_SOFTWARE_BREAKPOINT + +#if CONFIG_HAS_VM_EVENT_GUEST_REQUEST + uint8_t guest_request_enabled : 1; + uint8_t guest_request_sync : 1; +#endif // HAS_VM_EVENT_GUEST_REQUEST + } monitor; }; /* Protect updates/reads (resp.) of domain_list and domain_hash. */