From patchwork Fri Sep 22 03:01:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 9965577 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 92220600C5 for ; Fri, 22 Sep 2017 09:12:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8BC9F28501 for ; Fri, 22 Sep 2017 09:12:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 807942885F; Fri, 22 Sep 2017 09:12:11 +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=-2.7 required=2.0 tests=BAYES_00, DATE_IN_PAST_06_12, 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 E641E28501 for ; Fri, 22 Sep 2017 09:12:10 +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 1dvJyA-0003Px-V6; Fri, 22 Sep 2017 09:09:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dvJy9-0003OO-La for xen-devel@lists.xen.org; Fri, 22 Sep 2017 09:09:57 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 5D/68-01911-463D4C95; Fri, 22 Sep 2017 09:09:56 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNLMWRWlGSWpSXmKPExsVywNwkQjfl8pF Ig/md4hZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8bXZafZCvo1Ks72/mVpYJwl18XIxSEkMI1R Ym3/BZYuRk4OCQFeiSPLZrBC2P4Sl3cfZYUo6mCUmLj9HliCTUBd4sTiiYwgtoiAtMS1z5cZQ YqYBTYzScxdMwtoEgeHsEC4xILD0SA1LAKqEjPe7GEHsXkFXCR+TDvIBLFAQWLKw/fMIDangK vEr77tYHEhoJrWpfuZJjDyLmBkWMWoUZxaVJZapGtoqZdUlJmeUZKbmJmja2hgrJebWlycmJ6 ak5hUrJecn7uJERgQ9QwMjDsYfx/3O8QoycGkJMr7/vyRSCG+pPyUyozE4oz4otKc1OJDjDIc HEoSvH6XgHKCRanpqRVpmTnA0IRJS3DwKInwJoKkeYsLEnOLM9MhUqcYdTk6bt79wyTEkpefl yolzqsHUiQAUpRRmgc3AhYnlxhlpYR5GRkYGIR4ClKLcjNLUOVfMYpzMCoJ8xqATOHJzCuB2/ QK6AgmoCPKV4MdUZKIkJJqYFxs5BXlIbaF+6/kls69umUyZytWSMTrfZzva8Juc2j1/ZNrdJi bnhe7181UtHSx/PdkSt7ue/LrLjMuL5r4oyCQZ+qN41z37dOynmW2NXmdnFH57Nhdubb5Bw/P 1q74uPgaP+seQ+51RQz/zukbsvI5FNzz+5EgtOrlkn8i2uofVKLN3ij+zVRiKc5INNRiLipOB AChH1pWjgIAAA== X-Env-Sender: tianyu.lan@intel.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1506071394!108467845!1 X-Originating-IP: [192.55.52.88] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkyLjU1LjUyLjg4ID0+IDM3NDcyNQ==\n X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13139 invoked from network); 22 Sep 2017 09:09:56 -0000 Received: from mga01.intel.com (HELO mga01.intel.com) (192.55.52.88) by server-7.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 22 Sep 2017 09:09:56 -0000 Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Sep 2017 02:09:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,427,1500966000"; d="scan'208";a="152150875" Received: from sky-ws.sh.intel.com (HELO localhost) ([10.239.48.141]) by orsmga005.jf.intel.com with ESMTP; 22 Sep 2017 02:09:51 -0700 From: Lan Tianyu To: xen-devel@lists.xen.org Date: Thu, 21 Sep 2017 23:01:48 -0400 Message-Id: <1506049330-11196-8-git-send-email-tianyu.lan@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1506049330-11196-1-git-send-email-tianyu.lan@intel.com> References: <1506049330-11196-1-git-send-email-tianyu.lan@intel.com> Cc: Lan Tianyu , kevin.tian@intel.com, sstabellini@kernel.org, wei.liu2@citrix.com, George.Dunlap@eu.citrix.com, andrew.cooper3@citrix.com, ian.jackson@eu.citrix.com, tim@xen.org, jbeulich@suse.com, roger.pau@citrix.com, Chao Gao Subject: [Xen-devel] [PATCH V3 7/29] tools/libxl: build DMAR table for a guest with one virtual VTD 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 From: Chao Gao A new logic is added to build ACPI DMAR table in tool stack for a guest with one virtual VTD and pass through it to guest via existing mechanism. If there already are ACPI tables needed to pass through, we joint the tables. Signed-off-by: Chao Gao Signed-off-by: Lan Tianyu --- v3: - build dmar and initialize related acpi_modules struct in libxl_x86_acpi.c, keeping in accordance with pvh. --- tools/libxl/libxl_x86.c | 3 +- tools/libxl/libxl_x86_acpi.c | 98 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 96 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl_x86.c b/tools/libxl/libxl_x86.c index 455f6f0..23c9a55 100644 --- a/tools/libxl/libxl_x86.c +++ b/tools/libxl/libxl_x86.c @@ -381,8 +381,7 @@ int libxl__arch_domain_finalise_hw_description(libxl__gc *gc, { int rc = 0; - if ((info->type == LIBXL_DOMAIN_TYPE_HVM) && - (info->device_model_version == LIBXL_DEVICE_MODEL_VERSION_NONE)) { + if (info->type == LIBXL_DOMAIN_TYPE_HVM) { rc = libxl__dom_load_acpi(gc, info, dom); if (rc != 0) LOGE(ERROR, "libxl_dom_load_acpi failed"); diff --git a/tools/libxl/libxl_x86_acpi.c b/tools/libxl/libxl_x86_acpi.c index 1761756..adf02f4 100644 --- a/tools/libxl/libxl_x86_acpi.c +++ b/tools/libxl/libxl_x86_acpi.c @@ -16,6 +16,7 @@ #include "libxl_arch.h" #include #include +#include "libacpi/acpi2_0.h" #include "libacpi/libacpi.h" #include @@ -161,9 +162,9 @@ out: return rc; } -int libxl__dom_load_acpi(libxl__gc *gc, - const libxl_domain_build_info *b_info, - struct xc_dom_image *dom) +static int libxl__dom_load_acpi_pvh(libxl__gc *gc, + const libxl_domain_build_info *b_info, + struct xc_dom_image *dom) { struct acpi_config config = {0}; struct libxl_acpi_ctxt libxl_ctxt; @@ -236,6 +237,97 @@ out: return rc; } +static void *acpi_memalign(struct acpi_ctxt *ctxt, uint32_t size, + uint32_t align) +{ + int ret; + void *ptr; + + ret = posix_memalign(&ptr, align, size); + if (ret != 0 || !ptr) + return NULL; + + return ptr; +} + +/* + * For hvm, we don't need build acpi in libxl. Instead, it's built in hvmloader. + * But if one hvm has virtual VTD(s), we build DMAR table for it and joint this + * table with existing content in acpi_modules in order to employ HVM + * firmware pass-through mechanism to pass-through DMAR table. + */ +static int libxl__dom_load_acpi_hvm(libxl__gc *gc, + const libxl_domain_build_info *b_info, + struct xc_dom_image *dom) +{ + struct acpi_config config = { 0 }; + struct acpi_ctxt ctxt; + void *table; + uint32_t len; + + if ((b_info->type != LIBXL_DOMAIN_TYPE_HVM) || + (b_info->device_model_version == LIBXL_DEVICE_MODEL_VERSION_NONE) || + (b_info->num_viommus != 1) || + (b_info->viommu[0].type != LIBXL_VIOMMU_TYPE_INTEL_VTD)) + return 0; + + ctxt.mem_ops.alloc = acpi_memalign; + ctxt.mem_ops.v2p = virt_to_phys; + ctxt.mem_ops.free = acpi_mem_free; + + if (libxl_defbool_val(b_info->viommu[0].intremap)) + config.iommu_intremap_supported = true; + /* x2apic is always enabled since in no case we must disable it */ + config.iommu_x2apic_supported = true; + config.iommu_base_addr = b_info->viommu[0].base_addr; + + /* IOAPIC id and PSEUDO BDF */ + config.ioapic_id = 1; + config.ioapic_bus = 0xff; + config.ioapic_devfn = 0x0; + + config.host_addr_width = 39; + + table = construct_dmar(&ctxt, &config); + if ( !table ) + return ERROR_NOMEM; + len = ((struct acpi_header *)table)->length; + + if (len) { + libxl__ptr_add(gc, table); + if (!dom->acpi_modules[0].data) { + dom->acpi_modules[0].data = table; + dom->acpi_modules[0].length = len; + } else { + /* joint tables */ + void *newdata; + + newdata = libxl__malloc(gc, len + dom->acpi_modules[0].length); + memcpy(newdata, dom->acpi_modules[0].data, + dom->acpi_modules[0].length); + memcpy(newdata + dom->acpi_modules[0].length, table, len); + + free(dom->acpi_modules[0].data); + dom->acpi_modules[0].data = newdata; + dom->acpi_modules[0].length += len; + } + } + return 0; +} + +int libxl__dom_load_acpi(libxl__gc *gc, + const libxl_domain_build_info *b_info, + struct xc_dom_image *dom) +{ + + if (b_info->type != LIBXL_DOMAIN_TYPE_HVM) + return 0; + + if (b_info->device_model_version == LIBXL_DEVICE_MODEL_VERSION_NONE) + return libxl__dom_load_acpi_pvh(gc, b_info, dom); + else + return libxl__dom_load_acpi_hvm(gc, b_info, dom); +} /* * Local variables: * mode: C