From patchwork Thu Aug 4 21:06:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Ostrovsky X-Patchwork-Id: 9264343 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EE8776048F for ; Thu, 4 Aug 2016 21:16:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DDD5128210 for ; Thu, 4 Aug 2016 21:16:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D277228407; Thu, 4 Aug 2016 21:16:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B0B7228210 for ; Thu, 4 Aug 2016 21:16:12 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bVPxO-0001Jm-3N; Thu, 04 Aug 2016 21:13:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bVPxN-0001FN-2l for xen-devel@lists.xen.org; Thu, 04 Aug 2016 21:13:33 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 3F/40-01659-CFFA3A75; Thu, 04 Aug 2016 21:13:32 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupgkeJIrShJLcpLzFFi42LpnVTnqvt7/eJ wg3P/9SyWfFzM4sDocXT3b6YAxijWzLyk/IoE1oyXR5cyFnzir5j0ZD1rA+MTni5GLg4hgQlM Eg1XNrNCOL8YJf4/WMEE4WxglFjath4owwnk9DBKrDmYC2KzCRhJnD06nRHEFhGQlrj2+TIjS AOzwC1Gie2/7zCDJIQFIiW+LPrNDmKzCKhKHN57mwnE5hXwlvh69AXYUAkBBYkpD9+D1XMCxW 99XsUMscxLYmLLdHaIGkOJzxuXMk9g5FvAyLCKUb04tagstUjXTC+pKDM9oyQ3MTNH19DQRC8 3tbg4MT01JzGpWC85P3cTIzBUGIBgB+PfCc6HGCU5mJREeV9VLw4X4kvKT6nMSCzOiC8qzUkt PsQow8GhJMG7bB1QTrAoNT21Ii0zBxi0MGkJDh4lEd6HIGne4oLE3OLMdIjUKUZdji0LbqxlE mLJy89LlRLnvQpSJABSlFGaBzcCFkGXGGWlhHkZgY4S4ilILcrNLEGVf8UozsGoJMz7EWQKT2 ZeCdymV0BHMAEdccJgAcgRJYkIKakGxpYbJmd+OM/wj1grpnIm5HiA27c0qWeqGsyn3/6YU1i /9MOhcHPLt+sybx2bcDHEdPuBc+lRoSecZm+ZqsnqN4NLrjB4Wvoa3/3rS5Xe/D1gbCVw/rRd oTPvDsG/LwwX9V49brovoVHlpymrV6f20m1itkeYLtZcCk1x1X3OfP3+lYuJWqWTVyixFGckG moxFxUnAgD1olU9mwIAAA== X-Env-Sender: boris.ostrovsky@oracle.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1470345209!57967802!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjc3MjE4\n X-StarScan-Received: X-StarScan-Version: 8.77; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13373 invoked from network); 4 Aug 2016 21:13:31 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-6.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 4 Aug 2016 21:13:31 -0000 Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u74LDEdj014100 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 4 Aug 2016 21:13:15 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0022.oracle.com (8.14.4/8.13.8) with ESMTP id u74LDEat024132 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 4 Aug 2016 21:13:14 GMT Received: from abhmp0015.oracle.com (abhmp0015.oracle.com [141.146.116.21]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id u74LDDQf007449; Thu, 4 Aug 2016 21:13:14 GMT Received: from ovs104.us.oracle.com (/10.149.76.204) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 04 Aug 2016 14:13:13 -0700 From: Boris Ostrovsky To: xen-devel@lists.xen.org Date: Thu, 4 Aug 2016 17:06:43 -0400 Message-Id: <1470344811-14225-16-git-send-email-boris.ostrovsky@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1470344811-14225-1-git-send-email-boris.ostrovsky@oracle.com> References: <1470344811-14225-1-git-send-email-boris.ostrovsky@oracle.com> X-Source-IP: userv0022.oracle.com [156.151.31.74] Cc: wei.liu2@citrix.com, andrew.cooper3@citrix.com, ian.jackson@eu.citrix.com, julien.grall@arm.com, jbeulich@suse.com, zhaoshenglong@huawei.com, boris.ostrovsky@oracle.com, roger.pau@citrix.com Subject: [Xen-devel] [PATCH v2 15/23] x86: Add more checks verifying that PIT/PIC/IOAPIC are emulated X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Boris Ostrovsky Reviewed-by: Jan Beulich --- v2: * Added ASSERT(has_vpic(d)) * This patch can go in independent of the rest of the series. xen/arch/x86/hvm/vlapic.c | 14 ++++++++++++-- xen/arch/x86/hvm/vpt.c | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index ba9b293..1d5d287 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -1114,7 +1114,14 @@ static int __vlapic_accept_pic_intr(struct vcpu *v) struct domain *d = v->domain; struct vlapic *vlapic = vcpu_vlapic(v); uint32_t lvt0 = vlapic_get_reg(vlapic, APIC_LVT0); - union vioapic_redir_entry redir0 = domain_vioapic(d)->redirtbl[0]; + union vioapic_redir_entry redir0; + + ASSERT(has_vpic(d)); + + if ( !has_vioapic(d) ) + return 0; + + redir0 = domain_vioapic(d)->redirtbl[0]; /* We deliver 8259 interrupts to the appropriate CPU as follows. */ return ((/* IOAPIC pin0 is unmasked and routing to this LAPIC? */ @@ -1130,7 +1137,7 @@ static int __vlapic_accept_pic_intr(struct vcpu *v) int vlapic_accept_pic_intr(struct vcpu *v) { - if ( vlapic_hw_disabled(vcpu_vlapic(v)) ) + if ( vlapic_hw_disabled(vcpu_vlapic(v)) || !has_vpic(v->domain) ) return 0; TRACE_2D(TRC_HVM_EMUL_LAPIC_PIC_INTR, @@ -1145,6 +1152,9 @@ void vlapic_adjust_i8259_target(struct domain *d) { struct vcpu *v; + if ( !has_vpic(d) ) + return; + for_each_vcpu ( d, v ) if ( __vlapic_accept_pic_intr(v) ) goto found; diff --git a/xen/arch/x86/hvm/vpt.c b/xen/arch/x86/hvm/vpt.c index 358ec57..c90aa95 100644 --- a/xen/arch/x86/hvm/vpt.c +++ b/xen/arch/x86/hvm/vpt.c @@ -496,7 +496,7 @@ void pt_adjust_global_vcpu_target(struct vcpu *v) struct pl_time *pl_time; int i; - if ( v == NULL ) + if ( v == NULL || !has_vpit(v->domain) ) return; vpit = &v->domain->arch.vpit;