From patchwork Thu May 18 05:34:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 9733899 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 7134B601BC for ; Thu, 18 May 2017 11:42:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6099F2621D for ; Thu, 18 May 2017 11:42:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 557AA269DA; Thu, 18 May 2017 11:42:57 +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 F0FF72621D for ; Thu, 18 May 2017 11:42:56 +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 1dBJnK-0004WF-RO; Thu, 18 May 2017 11:40:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBJnK-0004Ur-5q for xen-devel@lists.xen.org; Thu, 18 May 2017 11:40:38 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 08/38-01709-5388D195; Thu, 18 May 2017 11:40:37 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDLMWRWlGSWpSXmKPExsXS1tYhomvQIRt p8PmHmcWSj4tZHBg9ju7+zRTAGMWamZeUX5HAmrH1XANTwTrJikurlRsYVwt3MXJxCAlMY5TY tnMWWxcjJ4eEAK/EkWUzWCHsAImrp46xQhR1MEq0HlzJBJJgE1CXOLF4IiOILSIgLXHt82Uwm 1lgH6PEm+eqILawgK/EvhkXwepZBFQl9n77wNLFyM7BK+AqcVMNYryCxJSH75lBbE6g6Latt1 hAbCEBF4nGhb2sExh5FzAyrGLUKE4tKkst0jUy0EsqykzPKMlNzMzRNTQw1ctNLS5OTE/NSUw q1kvOz93ECAyFegYGxh2MjbP9DjFKcjApifIeLpCNFOJLyk+pzEgszogvKs1JLT7EKMPBoSTB y9cOlBMsSk1PrUjLzAEGJUxagoNHSYRXByTNW1yQmFucmQ6ROsWoKCXO6wWSEABJZJTmwbXBI uESo6yUMC8jAwODEE9BalFuZgmq/CtGcQ5GJWHeKpApPJl5JXDTXwEtZgJa3PxAGmRxSSJCSq qBcbKwYfYjt0qZtr0tTjz9674mtecsfTTtk97z/ueKpSeuxQdoPFTNOOunsyW+WtHX9Dtn3qa vOjO2rrU8dSfz1ErjpqtaZ0yZNZfEKEgtVlTfWzjPTbJrwRSnIzsdH8Qt5Lxx8urewFdHE3be O+CTG3nM7dbHuHnPGW4cPOnNrSG5ve7tXt93ckosxRmJhlrMRcWJAGXsld1/AgAA X-Env-Sender: tianyu.lan@intel.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1495107630!79172816!1 X-Originating-IP: [134.134.136.20] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjAgPT4gMzU1MzU4\n X-StarScan-Received: X-StarScan-Version: 9.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 46377 invoked from network); 18 May 2017 11:40:32 -0000 Received: from mga02.intel.com (HELO mga02.intel.com) (134.134.136.20) by server-11.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 18 May 2017 11:40:32 -0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 May 2017 04:40:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.38,358,1491289200"; d="scan'208"; a="1132036966" Received: from sky-ws.sh.intel.com (HELO localhost) ([10.239.48.124]) by orsmga001.jf.intel.com with ESMTP; 18 May 2017 04:40:28 -0700 From: Lan Tianyu To: xen-devel@lists.xen.org Date: Thu, 18 May 2017 01:34:40 -0400 Message-Id: <1495085696-10819-11-git-send-email-tianyu.lan@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1495085696-10819-1-git-send-email-tianyu.lan@intel.com> References: <1495085696-10819-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, jbeulich@suse.com, Chao Gao Subject: [Xen-devel] [RFC PATCH V2 10/26] libxl: create vIOMMU during domain construction 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 If guest is configured to have a vIOMMU, create it during domain construction. Signed-off-by: Chao Gao Signed-off-by: Lan Tianyu --- tools/libxl/libxl_arch.h | 5 +++++ tools/libxl/libxl_arm.c | 7 +++++++ tools/libxl/libxl_create.c | 4 ++++ tools/libxl/libxl_x86.c | 24 ++++++++++++++++++++++++ 4 files changed, 40 insertions(+) diff --git a/tools/libxl/libxl_arch.h b/tools/libxl/libxl_arch.h index 5e1fc60..7f9fc9a 100644 --- a/tools/libxl/libxl_arch.h +++ b/tools/libxl/libxl_arch.h @@ -71,6 +71,11 @@ int libxl__arch_extra_memory(libxl__gc *gc, const libxl_domain_build_info *info, uint64_t *out); +_hidden +int libxl__arch_create_viommu(libxl__gc *gc, + const libxl_domain_config *d_config, + uint32_t domid); + #if defined(__i386__) || defined(__x86_64__) #define LAPIC_BASE_ADDRESS 0xfee00000 diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index d842d88..f5bf5dd 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -1065,6 +1065,13 @@ void libxl__arch_domain_build_info_acpi_setdefault( libxl_defbool_setdefault(&b_info->acpi, false); } +int libxl__arch_create_viommu(libxl__gc *gc, + const libxl_domain_config *d_config, + uint32_t domid) +{ + return 0; +} + /* * Local variables: * mode: C diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index bffbc45..fd9bfb8 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -557,6 +557,10 @@ int libxl__domain_make(libxl__gc *gc, libxl_domain_config *d_config, } } + rc = libxl__arch_create_viommu(gc, d_config, *domid); + if (rc < 0) + goto out; + rc = libxl__arch_domain_save_config(gc, d_config, xc_config); if (rc < 0) goto out; diff --git a/tools/libxl/libxl_x86.c b/tools/libxl/libxl_x86.c index 455f6f0..819ee0a 100644 --- a/tools/libxl/libxl_x86.c +++ b/tools/libxl/libxl_x86.c @@ -2,6 +2,7 @@ #include "libxl_arch.h" #include +#include int libxl__arch_domain_prepare_config(libxl__gc *gc, libxl_domain_config *d_config, @@ -587,6 +588,29 @@ void libxl__arch_domain_build_info_acpi_setdefault( libxl_defbool_setdefault(&b_info->acpi, true); } +int libxl__arch_create_viommu(libxl__gc *gc, + const libxl_domain_config *d_config, + uint32_t domid) +{ + int rc = 0; + libxl_ctx *ctx = libxl__gc_owner(gc); + libxl_viommu_info viommu = d_config->b_info.u.hvm.viommu; + + if (viommu.type == VIOMMU_TYPE_INTEL_VTD) { + uint32_t id; + uint64_t cap; + + rc = xc_viommu_query_cap(ctx->xch, domid, viommu.type, &cap); + if (rc || ((cap & viommu.cap) != cap)) + return rc; + + rc = xc_viommu_create(ctx->xch, domid, viommu.type, + viommu.base_addr, viommu.length, viommu.cap, &id); + } + + return rc; +} + /* * Local variables: * mode: C