From patchwork Tue Mar 11 15:49:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 26041 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f198.google.com (mail-pd0-f198.google.com [209.85.192.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CBE0220068 for ; Tue, 11 Mar 2014 15:59:04 +0000 (UTC) Received: by mail-pd0-f198.google.com with SMTP id fp1sf21181100pdb.9 for ; Tue, 11 Mar 2014 08:59:04 -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=mdhIwX7ZVksn33zb0vz6N4ludi/5OQGKvm2YBDRZttU=; b=P9c7tPVsNwZh3p1893Pubvr58Nzfv1KAwMILvviEUFGsqoK1rd1T0Wocx4c6uM+aun WDN6GI6HQEPpgQfBcvtC4dyinPHMc7kbxariEZRm2qi9pjUancQAxksejx6O1Uoc6zXZ QyUFVCWoysYI+WHtCYS2TGIuyCKUn2OMlpXodfMCPzxB1Qu/hPD3PcfKaDLWdN5Ykr5V 9AliqNFCTKwpqYml/rrBIJxQznZcCVD+7OQCmg+EqM2lPrrBDWJZrs8ExMxIxut4YHsN RlToAa100tzGHh9beojb8JSzUVEveF2vF5Krc9mLDP/wq+Fw726pITlj9qx9kKWyudTk fwXw== X-Gm-Message-State: ALoCoQkSNdLAnTwhmHeu8hTVZee1qG9LYPs9bAVG62HIWqK/iRSXsnXmX3VhZOvSd5n7f/AMCZnS X-Received: by 10.66.102.36 with SMTP id fl4mr16688055pab.20.1394553080407; Tue, 11 Mar 2014 08:51:20 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.38.47 with SMTP id s44ls2665730qgs.70.gmail; Tue, 11 Mar 2014 08:51:20 -0700 (PDT) X-Received: by 10.220.92.135 with SMTP id r7mr28010803vcm.11.1394553080255; Tue, 11 Mar 2014 08:51:20 -0700 (PDT) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id x7si5877494vel.114.2014.03.11.08.51.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Mar 2014 08:51:20 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.175; Received: by mail-ve0-f175.google.com with SMTP id oz11so8679220veb.6 for ; Tue, 11 Mar 2014 08:51:20 -0700 (PDT) X-Received: by 10.220.192.71 with SMTP id dp7mr146020vcb.45.1394553080128; Tue, 11 Mar 2014 08:51:20 -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.78.9 with SMTP id i9csp215024vck; Tue, 11 Mar 2014 08:51:19 -0700 (PDT) X-Received: by 10.224.127.129 with SMTP id g1mr48812822qas.22.1394553079514; Tue, 11 Mar 2014 08:51:19 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id jj3si4487044qcb.9.2014.03.11.08.51.18 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 11 Mar 2014 08:51:19 -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 1WNOwm-0006wo-HG; Tue, 11 Mar 2014 15:50:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNOwl-0006v0-Im for xen-devel@lists.xenproject.org; Tue, 11 Mar 2014 15:50:27 +0000 Received: from [85.158.143.35:48483] by server-1.bemta-4.messagelabs.com id AB/30-09853-2C03F135; Tue, 11 Mar 2014 15:50:26 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-16.tower-21.messagelabs.com!1394553025!1267121!1 X-Originating-IP: [74.125.82.44] 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 3175 invoked from network); 11 Mar 2014 15:50:25 -0000 Received: from mail-wg0-f44.google.com (HELO mail-wg0-f44.google.com) (74.125.82.44) by server-16.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 11 Mar 2014 15:50:25 -0000 Received: by mail-wg0-f44.google.com with SMTP id m15so7841746wgh.3 for ; Tue, 11 Mar 2014 08:50:25 -0700 (PDT) X-Received: by 10.194.204.199 with SMTP id la7mr33893391wjc.4.1394553025501; Tue, 11 Mar 2014 08:50:25 -0700 (PDT) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id bm8sm62454537wjc.12.2014.03.11.08.50.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Mar 2014 08:50:23 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Tue, 11 Mar 2014 15:49:54 +0000 Message-Id: <1394552999-14171-9-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1394552999-14171-1-git-send-email-julien.grall@linaro.org> References: <1394552999-14171-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 v3 08/13] 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.128.175 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 - next_assigned: Pointer to the next device assigned to the same domain Signed-off-by: Julien Grall Cc: Xiantao Zhang Cc: Jan Beulich Acked-by: Jan Beulich --- 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 | 106 +++++++++++++++++++++++++++++++++ xen/include/xen/device_tree.h | 14 +++++ xen/include/xen/hvm/iommu.h | 6 ++ xen/include/xen/iommu.h | 16 +++++ 6 files changed, 147 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 564f2bb..7c6b683 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->next_assigned); + 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..7384e73 --- /dev/null +++ b/xen/drivers/passthrough/device_tree.c @@ -0,0 +1,106 @@ +/* + * xen/drivers/passthrough/arm/device_tree.c + * + * Code to passthrough device tree node to a guest + * + * 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->next_assigned) ) + goto fail; + + rc = hd->platform_ops->assign_dt_device(d, dev); + + if ( rc ) + goto fail; + + list_add(&dev->next_assigned, &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, dom0, dev); + if ( rc ) + goto fail; + + dt_device_set_used_by(dev, dom0->domain_id); + + list_del(&dev->next_assigned); + +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, next_assigned) + { + 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 d429e60..2aae047 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 @@ -110,6 +111,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 next_assigned; }; #define MAX_PHANDLE_ARGS 16 @@ -325,6 +329,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 f556a7e..56f6c5c 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -82,6 +82,16 @@ bool_t pt_irq_need_timer(uint32_t flags); #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 */ + #ifdef HAS_PCI struct msi_desc; struct msi_msg; @@ -103,6 +113,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);