public inbox for iommu@lists.linux-foundation.org
 help / color / mirror / Atom feed
From: Jacob Pan <jacob.jun.pan@linux.intel.com>
To: iommu@lists.linux-foundation.org,
	LKML <linux-kernel@vger.kernel.org>,
	Joerg Roedel <joro@8bytes.org>,
	David Woodhouse <dwmw2@infradead.org>,
	Eric Auger <eric.auger@redhat.com>,
	Alex Williamson <alex.williamson@redhat.com>,
	Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
Cc: Yi Liu <yi.l.liu@intel.com>, "Tian, Kevin" <kevin.tian@intel.com>,
	Raj Ashok <ashok.raj@intel.com>,
	Christoph Hellwig <hch@infradead.org>,
	Lu Baolu <baolu.lu@linux.intel.com>,
	Andriy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Jacob Pan <jacob.jun.pan@linux.intel.com>,
	Liu@vger.kernel.org
Subject: [PATCH v2 10/19] iommu/vt-d: Add custom allocator for IOASID
Date: Tue, 23 Apr 2019 16:31:10 -0700	[thread overview]
Message-ID: <1556062279-64135-11-git-send-email-jacob.jun.pan@linux.intel.com> (raw)
In-Reply-To: <1556062279-64135-1-git-send-email-jacob.jun.pan@linux.intel.com>

When VT-d driver runs in the guest, PASID allocation must be
performed via virtual command interface. This patch register a
custom IOASID allocator which takes precedence over the default
IDR based allocator. The resulting IOASID allocation will always
come from the host. This ensures that PASID namespace is system-
wide.

Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Liu, Yi L <yi.l.liu@intel.com>
Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
---
 drivers/iommu/intel-iommu.c | 58 +++++++++++++++++++++++++++++++++++++++++++++
 include/linux/intel-iommu.h |  2 ++
 2 files changed, 60 insertions(+)

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index d93c4bd..ec6f22d 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -1711,6 +1711,8 @@ static void free_dmar_iommu(struct intel_iommu *iommu)
 		if (ecap_prs(iommu->ecap))
 			intel_svm_finish_prq(iommu);
 	}
+	ioasid_unregister_allocator(&iommu->pasid_allocator);
+
 #endif
 }
 
@@ -4811,6 +4813,46 @@ static int __init platform_optin_force_iommu(void)
 	return 1;
 }
 
+static ioasid_t intel_ioasid_alloc(ioasid_t min, ioasid_t max, void *data)
+{
+	struct intel_iommu *iommu = data;
+	ioasid_t ioasid;
+
+	/*
+	 * VT-d virtual command interface always uses the full 20 bit
+	 * PASID range. Host can partition guest PASID range based on
+	 * policies but it is out of guest's control.
+	 */
+	if (min < PASID_MIN || max > PASID_MAX)
+		return -EINVAL;
+
+	if (vcmd_alloc_pasid(iommu, &ioasid))
+		return INVALID_IOASID;
+
+	return ioasid;
+}
+
+static int intel_ioasid_free(ioasid_t ioasid, void *data)
+{
+	struct iommu_pasid_alloc_info *svm;
+	struct intel_iommu *iommu = data;
+
+	if (!iommu || !cap_caching_mode(iommu->cap))
+		return -EINVAL;
+	/*
+	 * Sanity check the ioasid owner is done at upper layer, e.g. VFIO
+	 * We can only free the PASID when all the devices are unbond.
+	 */
+	svm = ioasid_find(NULL, ioasid, NULL);
+	if (!svm) {
+		pr_warn("Freeing unbond IOASID %d\n", ioasid);
+		return -EBUSY;
+	}
+	vcmd_free_pasid(iommu, ioasid);
+
+	return 0;
+}
+
 int __init intel_iommu_init(void)
 {
 	int ret = -ENODEV;
@@ -4912,6 +4954,22 @@ int __init intel_iommu_init(void)
 				       "%s", iommu->name);
 		iommu_device_set_ops(&iommu->iommu, &intel_iommu_ops);
 		iommu_device_register(&iommu->iommu);
+		if (cap_caching_mode(iommu->cap) && sm_supported(iommu)) {
+			/*
+			 * Register a custom ASID allocator if we are running
+			 * in a guest, the purpose is to have a system wide PASID
+			 * namespace among all PASID users.
+			 * There can be multiple vIOMMUs in each guest but only
+			 * one allocator is active. All vIOMMU allocators will
+			 * eventually be calling the same host allocator.
+			 */
+			iommu->pasid_allocator.alloc = intel_ioasid_alloc;
+			iommu->pasid_allocator.free = intel_ioasid_free;
+			iommu->pasid_allocator.pdata = (void *)iommu;
+			ret = ioasid_register_allocator(&iommu->pasid_allocator);
+			if (ret)
+				pr_warn("Custom PASID allocator registeration failed\n");
+		}
 	}
 
 	bus_set_iommu(&pci_bus_type, &intel_iommu_ops);
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index bff907b..c24c8aa 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -31,6 +31,7 @@
 #include <linux/iommu.h>
 #include <linux/io-64-nonatomic-lo-hi.h>
 #include <linux/dmar.h>
+#include <linux/ioasid.h>
 
 #include <asm/cacheflush.h>
 #include <asm/iommu.h>
@@ -549,6 +550,7 @@ struct intel_iommu {
 #ifdef CONFIG_INTEL_IOMMU_SVM
 	struct page_req_dsc *prq;
 	unsigned char prq_name[16];    /* Name for PRQ interrupt */
+	struct ioasid_allocator pasid_allocator; /* Custom allocator for PASIDs */
 #endif
 	struct q_inval  *qi;            /* Queued invalidation info */
 	u32 *iommu_state; /* Store iommu states between suspend and resume.*/
-- 
2.7.4

WARNING: multiple messages have this Message-ID (diff)
From: Jacob Pan <jacob.jun.pan@linux.intel.com>
To: iommu@lists.linux-foundation.org,
	LKML <linux-kernel@vger.kernel.org>,
	Joerg Roedel <joro@8bytes.org>,
	David Woodhouse <dwmw2@infradead.org>,
	Eric Auger <eric.auger@redhat.com>,
	Alex Williamson <alex.williamson@redhat.com>,
	Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
Cc: "Tian, Kevin" <kevin.tian@intel.com>,
	Raj Ashok <ashok.raj@intel.com>,
	Liu@mail.linuxfoundation.org,
	Andriy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v2 10/19] iommu/vt-d: Add custom allocator for IOASID
Date: Tue, 23 Apr 2019 16:31:10 -0700	[thread overview]
Message-ID: <1556062279-64135-11-git-send-email-jacob.jun.pan@linux.intel.com> (raw)
Message-ID: <20190423233110.sSUTr7ocpPXNnA5piyHQvnGYUaIzkJYYJ97bIJRu2qo@z> (raw)
In-Reply-To: <1556062279-64135-1-git-send-email-jacob.jun.pan@linux.intel.com>

When VT-d driver runs in the guest, PASID allocation must be
performed via virtual command interface. This patch register a
custom IOASID allocator which takes precedence over the default
IDR based allocator. The resulting IOASID allocation will always
come from the host. This ensures that PASID namespace is system-
wide.

Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Liu, Yi L <yi.l.liu@intel.com>
Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
---
 drivers/iommu/intel-iommu.c | 58 +++++++++++++++++++++++++++++++++++++++++++++
 include/linux/intel-iommu.h |  2 ++
 2 files changed, 60 insertions(+)

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index d93c4bd..ec6f22d 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -1711,6 +1711,8 @@ static void free_dmar_iommu(struct intel_iommu *iommu)
 		if (ecap_prs(iommu->ecap))
 			intel_svm_finish_prq(iommu);
 	}
+	ioasid_unregister_allocator(&iommu->pasid_allocator);
+
 #endif
 }
 
@@ -4811,6 +4813,46 @@ static int __init platform_optin_force_iommu(void)
 	return 1;
 }
 
+static ioasid_t intel_ioasid_alloc(ioasid_t min, ioasid_t max, void *data)
+{
+	struct intel_iommu *iommu = data;
+	ioasid_t ioasid;
+
+	/*
+	 * VT-d virtual command interface always uses the full 20 bit
+	 * PASID range. Host can partition guest PASID range based on
+	 * policies but it is out of guest's control.
+	 */
+	if (min < PASID_MIN || max > PASID_MAX)
+		return -EINVAL;
+
+	if (vcmd_alloc_pasid(iommu, &ioasid))
+		return INVALID_IOASID;
+
+	return ioasid;
+}
+
+static int intel_ioasid_free(ioasid_t ioasid, void *data)
+{
+	struct iommu_pasid_alloc_info *svm;
+	struct intel_iommu *iommu = data;
+
+	if (!iommu || !cap_caching_mode(iommu->cap))
+		return -EINVAL;
+	/*
+	 * Sanity check the ioasid owner is done at upper layer, e.g. VFIO
+	 * We can only free the PASID when all the devices are unbond.
+	 */
+	svm = ioasid_find(NULL, ioasid, NULL);
+	if (!svm) {
+		pr_warn("Freeing unbond IOASID %d\n", ioasid);
+		return -EBUSY;
+	}
+	vcmd_free_pasid(iommu, ioasid);
+
+	return 0;
+}
+
 int __init intel_iommu_init(void)
 {
 	int ret = -ENODEV;
@@ -4912,6 +4954,22 @@ int __init intel_iommu_init(void)
 				       "%s", iommu->name);
 		iommu_device_set_ops(&iommu->iommu, &intel_iommu_ops);
 		iommu_device_register(&iommu->iommu);
+		if (cap_caching_mode(iommu->cap) && sm_supported(iommu)) {
+			/*
+			 * Register a custom ASID allocator if we are running
+			 * in a guest, the purpose is to have a system wide PASID
+			 * namespace among all PASID users.
+			 * There can be multiple vIOMMUs in each guest but only
+			 * one allocator is active. All vIOMMU allocators will
+			 * eventually be calling the same host allocator.
+			 */
+			iommu->pasid_allocator.alloc = intel_ioasid_alloc;
+			iommu->pasid_allocator.free = intel_ioasid_free;
+			iommu->pasid_allocator.pdata = (void *)iommu;
+			ret = ioasid_register_allocator(&iommu->pasid_allocator);
+			if (ret)
+				pr_warn("Custom PASID allocator registeration failed\n");
+		}
 	}
 
 	bus_set_iommu(&pci_bus_type, &intel_iommu_ops);
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index bff907b..c24c8aa 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -31,6 +31,7 @@
 #include <linux/iommu.h>
 #include <linux/io-64-nonatomic-lo-hi.h>
 #include <linux/dmar.h>
+#include <linux/ioasid.h>
 
 #include <asm/cacheflush.h>
 #include <asm/iommu.h>
@@ -549,6 +550,7 @@ struct intel_iommu {
 #ifdef CONFIG_INTEL_IOMMU_SVM
 	struct page_req_dsc *prq;
 	unsigned char prq_name[16];    /* Name for PRQ interrupt */
+	struct ioasid_allocator pasid_allocator; /* Custom allocator for PASIDs */
 #endif
 	struct q_inval  *qi;            /* Queued invalidation info */
 	u32 *iommu_state; /* Store iommu states between suspend and resume.*/
-- 
2.7.4

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

  parent reply	other threads:[~2019-04-23 23:31 UTC|newest]

Thread overview: 149+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-23 23:31 [PATCH v2 00/19] Shared virtual address IOMMU and VT-d support Jacob Pan
2019-04-23 23:31 ` Jacob Pan
2019-04-23 23:31 ` [PATCH v2 03/19] iommu: introduce device fault report API Jacob Pan
2019-04-23 23:31   ` Jacob Pan
2019-04-23 23:31 ` [PATCH v2 04/19] iommu: Introduce attach/detach_pasid_table API Jacob Pan
2019-04-23 23:31   ` Jacob Pan
     [not found] ` <1556062279-64135-1-git-send-email-jacob.jun.pan-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2019-04-23 23:31   ` [PATCH v2 01/19] driver core: add per device iommu param Jacob Pan
2019-04-23 23:31     ` Jacob Pan
2019-04-23 23:31   ` [PATCH v2 02/19] iommu: introduce device fault data Jacob Pan
2019-04-23 23:31     ` Jacob Pan
2019-04-25 12:46     ` Jean-Philippe Brucker
2019-04-25 12:46       ` Jean-Philippe Brucker
2019-04-25 13:21       ` Auger Eric
2019-04-25 13:21         ` Auger Eric
2019-04-25 14:33         ` Jean-Philippe Brucker
2019-04-25 14:33           ` Jean-Philippe Brucker
2019-04-25 18:07           ` Jacob Pan
2019-04-25 18:07             ` Jacob Pan
2019-04-23 23:31   ` [PATCH v2 05/19] iommu: Introduce cache_invalidate API Jacob Pan
2019-04-23 23:31     ` Jacob Pan
2019-04-23 23:31   ` [PATCH v2 06/19] drivers core: Add I/O ASID allocator Jacob Pan
2019-04-23 23:31     ` Jacob Pan
2019-04-24  6:19     ` Christoph Hellwig
2019-04-24  6:19       ` Christoph Hellwig
2019-04-25 18:19       ` Jacob Pan
2019-04-25 18:19         ` Jacob Pan
2019-04-26 11:47         ` Jean-Philippe Brucker
2019-04-26 11:47           ` Jean-Philippe Brucker
2019-04-26 12:21           ` Christoph Hellwig
2019-04-26 12:21             ` Christoph Hellwig
2019-04-26 16:58             ` Jacob Pan
2019-04-26 16:58               ` Jacob Pan
2019-04-25 10:17     ` Auger Eric
2019-04-25 10:17       ` Auger Eric
2019-04-25 10:41       ` Jean-Philippe Brucker
2019-04-25 10:41         ` Jean-Philippe Brucker
2019-04-30 20:24         ` Jacob Pan
2019-04-30 20:24           ` Jacob Pan
2019-05-01 17:40           ` Jean-Philippe Brucker
2019-05-01 17:40             ` Jean-Philippe Brucker
2019-04-23 23:31   ` [PATCH v2 07/19] ioasid: Convert ioasid_idr to XArray Jacob Pan
2019-04-23 23:31     ` Jacob Pan
2019-04-23 23:31 ` [PATCH v2 08/19] ioasid: Add custom IOASID allocator Jacob Pan
2019-04-23 23:31   ` Jacob Pan
2019-04-25 10:03   ` Auger Eric
2019-04-25 10:03     ` Auger Eric
2019-04-25 21:29     ` Jacob Pan
2019-04-25 21:29       ` Jacob Pan
2019-04-26  9:06       ` Auger Eric
2019-04-26  9:06         ` Auger Eric
2019-04-26 15:19         ` Jacob Pan
2019-04-26 15:19           ` Jacob Pan
2019-05-06 17:59           ` Jacob Pan
2019-04-23 23:31 ` [PATCH v2 09/19] iommu/vt-d: Enlightened PASID allocation Jacob Pan
2019-04-23 23:31   ` Jacob Pan
     [not found]   ` <1556062279-64135-10-git-send-email-jacob.jun.pan-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2019-04-24 17:27     ` Auger Eric
2019-04-24 17:27       ` Auger Eric
2019-04-25  7:12       ` Liu, Yi L
2019-04-25  7:12         ` Liu, Yi L
2019-04-25  7:40         ` Auger Eric
2019-04-25  7:40           ` Auger Eric
     [not found]           ` <c847182b-6e5c-5344-a162-29e273a489fb-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2019-04-25 23:01             ` Jacob Pan
2019-04-25 23:01               ` Jacob Pan
2019-04-25 23:40       ` Jacob Pan
2019-04-25 23:40         ` Jacob Pan
2019-04-26  7:24         ` Auger Eric
2019-04-26  7:24           ` Auger Eric
2019-04-26 15:05           ` Jacob Pan
2019-04-26 15:05             ` Jacob Pan
2019-04-23 23:31 ` Jacob Pan [this message]
2019-04-23 23:31   ` [PATCH v2 10/19] iommu/vt-d: Add custom allocator for IOASID Jacob Pan
     [not found]   ` <1556062279-64135-11-git-send-email-jacob.jun.pan-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2019-04-24 17:27     ` Auger Eric
2019-04-24 17:27       ` Auger Eric
2019-04-26 20:11       ` Jacob Pan
2019-04-26 20:11         ` Jacob Pan
2019-04-23 23:31 ` [PATCH v2 11/19] iommu/vt-d: Replace Intel specific PASID allocator with IOASID Jacob Pan
2019-04-23 23:31   ` Jacob Pan
2019-04-25 10:04   ` Auger Eric
2019-04-25 10:04     ` Auger Eric
     [not found]     ` <e542fd95-acbe-05e9-e441-27dff752c21a-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2019-04-26 21:01       ` Jacob Pan
2019-04-26 21:01         ` Jacob Pan
2019-04-27  8:38         ` Auger Eric
2019-04-27  8:38           ` Auger Eric
2019-04-29 10:00           ` Jean-Philippe Brucker
2019-04-29 10:00             ` Jean-Philippe Brucker
2019-04-23 23:31 ` [PATCH v2 12/19] iommu/vt-d: Move domain helper to header Jacob Pan
2019-04-23 23:31   ` Jacob Pan
     [not found]   ` <1556062279-64135-13-git-send-email-jacob.jun.pan-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2019-04-24 17:27     ` Auger Eric
2019-04-24 17:27       ` Auger Eric
2019-04-23 23:31 ` [PATCH v2 13/19] iommu/vt-d: Add nested translation support Jacob Pan
2019-04-23 23:31   ` Jacob Pan
2019-04-26 15:42   ` Auger Eric
2019-04-26 15:42     ` Auger Eric
2019-04-26 21:57     ` Jacob Pan
2019-04-26 21:57       ` Jacob Pan
2019-04-23 23:31 ` [PATCH v2 14/19] iommu: Add guest PASID bind function Jacob Pan
2019-04-23 23:31   ` Jacob Pan
2019-04-26 15:53   ` Auger Eric
2019-04-26 15:53     ` Auger Eric
2019-04-26 22:11     ` Jacob Pan
2019-04-26 22:11       ` Jacob Pan
2019-04-27  8:37       ` Auger Eric
2019-04-27  8:37         ` Auger Eric
2019-04-23 23:31 ` [PATCH v2 15/19] iommu/vt-d: Add bind guest PASID support Jacob Pan
2019-04-23 23:31   ` Jacob Pan
2019-04-26 16:15   ` Auger Eric
2019-04-26 16:15     ` Auger Eric
2019-04-29 15:25     ` Jacob Pan
2019-04-29 15:25       ` Jacob Pan
2019-04-30  7:05       ` Auger Eric
2019-04-30  7:05         ` Auger Eric
2019-04-30 17:49         ` Jacob Pan
2019-04-30 17:49           ` Jacob Pan
2019-04-23 23:31 ` [PATCH v2 16/19] iommu/vtd: Clean up for SVM device list Jacob Pan
2019-04-23 23:31   ` Jacob Pan
2019-04-26 16:19   ` Auger Eric
2019-04-26 16:19     ` Auger Eric
2019-04-23 23:31 ` [PATCH v2 17/19] iommu: Add max num of cache and granu types Jacob Pan
2019-04-23 23:31   ` Jacob Pan
2019-04-26 16:22   ` Auger Eric
2019-04-26 16:22     ` Auger Eric
2019-04-29 16:17     ` Jacob Pan
2019-04-29 16:17       ` Jacob Pan
2019-04-30  5:15       ` Auger Eric
2019-04-30  5:15         ` Auger Eric
2019-04-23 23:31 ` [PATCH v2 18/19] iommu/vt-d: Support flushing more translation cache types Jacob Pan
2019-04-23 23:31   ` Jacob Pan
2019-04-27  9:04   ` Auger Eric
2019-04-27  9:04     ` Auger Eric
2019-04-29 21:29     ` Jacob Pan
2019-04-29 21:29       ` Jacob Pan
2019-04-30  4:41       ` Auger Eric
2019-04-30  4:41         ` Auger Eric
2019-04-30 17:15         ` Jacob Pan
2019-04-30 17:15           ` Jacob Pan
2019-04-30 17:41           ` Auger Eric
2019-04-30 17:41             ` Auger Eric
2019-04-23 23:31 ` [PATCH v2 19/19] iommu/vt-d: Add svm/sva invalidate function Jacob Pan
2019-04-23 23:31   ` Jacob Pan
2019-04-26 17:23   ` Auger Eric
2019-04-26 17:23     ` Auger Eric
2019-04-29 22:41     ` Jacob Pan
2019-04-29 22:41       ` Jacob Pan
2019-04-30  6:57       ` Auger Eric
2019-04-30  6:57         ` Auger Eric
2019-04-30 17:22         ` Jacob Pan
2019-04-30 17:22           ` Jacob Pan
2019-04-30 17:36           ` Auger Eric
2019-04-30 17:36             ` Auger Eric

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=1556062279-64135-11-git-send-email-jacob.jun.pan@linux.intel.com \
    --to=jacob.jun.pan@linux.intel.com \
    --cc=Liu@vger.kernel.org \
    --cc=alex.williamson@redhat.com \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=ashok.raj@intel.com \
    --cc=baolu.lu@linux.intel.com \
    --cc=dwmw2@infradead.org \
    --cc=eric.auger@redhat.com \
    --cc=hch@infradead.org \
    --cc=iommu@lists.linux-foundation.org \
    --cc=jean-philippe.brucker@arm.com \
    --cc=joro@8bytes.org \
    --cc=kevin.tian@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=yi.l.liu@intel.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