From patchwork Wed Aug 9 20:34:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 9892655 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 2493360236 for ; Thu, 10 Aug 2017 02:44:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0969627CF9 for ; Thu, 10 Aug 2017 02:44:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F26D828384; Thu, 10 Aug 2017 02:44:03 +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 910D327CF9 for ; Thu, 10 Aug 2017 02:44:03 +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 1dfdPf-00017q-H9; Thu, 10 Aug 2017 02:41:31 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dfdPe-000175-Sy for xen-devel@lists.xen.org; Thu, 10 Aug 2017 02:41:30 +0000 Received: from [193.109.254.147] by server-4.bemta-6.messagelabs.com id B0/40-02962-AD7CB895; Thu, 10 Aug 2017 02:41:30 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDLMWRWlGSWpSXmKPExsVywNykQvfm8e5 Ig/2NchZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8bTeyfYCh6rVqy7tImxgXGXdBcjF4eQwHRG iebf81i7GDk5JAR4JY4smwFlB0j8ObCdEaKog1Hi27Y/7CAJNgF1iROLJzKC2CIC0hLXPl8GK 2IWuMoocXrbfGaQhLBAuMTdE0/AJrEIqEpMWb2WDcTmFXCV+LSmgQ1ig4LElIfvweo5geJTt2 xlArGFBFwk1i2fxjiBkXcBI8MqRo3i1KKy1CJdQ0O9pKLM9IyS3MTMHF1DAzO93NTi4sT01Jz EpGK95PzcTYzAkGAAgh2Mn5YFHGKU5GBSEuXtaOiOFOJLyk+pzEgszogvKs1JLT7EKMPBoSTB 230MKCdYlJqeWpGWmQMMTpi0BAePkgivEUiat7ggMbc4Mx0idYpRl+PVhP/fmIRY8vLzUqXEe XVBigRAijJK8+BGwCLlEqOslDAvI9BRQjwFqUW5mSWo8q8YxTkYlYR5K0Cm8GTmlcBtegV0BB PQERG+nSBHlCQipKQaGJ2fNxv/nO74K0LycYcC95qLkyZZxf5fKFTgP9fmSXvlfdPoueLW3gk zN6yyvaLZpmJzuM1xd1P4xj396+2mNkqxr5tyf0aT1xrmihPvqhad7W3iDBXtLjnFM0m7/+tq luNKLndmcm1h15zMUSdqHmdhIO1WEF3IWcPJrLJwS7PZuh9RRcUvlViKMxINtZiLihMBXAzrf o8CAAA= X-Env-Sender: tianyu.lan@intel.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1502332887!111225500!1 X-Originating-IP: [192.55.52.120] X-SpamReason: No, hits=0.8 required=7.0 tests=DATE_IN_PAST_06_12 X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 45716 invoked from network); 10 Aug 2017 02:41:29 -0000 Received: from mga04.intel.com (HELO mga04.intel.com) (192.55.52.120) by server-9.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 10 Aug 2017 02:41:29 -0000 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Aug 2017 19:41:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.41,349,1498546800"; d="scan'208"; a="1180964748" Received: from sky-ws.sh.intel.com (HELO localhost) ([10.239.48.141]) by fmsmga001.fm.intel.com with ESMTP; 09 Aug 2017 19:41:25 -0700 From: Lan Tianyu To: xen-devel@lists.xen.org Date: Wed, 9 Aug 2017 16:34:10 -0400 Message-Id: <1502310866-10450-10-git-send-email-tianyu.lan@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1502310866-10450-1-git-send-email-tianyu.lan@intel.com> References: <1502310866-10450-1-git-send-email-tianyu.lan@intel.com> Cc: Lan Tianyu , kevin.tian@intel.com, wei.liu2@citrix.com, andrew.cooper3@citrix.com, ian.jackson@eu.citrix.com, julien.grall@arm.com, jbeulich@suse.com, Chao Gao Subject: [Xen-devel] [PATCH V2 9/25] 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 --- tools/libxl/libxl_arch.h | 5 +++++ tools/libxl/libxl_dom.c | 36 +++++++++++++++++++++++++++++++++ tools/libxl/libxl_x86_acpi.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+) diff --git a/tools/libxl/libxl_arch.h b/tools/libxl/libxl_arch.h index 5e1fc60..d8ddd60 100644 --- a/tools/libxl/libxl_arch.h +++ b/tools/libxl/libxl_arch.h @@ -78,6 +78,11 @@ int libxl__arch_extra_memory(libxl__gc *gc, int libxl__dom_load_acpi(libxl__gc *gc, const libxl_domain_build_info *b_info, struct xc_dom_image *dom); + +int libxl__dom_build_dmar(libxl__gc *gc, + const libxl_domain_build_info *b_info, + struct xc_dom_image *dom, + void **data, int *len); #endif #endif diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index f54fd49..94c9196 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1060,6 +1060,42 @@ static int libxl__domain_firmware(libxl__gc *gc, } } + /* + * If a guest has one virtual VTD, 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. + */ + if (info->viommu.type == LIBXL_VIOMMU_TYPE_INTEL_VTD) { + datalen = 0; + e = libxl__dom_build_dmar(gc, info, dom, &data, &datalen); + if (e) { + LOGEV(ERROR, e, "failed to build DMAR table"); + rc = ERROR_FAIL; + goto out; + } + if (datalen) { + libxl__ptr_add(gc, data); + if (!dom->acpi_modules[0].data) { + dom->acpi_modules[0].data = data; + dom->acpi_modules[0].length = (uint32_t)datalen; + } else { + /* joint tables */ + void *newdata; + newdata = malloc(datalen + dom->acpi_modules[0].length); + if (!newdata) { + LOGE(ERROR, "failed to joint DMAR table to acpi modules"); + rc = ERROR_FAIL; + goto out; + } + memcpy(newdata, dom->acpi_modules[0].data, + dom->acpi_modules[0].length); + memcpy(newdata + dom->acpi_modules[0].length, data, datalen); + dom->acpi_modules[0].data = newdata; + dom->acpi_modules[0].length += (uint32_t)datalen; + } + } + } + return 0; out: assert(rc != 0); diff --git a/tools/libxl/libxl_x86_acpi.c b/tools/libxl/libxl_x86_acpi.c index c0a6e32..1fa97ff 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 @@ -236,6 +237,53 @@ 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; +} + +int libxl__dom_build_dmar(libxl__gc *gc, + const libxl_domain_build_info *b_info, + struct xc_dom_image *dom, + void **data, int *len) +{ + struct acpi_config config = { 0 }; + struct acpi_ctxt ctxt; + void *table; + + if ((b_info->type != LIBXL_DOMAIN_TYPE_HVM) || + (b_info->device_model_version == LIBXL_DEVICE_MODEL_VERSION_NONE) || + (b_info->viommu.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.intremap)) + config.iommu_intremap_supported = true; + if (libxl_defbool_val(b_info->viommu.u.intel_vtd.x2apic)) + config.iommu_x2apic_supported = true; + config.iommu_base_addr = b_info->viommu.base_addr; + + config.ioapic_id = 1; /* the IOAPIC_ID used by HVM */ + + table = construct_dmar(&ctxt, &config); + if ( !table ) + return ERROR_NOMEM; + *data = table; + *len = ((struct acpi_header *)table)->length; + return 0; +} + /* * Local variables: * mode: C