linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Auger <eric.auger@redhat.com>
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, gpkulkarni@gmail.com,
	shankerd@codeaurora.org, bharat.bhushan@nxp.com,
	geethasowjanya.akula@gmail.com
Subject: [PATCH v6 06/18] iommu: iommu_get_group_resv_regions
Date: Thu,  5 Jan 2017 19:04:34 +0000	[thread overview]
Message-ID: <1483643086-2883-7-git-send-email-eric.auger@redhat.com> (raw)
In-Reply-To: <1483643086-2883-1-git-send-email-eric.auger@redhat.com>

Introduce iommu_get_group_resv_regions whose role consists in
enumerating all devices from the group and collecting their
reserved regions. The list is sorted and overlaps are checked.

Signed-off-by: Eric Auger <eric.auger@redhat.com>

---

v3 -> v4:
- take the iommu_group lock in iommu_get_group_resv_regions
- the list now is sorted and overlaps are checked

NOTE:
- we do not move list elements from device to group list since
  the iommu_put_resv_regions() could not be called.
- at the moment I did not introduce any iommu_put_group_resv_regions
  since it simply consists in voiding/freeing the list
---
 drivers/iommu/iommu.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++
 include/linux/iommu.h |  8 ++++++
 2 files changed, 86 insertions(+)

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 41c1906..a2d51b3 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -133,6 +133,84 @@ static ssize_t iommu_group_show_name(struct iommu_group *group, char *buf)
 	return sprintf(buf, "%s\n", group->name);
 }
 
+static int iommu_insert_resv_region(struct iommu_resv_region *new,
+				    struct list_head *regions)
+{
+	struct iommu_resv_region *region;
+	phys_addr_t start = new->start;
+	phys_addr_t end = new->start + new->length - 1;
+	struct list_head *pos = regions->next;
+
+	while (pos != regions) {
+		struct iommu_resv_region *entry =
+			list_entry(pos, struct iommu_resv_region, list);
+		phys_addr_t a = entry->start;
+		phys_addr_t b = entry->start + entry->length - 1;
+
+		if (end < a) {
+			goto insert;
+		} else if (start > b) {
+			pos = pos->next;
+		} else if ((start >= a) && (end <= b)) {
+			goto done;
+		} else {
+			phys_addr_t new_start = min(a, start);
+			phys_addr_t new_end = max(b, end);
+
+			list_del(&entry->list);
+			entry->start = new_start;
+			entry->length = new_end - new_start + 1;
+			iommu_insert_resv_region(entry, regions);
+		}
+	}
+insert:
+	region = iommu_alloc_resv_region(new->start, new->length,
+					 new->prot, new->type);
+	if (!region)
+		return -ENOMEM;
+
+	list_add_tail(&region->list, pos);
+done:
+	return 0;
+}
+
+static int
+iommu_insert_device_resv_regions(struct list_head *dev_resv_regions,
+				 struct list_head *group_resv_regions)
+{
+	struct iommu_resv_region *entry;
+	int ret;
+
+	list_for_each_entry(entry, dev_resv_regions, list) {
+		ret = iommu_insert_resv_region(entry, group_resv_regions);
+		if (ret)
+			break;
+	}
+	return ret;
+}
+
+int iommu_get_group_resv_regions(struct iommu_group *group,
+				 struct list_head *head)
+{
+	struct iommu_device *device;
+	int ret = 0;
+
+	mutex_lock(&group->mutex);
+	list_for_each_entry(device, &group->devices, list) {
+		struct list_head dev_resv_regions;
+
+		INIT_LIST_HEAD(&dev_resv_regions);
+		iommu_get_resv_regions(device->dev, &dev_resv_regions);
+		ret = iommu_insert_device_resv_regions(&dev_resv_regions, head);
+		iommu_put_resv_regions(device->dev, &dev_resv_regions);
+		if (ret)
+			break;
+	}
+	mutex_unlock(&group->mutex);
+	return ret;
+}
+EXPORT_SYMBOL_GPL(iommu_get_group_resv_regions);
+
 static IOMMU_GROUP_ATTR(name, S_IRUGO, iommu_group_show_name, NULL);
 
 static void iommu_group_release(struct kobject *kobj)
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index e97a877..b5f8492 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -246,6 +246,8 @@ extern void iommu_set_fault_handler(struct iommu_domain *domain,
 extern int iommu_request_dm_for_dev(struct device *dev);
 extern struct iommu_resv_region *
 iommu_alloc_resv_region(phys_addr_t start, size_t length, int prot, int type);
+extern int iommu_get_group_resv_regions(struct iommu_group *group,
+					struct list_head *head);
 
 extern int iommu_attach_group(struct iommu_domain *domain,
 			      struct iommu_group *group);
@@ -463,6 +465,12 @@ static inline void iommu_put_resv_regions(struct device *dev,
 {
 }
 
+static inline int iommu_get_group_resv_regions(struct iommu_group *group,
+					       struct list_head *head)
+{
+	return -ENODEV;
+}
+
 static inline int iommu_request_dm_for_dev(struct device *dev)
 {
 	return -ENODEV;
-- 
1.9.1

  parent reply	other threads:[~2017-01-05 19:09 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-05 19:04 [PATCH v6 00/18] KVM PCIe/MSI passthrough on ARM/ARM64 and IOVA reserved regions Eric Auger
2017-01-05 19:04 ` [PATCH v6 01/18] iommu/dma: Allow MSI-only cookies Eric Auger
2017-01-06 10:59   ` Joerg Roedel
2017-01-06 11:46     ` Auger Eric
2017-01-06 12:12       ` Robin Murphy
2017-01-06 13:05         ` Auger Eric
2017-01-05 19:04 ` [PATCH v6 02/18] iommu: Rename iommu_dm_regions into iommu_resv_regions Eric Auger
2017-01-05 19:04 ` [PATCH v6 03/18] iommu: Add a new type field in iommu_resv_region Eric Auger
2017-01-05 19:04 ` [PATCH v6 04/18] iommu: iommu_alloc_resv_region Eric Auger
2017-01-05 19:04 ` [PATCH v6 05/18] iommu: Only map direct mapped regions Eric Auger
2017-01-05 19:04 ` Eric Auger [this message]
2017-01-05 19:04 ` [PATCH v6 07/18] iommu: Implement reserved_regions iommu-group sysfs file Eric Auger
2017-01-06 11:00   ` Joerg Roedel
2017-01-06 11:46     ` Auger Eric
2017-01-06 12:48       ` Joerg Roedel
2017-01-06 13:04         ` Auger Eric
2017-01-06 17:18         ` Auger Eric
2017-01-08 16:26           ` Auger Eric
2017-01-05 19:04 ` [PATCH v6 08/18] iommu/vt-d: Implement reserved region get/put callbacks Eric Auger
2017-01-06 11:01   ` Joerg Roedel
2017-01-06 11:45     ` Auger Eric
2017-01-06 12:46       ` Joerg Roedel
2017-01-06 13:03         ` Auger Eric
2017-01-05 19:04 ` [PATCH v6 09/18] iommu/amd: Declare MSI and HT regions as reserved IOVA regions Eric Auger
2017-01-05 19:04 ` [PATCH v6 10/18] iommu/arm-smmu: Implement reserved region get/put callbacks Eric Auger
2017-01-05 19:04 ` [PATCH v6 11/18] iommu/arm-smmu-v3: " Eric Auger
2017-01-05 19:04 ` [PATCH v6 12/18] irqdomain: Add irq domain MSI and MSI_REMAP flags Eric Auger
2017-01-05 19:04 ` [PATCH v6 13/18] genirq/msi: Set IRQ_DOMAIN_FLAG_MSI on MSI domain creation Eric Auger
2017-01-05 19:04 ` [PATCH v6 14/18] irqdomain: irq_domain_check_msi_remap Eric Auger
2017-01-05 19:04 ` [PATCH v6 15/18] irqchip/gicv3-its: Sets IRQ_DOMAIN_FLAG_MSI_REMAP Eric Auger
2017-01-05 19:04 ` [PATCH v6 16/18] vfio/type1: Allow transparent MSI IOVA allocation Eric Auger
2017-01-05 19:04 ` [PATCH v6 17/18] vfio/type1: Check MSI remapping at irq domain level Eric Auger
2017-01-06  8:50   ` Bharat Bhushan
2017-01-06  9:08     ` Auger Eric
2017-01-06  9:20       ` Marc Zyngier
2017-01-06  9:31         ` Bharat Bhushan
2017-01-05 19:04 ` [PATCH v6 18/18] iommu/arm-smmu: Do not advertise IOMMU_CAP_INTR_REMAP anymore Eric Auger
2017-01-06 11:02 ` [PATCH v6 00/18] KVM PCIe/MSI passthrough on ARM/ARM64 and IOVA reserved regions Joerg Roedel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1483643086-2883-7-git-send-email-eric.auger@redhat.com \
    --to=eric.auger@redhat.com \
    --cc=alex.williamson@redhat.com \
    --cc=bharat.bhushan@nxp.com \
    --cc=christoffer.dall@linaro.org \
    --cc=diana.craciun@nxp.com \
    --cc=drjones@redhat.com \
    --cc=eric.auger.pro@gmail.com \
    --cc=geethasowjanya.akula@gmail.com \
    --cc=gpkulkarni@gmail.com \
    --cc=iommu@lists.linux-foundation.org \
    --cc=jason@lakedaemon.net \
    --cc=joro@8bytes.org \
    --cc=kvm@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marc.zyngier@arm.com \
    --cc=pranav.sawargaonkar@gmail.com \
    --cc=punit.agrawal@arm.com \
    --cc=robin.murphy@arm.com \
    --cc=shankerd@codeaurora.org \
    --cc=tglx@linutronix.de \
    --cc=will.deacon@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).