From patchwork Wed Sep 7 18:59:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Ostrovsky X-Patchwork-Id: 9319825 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 A06B660752 for ; Wed, 7 Sep 2016 19:08:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 98BD2293D4 for ; Wed, 7 Sep 2016 19:08:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D29D29417; Wed, 7 Sep 2016 19:08:16 +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 34FEE293D4 for ; Wed, 7 Sep 2016 19:08:16 +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 1bhiA9-0004I4-Tp; Wed, 07 Sep 2016 19:05:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bhiA8-0004FJ-38 for xen-devel@lists.xen.org; Wed, 07 Sep 2016 19:05:32 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 79/82-29579-BF460D75; Wed, 07 Sep 2016 19:05:31 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDLMWRWlGSWpSXmKPExsXSO6nOVfdXyoV wg2PzDC2WfFzM4sDocXT3b6YAxijWzLyk/IoE1oxHuxwKWkUrXt9ZxNrAeEygi5GTQ0hgEpPE hYWxXYxcQPYfRokPTceZIJwNjBId506xQzg9jBK/pnxjB2lhEzCSOHt0OiOILSIgLXHt82VGk CJmgUuMEvMugrRzcggLhEncOPqYFcRmEVCVuHRkOlgzr4C3RF/TUbBmCQEFiSkP3zOD2JxA8Y 1fDrND3OQl8f7JKmaIGmOJ9rcX2SYw8i1gZFjFqFGcWlSWWqRraKyXVJSZnlGSm5iZo2toYKy Xm1pcnJiempOYVKyXnJ+7iREYKgxAsINx23bPQ4ySHExKorzbWC+EC/El5adUZiQWZ8QXleak Fh9ilOHgUJLg/ZwMlBMsSk1PrUjLzAEGLUxagoNHSYT3LUiat7ggMbc4Mx0idYpRUUqcdxlIQ gAkkVGaB9cGi5RLjLJSwryMQIcI8RSkFuVmlqDKv2IU52BUEub9CDKFJzOvBG76K6DFTECLhU 6dB1lckoiQkmpgTM3WPsNcXqdyP2rp1J85f/pk2DKn39OU395YKmKkc+5zeXHJ/7l5a9Om+LA sOdn54QEP35Kl85ijpy2ee0TQVbzdjDlcJGjDbzFOTmbej5x/LvEGVrtq/J2oXjsh/nj3p5Uf VFoaWTX4rXRmb1M44Dhr1sIt89wlC49+7fwYsIpJqlchdbGEEktxRqKhFnNRcSIAPo8apY8CA AA= X-Env-Sender: boris.ostrovsky@oracle.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1473275129!58895275!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.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 42821 invoked from network); 7 Sep 2016 19:05:30 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-13.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 7 Sep 2016 19:05:30 -0000 Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u87J5Hhh026816 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 7 Sep 2016 19:05:17 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id u87J5HYi004066 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 7 Sep 2016 19:05:17 GMT Received: from abhmp0013.oracle.com (abhmp0013.oracle.com [141.146.116.19]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id u87J5Hrv004754; Wed, 7 Sep 2016 19:05:17 GMT Received: from ovs104.us.oracle.com (/10.149.76.204) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 07 Sep 2016 12:05:16 -0700 From: Boris Ostrovsky To: xen-devel@lists.xen.org Date: Wed, 7 Sep 2016 14:59:26 -0400 Message-Id: <1473274769-19129-17-git-send-email-boris.ostrovsky@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1473274769-19129-1-git-send-email-boris.ostrovsky@oracle.com> References: <1473274769-19129-1-git-send-email-boris.ostrovsky@oracle.com> X-Source-IP: aserv0022.oracle.com [141.146.126.234] 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 v3 16/19] libxl/pvhv2: Include APIC page in MMIO hole for PVHv2 guests 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 Acked-by: Wei Liu --- Changes in v3: * Now that we don't have x86.h define LAPIC_BASE_ADDRESS in libxl_arch.h tools/libxl/Makefile | 2 ++ tools/libxl/libxl_arch.h | 6 ++++++ tools/libxl/libxl_dom.c | 19 +++++++++++++++---- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 14a1a8e..1f3b40f 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -166,6 +166,8 @@ $(XL_OBJS) $(TEST_PROG_OBJS) _libxl.api-for-check: \ $(XL_OBJS): CFLAGS += $(CFLAGS_XL) $(XL_OBJS): CFLAGS += -include $(XEN_ROOT)/tools/config.h # libxl_json.h needs it. +libxl_dom.o: CFLAGS += -I$(XEN_ROOT)/tools # include libacpi/x86.h + SAVE_HELPER_OBJS = libxl_save_helper.o _libxl_save_msgs_helper.o $(SAVE_HELPER_OBJS): CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenevtchn) diff --git a/tools/libxl/libxl_arch.h b/tools/libxl/libxl_arch.h index 34a853c..253a037 100644 --- a/tools/libxl/libxl_arch.h +++ b/tools/libxl/libxl_arch.h @@ -62,4 +62,10 @@ int libxl__arch_domain_construct_memmap(libxl__gc *gc, uint32_t domid, struct xc_dom_image *dom); +#if defined(__i386__) || defined(__x86_64__) + +#define LAPIC_BASE_ADDRESS 0xfee00000 + +#endif + #endif diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 7974302..2924629 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1077,10 +1077,21 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, dom->target_pages = mem_size >> XC_PAGE_SHIFT; if (dom->mmio_size == 0 && device_model) dom->mmio_size = HVM_BELOW_4G_MMIO_LENGTH; - else if (dom->mmio_size == 0 && !device_model) - dom->mmio_size = GB(4) - - ((X86_HVM_END_SPECIAL_REGION - X86_HVM_NR_SPECIAL_PAGES) - << XC_PAGE_SHIFT); + else if (dom->mmio_size == 0 && !device_model) { +#if defined(__i386__) || defined(__x86_64__) + if (libxl_defbool_val(info->u.hvm.apic)) { + /* Make sure LAPIC_BASE_ADDRESS is below special pages */ + assert(((((X86_HVM_END_SPECIAL_REGION - X86_HVM_NR_SPECIAL_PAGES) + << XC_PAGE_SHIFT) - LAPIC_BASE_ADDRESS)) >= XC_PAGE_SIZE); + dom->mmio_size = GB(4) - LAPIC_BASE_ADDRESS; + } else + dom->mmio_size = GB(4) - + ((X86_HVM_END_SPECIAL_REGION - X86_HVM_NR_SPECIAL_PAGES) + << XC_PAGE_SHIFT); +#else + assert(1); +#endif + } lowmem_end = mem_size; highmem_end = 0; mmio_start = (1ull << 32) - dom->mmio_size;