From patchwork Thu Nov 3 21:39:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 9411549 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 CAF2C601C2 for ; Thu, 3 Nov 2016 21:41:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BA8602AF67 for ; Thu, 3 Nov 2016 21:41:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF5B72AF68; Thu, 3 Nov 2016 21:41:28 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5EF9E2AF63 for ; Thu, 3 Nov 2016 21:41:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933244AbcKCVkY (ORCPT ); Thu, 3 Nov 2016 17:40:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36412 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933120AbcKCVkX (ORCPT ); Thu, 3 Nov 2016 17:40:23 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 97C4B804F6; Thu, 3 Nov 2016 21:40:17 +0000 (UTC) Received: from localhost.redhat.com (vpn1-4-181.ams2.redhat.com [10.36.4.181]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uA3Lde0c000909; Thu, 3 Nov 2016 17:40:12 -0400 From: Eric Auger To: eric.auger@redhat.com, eric.auger.pro@gmail.com, christoffer.dall@linaro.org, marc.zyngier@arm.com, robin.murphy@arm.com, alex.williamson@redhat.com, will.deacon@arm.com, joro@8bytes.org, tglx@linutronix.de, jason@lakedaemon.net, linux-arm-kernel@lists.infradead.org Cc: kvm@vger.kernel.org, drjones@redhat.com, linux-kernel@vger.kernel.org, pranav.sawargaonkar@gmail.com, iommu@lists.linux-foundation.org, punit.agrawal@arm.com, diana.craciun@nxp.com Subject: [RFC 6/8] iommu: Handle the list of reserved regions Date: Thu, 3 Nov 2016 21:39:36 +0000 Message-Id: <1478209178-3009-7-git-send-email-eric.auger@redhat.com> In-Reply-To: <1478209178-3009-1-git-send-email-eric.auger@redhat.com> References: <1478209178-3009-1-git-send-email-eric.auger@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 03 Nov 2016 21:40:17 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A new callback is introduced, add_reserved_regions. This function aims at populating the iommu domain reserved region list with regions associated with the device. The function is called on device attachment. The list is freed on iommu_domain_free(). Signed-off-by: Eric Auger --- drivers/iommu/iommu.c | 23 +++++++++++++++++++++++ include/linux/iommu.h | 6 ++++++ 2 files changed, 29 insertions(+) diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 0af07492..300af44 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -1077,6 +1077,10 @@ struct iommu_domain *iommu_domain_alloc(struct bus_type *bus) void iommu_domain_free(struct iommu_domain *domain) { + struct iommu_reserved_region *entry, *next; + + list_for_each_entry_safe(entry, next, &domain->reserved_regions, list) + kfree(entry); domain->ops->domain_free(domain); } EXPORT_SYMBOL_GPL(iommu_domain_free); @@ -1089,6 +1093,15 @@ static int __iommu_attach_device(struct iommu_domain *domain, return -ENODEV; ret = domain->ops->attach_dev(domain, dev); + if (ret) + return ret; + + if (domain->type == IOMMU_DOMAIN_UNMANAGED) { + mutex_lock(&domain->resv_mutex); + ret = iommu_add_reserved_regions(domain, dev); + mutex_unlock(&domain->resv_mutex); + } + if (!ret) trace_attach_device_to_domain(dev); return ret; @@ -1548,6 +1561,16 @@ int iommu_domain_set_attr(struct iommu_domain *domain, } EXPORT_SYMBOL_GPL(iommu_domain_set_attr); +int iommu_add_reserved_regions(struct iommu_domain *domain, struct device *dev) +{ + const struct iommu_ops *ops = dev->bus->iommu_ops; + + if (ops && ops->add_reserved_regions) + return ops->add_reserved_regions(domain, dev); + else + return 0; +} + void iommu_get_dm_regions(struct device *dev, struct list_head *list) { const struct iommu_ops *ops = dev->bus->iommu_ops; diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 0f2eb64..7748a1b 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -170,6 +170,7 @@ struct iommu_reserved_region { * @get_dm_regions: Request list of direct mapping requirements for a device * @put_dm_regions: Free list of direct mapping requirements for a device * @apply_dm_region: Temporary helper call-back for iova reserved ranges + * @add_reserved_regions: Populate reserved regions for a device * @domain_window_enable: Configure and enable a particular window for a domain * @domain_window_disable: Disable a particular window for a domain * @domain_set_windows: Set the number of windows for a domain @@ -207,6 +208,10 @@ struct iommu_ops { void (*apply_dm_region)(struct device *dev, struct iommu_domain *domain, struct iommu_dm_region *region); + /* Add reserved regions for a device */ + int (*add_reserved_regions)(struct iommu_domain *domain, + struct device *device); + /* Window handling functions */ int (*domain_window_enable)(struct iommu_domain *domain, u32 wnd_nr, phys_addr_t paddr, u64 size, int prot); @@ -289,6 +294,7 @@ struct device *iommu_device_create(struct device *parent, void *drvdata, void iommu_device_destroy(struct device *dev); int iommu_device_link(struct device *dev, struct device *link); void iommu_device_unlink(struct device *dev, struct device *link); +int iommu_add_reserved_regions(struct iommu_domain *domain, struct device *dev); /* Window handling function prototypes */ extern int iommu_domain_window_enable(struct iommu_domain *domain, u32 wnd_nr,