From patchwork Tue Apr 22 13:14:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 28808 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f200.google.com (mail-ob0-f200.google.com [209.85.214.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 884F7203AC for ; Tue, 22 Apr 2014 13:16:36 +0000 (UTC) Received: by mail-ob0-f200.google.com with SMTP id vb8sf28397998obc.11 for ; Tue, 22 Apr 2014 06:16:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:cc:subject:precedence:list-id:list-unsubscribe:list-post :list-help:list-subscribe:mime-version:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :list-archive:content-type:content-transfer-encoding; bh=CsFfiXdnnfA2rBhR1E6m+3fc/Nt/euHDGDNjh6g8s30=; b=WEVLfUKzIJ6VUcjZHTfDdSa2ScgTG+uq4ppGzebnj7GVJS3m6dYQrPYkgs4p9xBLCW 4QOM9oN6PhZlCc3XJxMSlgb2XZmC59INwQLQ7ud1godJSNUliSQd02XLW7SfwGVN9Twf nuDTMnoz+dwyeY44ABcD7bb2JL2eWHYMd7iQfWZpOIN5jrxX5NfMMZav8XtuESo/6wmW I+TTobWTzXk5HnCo6HSMzjPKzicZKuy5qm4jprFo96BwP8prtRqW1YXq6IfoAHrR6bNB thifUT8XRKgDYWMaCkU6wtEdAiB/I22hcL9QQav9bHoFeJgiPgz3pyydpMhG5w2BQmDT HUbA== X-Gm-Message-State: ALoCoQl4J2chNo7ODkhy8AMzeDRRZfR00DwVlS1EgCG3bhl/emRRWt5qdoIkc2PY2taBLLYsX967 X-Received: by 10.42.146.134 with SMTP id j6mr16921615icv.15.1398172596028; Tue, 22 Apr 2014 06:16:36 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.26.119 with SMTP id 110ls76840qgu.20.gmail; Tue, 22 Apr 2014 06:16:35 -0700 (PDT) X-Received: by 10.52.170.16 with SMTP id ai16mr31151vdc.69.1398172595663; Tue, 22 Apr 2014 06:16:35 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id rx9si6888095vcb.63.2014.04.22.06.16.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 22 Apr 2014 06:16:35 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id hr9so1242724vcb.15 for ; Tue, 22 Apr 2014 06:16:35 -0700 (PDT) X-Received: by 10.220.44.20 with SMTP id y20mr36087vce.60.1398172595531; Tue, 22 Apr 2014 06:16:35 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp23879vcb; Tue, 22 Apr 2014 06:16:35 -0700 (PDT) X-Received: by 10.140.82.7 with SMTP id g7mr45103473qgd.74.1398172594994; Tue, 22 Apr 2014 06:16:34 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id p8si5971497qag.122.2014.04.22.06.16.34 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 22 Apr 2014 06:16:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WcaXj-0006G3-Jv; Tue, 22 Apr 2014 13:15:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WcaXX-00067V-0N for xen-devel@lists.xenproject.org; Tue, 22 Apr 2014 13:15:11 +0000 Received: from [85.158.137.68:53934] by server-16.bemta-3.messagelabs.com id 86/34-13481-E5B66535; Tue, 22 Apr 2014 13:15:10 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-4.tower-31.messagelabs.com!1398172508!8284908!1 X-Originating-IP: [74.125.83.50] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23780 invoked from network); 22 Apr 2014 13:15:09 -0000 Received: from mail-ee0-f50.google.com (HELO mail-ee0-f50.google.com) (74.125.83.50) by server-4.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 22 Apr 2014 13:15:09 -0000 Received: by mail-ee0-f50.google.com with SMTP id c13so4600783eek.37 for ; Tue, 22 Apr 2014 06:15:08 -0700 (PDT) X-Received: by 10.14.7.137 with SMTP id 9mr2152486eep.114.1398172508621; Tue, 22 Apr 2014 06:15:08 -0700 (PDT) Received: from belegaer.uk.xensource.com ([185.25.64.249]) by mx.google.com with ESMTPSA id 45sm112969867eeh.9.2014.04.22.06.15.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Apr 2014 06:15:07 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Tue, 22 Apr 2014 14:14:28 +0100 Message-Id: <1398172475-27873-15-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1398172475-27873-1-git-send-email-julien.grall@linaro.org> References: <1398172475-27873-1-git-send-email-julien.grall@linaro.org> Cc: ian.campbell@citrix.com, Julien Grall , tim@xen.org, stefano.stabellini@citrix.com, Jan Beulich , Xiantao Zhang Subject: [Xen-devel] [PATCH v4 14/21] xen/passthrough: iommu: Basic support of device tree assignment X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: Add IOMMU helpers to support device tree assignment/deassignment. This patch introduces 2 new fields in the dt_device_node: - is_protected: Does the device is protected by an IOMMU - domain_list: Pointer to the next device assigned to the same domain This commit contains only support to protected a device with DOM0. Device passthrough to another guest won't work out-of-box. Signed-off-by: Julien Grall Acked-by: Jan Beulich [for existing files] Cc: Xiantao Zhang --- Changes in v4: - Use hardware_domain instead of dom0 (recently changes in Xen) - iommu_deassign_dt_device: add back to dom0 list the device - add comments about the current support of DT device passthrough - update commit message - rename next_assigned to domain_list Changes in v3: - Remove iommu_dt_domain_{init,destroy} call in common code. Let architecture code to call them - Fix indentation in xen/include/xen/hvm/iommu.h Changes in v2: - Patch added --- xen/common/device_tree.c | 4 ++ xen/drivers/passthrough/Makefile | 1 + xen/drivers/passthrough/device_tree.c | 111 +++++++++++++++++++++++++++++++++ xen/include/xen/device_tree.h | 14 +++++ xen/include/xen/hvm/iommu.h | 6 ++ xen/include/xen/iommu.h | 16 +++++ 6 files changed, 152 insertions(+) create mode 100644 xen/drivers/passthrough/device_tree.c diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 6e8e263..f0b17a3 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -1695,6 +1695,10 @@ static unsigned long __init unflatten_dt_node(const void *fdt, np->full_name = ((char *)np) + sizeof(struct dt_device_node); /* By default dom0 owns the device */ np->used_by = 0; + /* By default the device is not protected */ + np->is_protected = false; + INIT_LIST_HEAD(&np->domain_list); + if ( new_format ) { char *fn = np->full_name; diff --git a/xen/drivers/passthrough/Makefile b/xen/drivers/passthrough/Makefile index 6e08f89..5a0a35e 100644 --- a/xen/drivers/passthrough/Makefile +++ b/xen/drivers/passthrough/Makefile @@ -5,3 +5,4 @@ subdir-$(x86_64) += x86 obj-y += iommu.o obj-$(x86) += io.o obj-$(HAS_PCI) += pci.o +obj-$(HAS_DEVICE_TREE) += device_tree.o diff --git a/xen/drivers/passthrough/device_tree.c b/xen/drivers/passthrough/device_tree.c new file mode 100644 index 0000000..ae05b19 --- /dev/null +++ b/xen/drivers/passthrough/device_tree.c @@ -0,0 +1,111 @@ +/* + * xen/drivers/passthrough/arm/device_tree.c + * + * Code to passthrough device tree node to a guest + * + * TODO: This contains only necessary code to protected device with + * dom0. It will need some updates when device passthrough will be + * added. + * + * Julien Grall + * Copyright (c) 2014 Linaro Limited. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include + +static spinlock_t dtdevs_lock = SPIN_LOCK_UNLOCKED; + +int iommu_assign_dt_device(struct domain *d, struct dt_device_node *dev) +{ + int rc = -EBUSY; + struct hvm_iommu *hd = domain_hvm_iommu(d); + + if ( !iommu_enabled || !hd->platform_ops ) + return -EINVAL; + + if ( !dt_device_is_protected(dev) ) + return -EINVAL; + + spin_lock(&dtdevs_lock); + + if ( !list_empty(&dev->domain_list) ) + goto fail; + + rc = hd->platform_ops->assign_dt_device(d, dev); + + if ( rc ) + goto fail; + + list_add(&dev->domain_list, &hd->dt_devices); + dt_device_set_used_by(dev, d->domain_id); + +fail: + spin_unlock(&dtdevs_lock); + + return rc; +} + +int iommu_deassign_dt_device(struct domain *d, struct dt_device_node *dev) +{ + struct hvm_iommu *hd = domain_hvm_iommu(d); + int rc; + + if ( !iommu_enabled || !hd->platform_ops ) + return -EINVAL; + + if ( !dt_device_is_protected(dev) ) + return -EINVAL; + + spin_lock(&dtdevs_lock); + + rc = hd->platform_ops->reassign_dt_device(d, hardware_domain, dev); + if ( rc ) + goto fail; + + list_del(&dev->domain_list); + + dt_device_set_used_by(dev, hardware_domain->domain_id); + list_add(&dev->domain_list, &domain_hvm_iommu(hardware_domain)->dt_devices); + +fail: + spin_unlock(&dtdevs_lock); + + return rc; +} + +int iommu_dt_domain_init(struct domain *d) +{ + struct hvm_iommu *hd = domain_hvm_iommu(d); + + INIT_LIST_HEAD(&hd->dt_devices); + + return 0; +} + +void iommu_dt_domain_destroy(struct domain *d) +{ + struct hvm_iommu *hd = domain_hvm_iommu(d); + struct dt_device_node *dev, *_dev; + int rc; + + list_for_each_entry_safe(dev, _dev, &hd->dt_devices, domain_list) + { + rc = iommu_deassign_dt_device(d, dev); + if ( rc ) + dprintk(XENLOG_ERR, "Failed to deassign %s in domain %u\n", + dt_node_full_name(dev), d->domain_id); + } +} diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 5542958..ded7a31 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -16,6 +16,7 @@ #include #include #include +#include #define DEVICE_TREE_MAX_DEPTH 16 @@ -111,6 +112,9 @@ struct dt_device_node { struct dt_device_node *next; /* TODO: Remove it. Only use to know the last children */ struct dt_device_node *allnext; + /* IOMMU specific fields */ + bool is_protected; /* Tell if the device is protected by an IOMMU */ + struct list_head domain_list; }; #define MAX_PHANDLE_ARGS 16 @@ -326,6 +330,16 @@ static inline domid_t dt_device_used_by(const struct dt_device_node *device) return device->used_by; } +static inline void dt_device_set_protected(struct dt_device_node *device) +{ + device->is_protected = true; +} + +static inline bool dt_device_is_protected(const struct dt_device_node *device) +{ + return device->is_protected; +} + static inline bool_t dt_property_name_is_equal(const struct dt_property *pp, const char *name) { diff --git a/xen/include/xen/hvm/iommu.h b/xen/include/xen/hvm/iommu.h index f8f8a93..1259e16 100644 --- a/xen/include/xen/hvm/iommu.h +++ b/xen/include/xen/hvm/iommu.h @@ -21,6 +21,7 @@ #define __XEN_HVM_IOMMU_H__ #include +#include #include struct hvm_iommu { @@ -28,6 +29,11 @@ struct hvm_iommu { /* iommu_ops */ const struct iommu_ops *platform_ops; + +#ifdef HAS_DEVICE_TREE + /* List of DT devices assigned to this domain */ + struct list_head dt_devices; +#endif }; #endif /* __XEN_HVM_IOMMU_H__ */ diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index 9ffc92a..e119379 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -90,6 +90,16 @@ void iommu_read_msi_from_ire(struct msi_desc *msi_desc, struct msi_msg *msg); #define PT_IRQ_TIME_OUT MILLISECS(8) #endif /* HAS_PCI */ +#ifdef HAS_DEVICE_TREE +#include + +int iommu_assign_dt_device(struct domain *d, struct dt_device_node *dev); +int iommu_deassign_dt_device(struct domain *d, struct dt_device_node *dev); +int iommu_dt_domain_init(struct domain *d); +void iommu_dt_domain_destroy(struct domain *d); + +#endif /* HAS_DEVICE_TREE */ + struct page_info; struct iommu_ops { @@ -106,6 +116,12 @@ struct iommu_ops { int (*update_ire_from_msi)(struct msi_desc *msi_desc, struct msi_msg *msg); void (*read_msi_from_ire)(struct msi_desc *msi_desc, struct msi_msg *msg); #endif /* HAS_PCI */ +#ifdef HAS_DEVICE_TREE + int (*assign_dt_device)(struct domain *d, const struct dt_device_node *dev); + int (*reassign_dt_device)(struct domain *s, struct domain *t, + const struct dt_device_node *dev); +#endif + void (*teardown)(struct domain *d); int (*map_page)(struct domain *d, unsigned long gfn, unsigned long mfn, unsigned int flags);