From patchwork Wed Aug 9 20:34:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 9892649 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 50D4B60350 for ; Thu, 10 Aug 2017 02:43:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 37C77268AE for ; Thu, 10 Aug 2017 02:43:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2CA2E28173; Thu, 10 Aug 2017 02:43:58 +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 AEA17268AE for ; Thu, 10 Aug 2017 02:43:57 +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 1dfdPM-0000zc-Fl; Thu, 10 Aug 2017 02:41:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dfdPL-0000zL-7Q for xen-devel@lists.xen.org; Thu, 10 Aug 2017 02:41:11 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 10/52-01994-6C7CB895; Thu, 10 Aug 2017 02:41:10 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpkkeJIrShJLcpLzFFi42I5YG4Sq3v0eHe kwac/ehZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8ajDReYCq7pVyy4epCtgfGlUhcjF4eQwHRG iVvf9zN2MXJySAjwShxZNoMVwvaX+LvrOTtEUQejxIZVfSwgCTYBdYkTiyeCNYgISEtc+3yZE aSIWeAUo8SP+1vYQBLCAoESiy7eBStiEVCV2NbwlbmLkYODV8BFYuXJEIgFChJTHr5nBrE5BV wlpm7ZygRiCwGVrFs+jXECI+8CRoZVjBrFqUVlqUW6RkZ6SUWZ6RkluYmZObqGBqZ6uanFxYn pqTmJScV6yfm5mxiBAVHPwMC4g3FPu98hRkkOJiVR3o6G7kghvqT8lMqMxOKM+KLSnNTiQ4wy HBxKErzdx4BygkWp6akVaZk5wNCESUtw8CiJ8JaBpHmLCxJzizPTIVKnGI05Xk34/42Jo+n7x +9MQix5+XmpUuK8uiClAiClGaV5cINgMXOJUVZKmJeRgYFBiKcgtSg3swRV/hWjOAejkjDvr6 NAU3gy80rg9r0COoUJ6JQI306QU0oSEVJSDYxWbUm73Ga9TprXsdCQzcuwVX3ePaW96XNev7o 0Z59vc1ns9pZTq2NuB3VZmbSIVQb7iz74tXyPm3XcxWm2+2/d3c10KLlu0esExVCvjyluBj9E VC/+2ugplbRsd5L3DP8ZFycLPHEL3juT2//mHPnSaYtXr057W63MHV3mfe1obuNPu1C3PD0ll uKMREMt5qLiRAArOWAqlAIAAA== X-Env-Sender: tianyu.lan@intel.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1502332867!103723733!1 X-Originating-IP: [192.55.52.93] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkyLjU1LjUyLjkzID0+IDMyNDY2NQ==\n X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28357 invoked from network); 10 Aug 2017 02:41:09 -0000 Received: from mga11.intel.com (HELO mga11.intel.com) (192.55.52.93) by server-7.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 10 Aug 2017 02:41:09 -0000 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Aug 2017 19:41:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,349,1498546800"; d="scan'208";a="298208981" Received: from sky-ws.sh.intel.com (HELO localhost) ([10.239.48.141]) by fmsmga004.fm.intel.com with ESMTP; 09 Aug 2017 19:41:04 -0700 From: Lan Tianyu To: xen-devel@lists.xen.org Date: Wed, 9 Aug 2017 16:34:02 -0400 Message-Id: <1502310866-10450-2-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@intel.com Subject: [Xen-devel] [PATCH V2 1/25] DOMCTL: Introduce new DOMCTL commands for vIOMMU support 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 This patch is to introduce create, destroy and query capabilities command for vIOMMU. vIOMMU layer will deal with requests and call arch vIOMMU ops. Signed-off-by: Lan Tianyu --- xen/common/domctl.c | 3 +++ xen/common/viommu.c | 43 +++++++++++++++++++++++++++++++++++++ xen/include/public/domctl.h | 52 +++++++++++++++++++++++++++++++++++++++++++++ xen/include/xen/viommu.h | 6 ++++++ 4 files changed, 104 insertions(+) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index d80488b..01c3024 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -1144,6 +1144,9 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) if ( !ret ) copyback = 1; break; + case XEN_DOMCTL_viommu_op: + ret = viommu_domctl(d, &op->u.viommu_op, ©back); + break; default: ret = arch_do_domctl(op, d, u_domctl); diff --git a/xen/common/viommu.c b/xen/common/viommu.c index 6874d9f..a4d004d 100644 --- a/xen/common/viommu.c +++ b/xen/common/viommu.c @@ -148,6 +148,49 @@ static u64 viommu_query_caps(struct domain *d, u64 type) return viommu_type->ops->query_caps(d); } +int viommu_domctl(struct domain *d, struct xen_domctl_viommu_op *op, + bool *need_copy) +{ + int rc = -EINVAL, ret; + + if ( !viommu_enabled() ) + return rc; + + switch ( op->cmd ) + { + case XEN_DOMCTL_create_viommu: + ret = viommu_create(d, op->u.create_viommu.viommu_type, + op->u.create_viommu.base_address, + op->u.create_viommu.length, + op->u.create_viommu.capabilities); + if ( ret >= 0 ) { + op->u.create_viommu.viommu_id = ret; + *need_copy = true; + rc = 0; /* return 0 if success */ + } + break; + + case XEN_DOMCTL_destroy_viommu: + rc = viommu_destroy(d, op->u.destroy_viommu.viommu_id); + break; + + case XEN_DOMCTL_query_viommu_caps: + ret = viommu_query_caps(d, op->u.query_caps.viommu_type); + if ( ret >= 0 ) + { + op->u.query_caps.capabilities = ret; + rc = 0; + } + *need_copy = true; + break; + + default: + break; + } + + return rc; +} + int __init viommu_setup(void) { INIT_LIST_HEAD(&type_list); diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index ff39762..4b10f26 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -1149,6 +1149,56 @@ struct xen_domctl_psr_cat_op { typedef struct xen_domctl_psr_cat_op xen_domctl_psr_cat_op_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_psr_cat_op_t); +/* vIOMMU helper + * + * vIOMMU interface can be used to create/destroy vIOMMU and + * query vIOMMU capabilities. + */ + +/* vIOMMU type - specify vendor vIOMMU device model */ +#define VIOMMU_TYPE_INTEL_VTD (1u << 0) + +/* vIOMMU capabilities */ +#define VIOMMU_CAP_IRQ_REMAPPING (1u << 0) + +struct xen_domctl_viommu_op { + uint32_t cmd; +#define XEN_DOMCTL_create_viommu 0 +#define XEN_DOMCTL_destroy_viommu 1 +#define XEN_DOMCTL_query_viommu_caps 2 + union { + struct { + /* IN - vIOMMU type */ + uint64_t viommu_type; + /* + * IN - MMIO base address of vIOMMU. vIOMMU device models + * are in charge of to check base_address and length. + */ + uint64_t base_address; + /* IN - Length of MMIO region */ + uint64_t length; + /* IN - Capabilities with which we want to create */ + uint64_t capabilities; + /* OUT - vIOMMU identity */ + uint32_t viommu_id; + } create_viommu; + + struct { + /* IN - vIOMMU identity */ + uint32_t viommu_id; + } destroy_viommu; + + struct { + /* IN - vIOMMU type */ + uint64_t viommu_type; + /* OUT - vIOMMU Capabilities */ + uint64_t capabilities; + } query_caps; + } u; +}; +typedef struct xen_domctl_viommu_op xen_domctl_viommu_op; +DEFINE_XEN_GUEST_HANDLE(xen_domctl_viommu_op); + struct xen_domctl { uint32_t cmd; #define XEN_DOMCTL_createdomain 1 @@ -1226,6 +1276,7 @@ struct xen_domctl { #define XEN_DOMCTL_monitor_op 77 #define XEN_DOMCTL_psr_cat_op 78 #define XEN_DOMCTL_soft_reset 79 +#define XEN_DOMCTL_viommu_op 80 #define XEN_DOMCTL_gdbsx_guestmemio 1000 #define XEN_DOMCTL_gdbsx_pausevcpu 1001 #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 @@ -1288,6 +1339,7 @@ struct xen_domctl { struct xen_domctl_psr_cmt_op psr_cmt_op; struct xen_domctl_monitor_op monitor_op; struct xen_domctl_psr_cat_op psr_cat_op; + struct xen_domctl_viommu_op viommu_op; uint8_t pad[128]; } u; }; diff --git a/xen/include/xen/viommu.h b/xen/include/xen/viommu.h index 506ea54..527afb1 100644 --- a/xen/include/xen/viommu.h +++ b/xen/include/xen/viommu.h @@ -49,6 +49,8 @@ extern bool_t opt_viommu; static inline bool viommu_enabled(void) { return opt_viommu; } int viommu_init_domain(struct domain *d); int viommu_register_type(u64 type, struct viommu_ops * ops); +int viommu_domctl(struct domain *d, struct xen_domctl_viommu_op *op, + bool_t *need_copy); int viommu_setup(void); #else static inline int viommu_init_domain(struct domain *d) { return 0; } @@ -56,6 +58,10 @@ static inline int viommu_register_type(u64 type, struct viommu_ops * ops) { return 0; } static inline int __init viommu_setup(void) { return 0; } static inline bool viommu_enabled(void) { return false; } +static inline int viommu_domctl(struct domain *d, + struct xen_domctl_viommu_op *op, + bool *need_copy) +{ return -ENODEV }; #endif #endif /* __XEN_VIOMMU_H__ */