From patchwork Wed Nov 30 16:49:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 9454599 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 E3B356071C for ; Wed, 30 Nov 2016 16:52:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CBCDC219AC for ; Wed, 30 Nov 2016 16:52:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C08C828479; Wed, 30 Nov 2016 16:52:43 +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 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 517B12846E for ; Wed, 30 Nov 2016 16:52:42 +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 1cC85b-0002Q1-Ly; Wed, 30 Nov 2016 16:50:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cC85Z-0002P6-UD for xen-devel@lists.xenproject.org; Wed, 30 Nov 2016 16:50:34 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id B9/57-32108-9530F385; Wed, 30 Nov 2016 16:50:33 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprJIsWRWlGSWpSXmKPExsXitHRDpG4Es32 Ewf3nuhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bL+9sYC+YIV5xeup6xgbGDr4uRk0NCwF9i 5rHbbCA2m4COxMW5O8FsEYFYiXWNV5m6GDk4mAXKJWbciAcJCwskSsxtOcUEYrMIqEr8XHULz OYVsJSYvX8tM8RIXYnby3axg7RyClhJfDiqDmIKAZW0ba6EqBaUODnzCQuIzSygKdG6/Tc7hC 0v0bx1NtgUIQFFif55D9gmMPLNQtIyC0nLLCQtCxiZVzGqF6cWlaUW6VrqJRVlpmeU5CZm5ug aGpjq5aYWFyemp+YkJhXrJefnbmIEBhkDEOxgXNvqfIhRkoNJSZT3KIN9hBBfUn5KZUZicUZ8 UWlOavEhRhkODiUJ3lYmoJxgUWp6akVaZg4w3GHSEhw8SiK8lSBp3uKCxNzizHSI1ClGRSlx3 jiQhABIIqM0D64NFmOXGGWlhHkZgQ4R4ilILcrNLEGVf8UozsGoJMybCTKFJzOvBG76K6DFTE CL3762BllckoiQkmpg9Gmd7TbRKcXy9KWbkxZc6s6q3b5fXuLPrI5bpovfW7ebTrqodnd9HvN RuZyzwsdu7gkO2cY1xdjo4rHn/rVXO/8wKIlaHv827+WHHvOrZ9KWGbwRWZ37665FKXO8rmIb /4mnM8pCl5xJy7MRj4+4H9ayw8Xt6rqAqxZml3ybslYqiB3svDjRUYmlOCPRUIu5qDgRAFW1X B+sAgAA X-Env-Sender: prvs=1355645f8=roger.pau@citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1480524616!57515058!4 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.0.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8473 invoked from network); 30 Nov 2016 16:50:27 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-13.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 30 Nov 2016 16:50:27 -0000 X-IronPort-AV: E=Sophos;i="5.31,574,1473120000"; d="scan'208";a="392272542" From: Roger Pau Monne To: , , Date: Wed, 30 Nov 2016 16:49:44 +0000 Message-ID: <20161130164950.43543-9-roger.pau@citrix.com> X-Mailer: git-send-email 2.9.3 (Apple Git-75) In-Reply-To: <20161130164950.43543-1-roger.pau@citrix.com> References: <20161130164950.43543-1-roger.pau@citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , Jan Beulich , Roger Pau Monne Subject: [Xen-devel] [PATCH v4 08/14] xen/x86: allow the emulated APICs to be enabled for the hardware domain 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: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Allow the use of both the emulated local APIC and IO APIC for the hardware domain. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- Cc: Jan Beulich Cc: Andrew Cooper --- Changes since v3: - Don't enable the emulated PIT for PVHv2 Dom0. Changes since v2: - Allow all PV guests to use the emulated PIT. Changes since RFC: - Move the emulation flags check to a separate helper. --- xen/arch/x86/domain.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index eae643f..2c7a528 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -509,6 +509,27 @@ void vcpu_destroy(struct vcpu *v) xfree(v->arch.pv_vcpu.trap_ctxt); } +static bool emulation_flags_ok(const struct domain *d, uint32_t emflags) +{ + + if ( is_hvm_domain(d) ) + { + if ( is_hardware_domain(d) && + emflags != (XEN_X86_EMU_LAPIC|XEN_X86_EMU_IOAPIC) ) + return false; + if ( !is_hardware_domain(d) && emflags && + emflags != XEN_X86_EMU_ALL && emflags != XEN_X86_EMU_LAPIC ) + return false; + } + else if ( emflags != 0 && emflags != XEN_X86_EMU_PIT ) + { + /* PV or classic PVH. */ + return false; + } + + return true; +} + int arch_domain_create(struct domain *d, unsigned int domcr_flags, struct xen_arch_domainconfig *config) { @@ -547,7 +568,7 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags, { uint32_t emflags; - if ( is_hardware_domain(d) ) + if ( is_hardware_domain(d) && is_pv_domain(d) ) config->emulation_flags |= XEN_X86_EMU_PIT; emflags = config->emulation_flags; @@ -558,11 +579,7 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags, return -EINVAL; } - /* PVHv2 guests can request emulated APIC. */ - if ( emflags && - (is_hvm_domain(d) ? ((emflags != XEN_X86_EMU_ALL) && - (emflags != XEN_X86_EMU_LAPIC)) : - (emflags != XEN_X86_EMU_PIT)) ) + if ( !emulation_flags_ok(d, emflags) ) { printk(XENLOG_G_ERR "d%d: Xen does not allow %s domain creation " "with the current selection of emulators: %#x\n",