From patchwork Tue Sep 24 15:30:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Tyshchenko X-Patchwork-Id: 11159129 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 20CA417EE for ; Tue, 24 Sep 2019 15:32:48 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E55EC217D7 for ; Tue, 24 Sep 2019 15:32:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="pAhklr1x" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E55EC217D7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iCmml-00082S-U5; Tue, 24 Sep 2019 15:31:27 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iCmmj-00081e-Vh for xen-devel@lists.xenproject.org; Tue, 24 Sep 2019 15:31:26 +0000 X-Inumbo-ID: 4e0bfc04-dee0-11e9-bf31-bc764e2007e4 Received: from mail-lf1-x141.google.com (unknown [2a00:1450:4864:20::141]) by localhost (Halon) with ESMTPS id 4e0bfc04-dee0-11e9-bf31-bc764e2007e4; Tue, 24 Sep 2019 15:30:58 +0000 (UTC) Received: by mail-lf1-x141.google.com with SMTP id u3so1739657lfl.10 for ; Tue, 24 Sep 2019 08:30:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fx31G+xE30gvwkp/PyhDSOqp0zx0pQGOVGh0hjTeTJQ=; b=pAhklr1xt+wXGNd+UeI1wUFdonF0bkm/xD7OXtEBWfcQv+Pw63rDEkpXKvFdOc+HSQ tusC46G163cMTrPe3K5Udtex0qoG33XfOkPzQ6DDFbz3ZWdXcC8tXYVf/RzLvWWgysEA r1t/W/7LuNuVTn0F6/n7TkMA6fynvAr5ngijtDsSjYJFL8uAW2g/YzkvlHi4q66jgYHh Vw+QgPDO5bJFwucbubO2HtiHWBl3Bby3qygK/tJ2w6HE1ZLIiH5EL6QWK7E/ieOhzGS7 nrx/g2KD7iN0H6ZJN5wA48dIO93kY3dDNBTNitspm1wF6s2+u19c9TJIvdvX4nBAehqk BOjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fx31G+xE30gvwkp/PyhDSOqp0zx0pQGOVGh0hjTeTJQ=; b=DEMyXBRtmEROYO4deUgCakhWceCnETIiv6ZTMxiamBb2iuDNtS15o5qrVTbhjYcQRy KFpblZYRHXdoVjiy3NJaotbf0ZM3HpTJr4sfreDM6jvSaZvf0OkpBjb8XAiFh1OPCRuu wwD0Y30u+lQFVNNniefgEjq09CcmN70S4QGbXi49PglMM0VzcNOZltlta5SLrrmQCXAK IoPjadxNduRhK0H9PaKz1fss68/J0126FAx1JA+E+ABbEOA/5r1k1RLCWhL9agiGksnv sUmv5j/eGXMJjRIvbJXP3ZbCqfCqraNE6EDr9WoBeeqJOQaJkcZ1Ut73T4k+s6kMIUSZ dJRw== X-Gm-Message-State: APjAAAU0CqtAX3Uvi+DQJMU7GxIVq7dNK8RXNDAl7Pgx+EJqhim0kNG0 uVLVYxf0p6j4fcjc7FOR34/l/rX3Erc= X-Google-Smtp-Source: APXvYqyooF/bRI+8Rcptb8sjQ+KkxYLORSBaLT7tYBi9TTv04to6CsenaRgBQTvPMz8bYxCwYmHvDg== X-Received: by 2002:a05:6512:488:: with SMTP id v8mr2329190lfq.37.1569339056923; Tue, 24 Sep 2019 08:30:56 -0700 (PDT) Received: from otyshchenko.kyiv.epam.com (ll-74.141.223.85.sovam.net.ua. [85.223.141.74]) by smtp.gmail.com with ESMTPSA id z128sm525818lfa.1.2019.09.24.08.30.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Sep 2019 08:30:56 -0700 (PDT) From: Oleksandr Tyshchenko To: xen-devel@lists.xenproject.org Date: Tue, 24 Sep 2019 18:30:26 +0300 Message-Id: <1569339027-19484-8-git-send-email-olekstysh@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1569339027-19484-1-git-send-email-olekstysh@gmail.com> References: <1569339027-19484-1-git-send-email-olekstysh@gmail.com> Subject: [Xen-devel] [PATCH V5 7/8] iommu/arm: Introduce iommu_add_dt_device API X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Oleksandr Tyshchenko , julien.grall@arm.com, sstabellini@kernel.org, volodymyr_babchuk@epam.com, Jan Beulich MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" From: Oleksandr Tyshchenko The main puprose of this patch is to add a way to register DT device (which is behind the IOMMU) using the generic IOMMU DT bindings [1] before assigning that device to a domain. So, this patch adds new "iommu_add_dt_device" API for adding DT device to the IOMMU using generic IOMMU DT bindings and previously added "iommu_fwspec" support. As devices can be assigned to the hardware domain and other domains this function is called from two places: handle_device() and iommu_do_dt_domctl(). Besides that, this patch adds new "dt_xlate" callback (borrowed from Linux "of_xlate") for providing the driver with DT IOMMU specifier which describes the IOMMU master interfaces of that device (device IDs, etc). According to the generic IOMMU DT bindings the context of required properties for IOMMU device/master node (#iommu-cells, iommus) depends on many factors and is really driver depended thing. Please note, all IOMMU drivers which support generic IOMMU DT bindings should use "dt_xlate" and "add_device" callbacks. [1] https://www.kernel.org/doc/Documentation/devicetree/bindings/iommu/iommu.txt Signed-off-by: Oleksandr Tyshchenko CC: Julien Grall CC: Jan Beulich --- Changes V4 -> V5: - added "const" to struct dt_phandle_args *args in dt_xlate - moved iommu_add_dt_device() to xen/passthrough/device_tree.c - modified logic, don't try to add "all" devices to the IOMMU when constructing Dom0, but only devices which are going to be assigned to hwdom - updated iommu_do_dt_domctl() to call iommu_add_dt_device() - clarified patch description - removed "__init" from iommu_add_dt_device() Changes V3 -> V4: - squashed with "iommu: Add of_xlate callback" patch - renamed "of_xlate" to "dt_xlate" - reworked patch description - clarified comments in code, removed confusing word "initialize device", etc - updated debug message in handle_device() - modified to check ops->of_xlate and ops->add_device only if "iommus" property is exists Changes V2 -> V3: - clarified patch description - clarified comments in code - modified to provide DT IOMMU specifier to the driver using "of_xlate" callback - documented function usage - modified to return an error if ops is not present/implemented, - added ability to return a possitive value to indicate that device doesn't need to be protected - removed check for the "iommu" property presence in the common code - included directly --- xen/arch/arm/domain_build.c | 22 +++++++---- xen/drivers/passthrough/device_tree.c | 71 +++++++++++++++++++++++++++++++++++ xen/include/xen/iommu.h | 21 +++++++++++ 3 files changed, 107 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index a0fee1e..8048789 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1243,6 +1243,7 @@ static int __init map_device_children(struct domain *d, * - Give permission to the guest to manage IRQ and MMIO range * - Retrieve the IRQ configuration (i.e edge/level) from device tree * When the device is not marked for guest passthrough: + * - Try to call iommu_add_dt_device to protect the device by an IOMMU * - Assign the device to the guest if it's protected by an IOMMU * - Map the IRQs and iomem regions to DOM0 */ @@ -1263,15 +1264,22 @@ static int __init handle_device(struct domain *d, struct dt_device_node *dev, dt_dprintk("%s passthrough = %d nirq = %d naddr = %u\n", dt_node_full_name(dev), need_mapping, nirq, naddr); - if ( dt_device_is_protected(dev) && need_mapping ) + if ( need_mapping ) { - dt_dprintk("%s setup iommu\n", dt_node_full_name(dev)); - res = iommu_assign_dt_device(d, dev); - if ( res ) - { - printk(XENLOG_ERR "Failed to setup the IOMMU for %s\n", + dt_dprintk("Check if %s is behind the IOMMU and add it\n", dt_node_full_name(dev)); - return res; + + iommu_add_dt_device(dev); + if ( dt_device_is_protected(dev) ) + { + dt_dprintk("%s setup iommu\n", dt_node_full_name(dev)); + res = iommu_assign_dt_device(d, dev); + if ( res ) + { + printk(XENLOG_ERR "Failed to setup the IOMMU for %s\n", + dt_node_full_name(dev)); + return res; + } } } diff --git a/xen/drivers/passthrough/device_tree.c b/xen/drivers/passthrough/device_tree.c index 3f328f4..0fd2488 100644 --- a/xen/drivers/passthrough/device_tree.c +++ b/xen/drivers/passthrough/device_tree.c @@ -22,6 +22,8 @@ #include #include +#include + static spinlock_t dtdevs_lock = SPIN_LOCK_UNLOCKED; int iommu_assign_dt_device(struct domain *d, struct dt_device_node *dev) @@ -136,6 +138,68 @@ int iommu_release_dt_devices(struct domain *d) return 0; } +int iommu_add_dt_device(struct dt_device_node *np) +{ + const struct iommu_ops *ops = iommu_get_ops(); + struct dt_phandle_args iommu_spec; + struct device *dev = dt_to_dev(np); + int rc = 1, index = 0; + + if ( !iommu_enabled ) + return 1; + + if ( !ops ) + return -EINVAL; + + if ( dev_iommu_fwspec_get(dev) ) + return -EEXIST; + + /* + * According to the Documentation/devicetree/bindings/iommu/iommu.txt + * from Linux. + */ + while ( !dt_parse_phandle_with_args(np, "iommus", "#iommu-cells", + index, &iommu_spec) ) + { + /* + * The driver which supports generic IOMMU DT bindings must have + * these callback implemented. + */ + if ( !ops->add_device || !ops->dt_xlate ) + return -EINVAL; + + if ( !dt_device_is_available(iommu_spec.np) ) + break; + + rc = iommu_fwspec_init(dev, &iommu_spec.np->dev); + if ( rc ) + break; + + /* + * Provide DT IOMMU specifier which describes the IOMMU master + * interfaces of that device (device IDs, etc) to the driver. + * The driver is responsible to decide how to interpret them. + */ + rc = ops->dt_xlate(dev, &iommu_spec); + if ( rc ) + break; + + index++; + } + + /* + * Add master device to the IOMMU if latter is present and available. + * The driver is responsible to mark that device as protected. + */ + if ( !rc ) + rc = ops->add_device(0, dev); + + if ( rc < 0 ) + iommu_fwspec_free(dev); + + return rc; +} + int iommu_do_dt_domctl(struct xen_domctl *domctl, struct domain *d, XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) { @@ -177,6 +241,13 @@ int iommu_do_dt_domctl(struct xen_domctl *domctl, struct domain *d, break; } + iommu_add_dt_device(dev); + if ( !dt_device_is_protected(dev) ) + { + ret = -EINVAL; + break; + } + ret = iommu_assign_dt_device(d, dev); if ( ret ) diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index c5ed7ef..2d1cc6e 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -186,6 +186,17 @@ int iommu_deassign_dt_device(struct domain *d, struct dt_device_node *dev); int iommu_dt_domain_init(struct domain *d); int iommu_release_dt_devices(struct domain *d); +/* + * Helper to add master device to the IOMMU using generic IOMMU DT bindings. + * + * Return values: + * 0 : device is protected by an IOMMU + * <0 : device is not protected by an IOMMU, but must be (error condition) + * >0 : device doesn't need to be protected by an IOMMU + * (IOMMU is not enabled/present or device is not connected to it). + */ +int iommu_add_dt_device(struct dt_device_node *np); + int iommu_do_dt_domctl(struct xen_domctl *, struct domain *, XEN_GUEST_HANDLE_PARAM(xen_domctl_t)); @@ -254,6 +265,16 @@ struct iommu_ops { int __must_check (*iotlb_flush_all)(struct domain *d); int (*get_reserved_device_memory)(iommu_grdm_t *, void *); void (*dump_p2m_table)(struct domain *d); + +#ifdef CONFIG_HAS_DEVICE_TREE + /* + * All IOMMU drivers which support generic IOMMU DT bindings should use + * this callback. This is a way for the framework to provide the driver + * with DT IOMMU specifier which describes the IOMMU master interfaces of + * that device (device IDs, etc). + */ + int (*dt_xlate)(device_t *dev, const struct dt_phandle_args *args); +#endif }; #include