Skip to contentSkip to conversation

iommu/vt-d: Handle memory shortage on pasid table allocation

PATCH New Lu Baolu 1 participant 1 message Sep 8, 2018 IOMMU

lore
Share & tools
lore

Lu Baolu

author
#0 lore raw

PATCH v2 1/1 iommu/vt-d: Handle memory shortage on pasid table allocation

Pasid table memory allocation could return failure due to memory shortage. Limit the pasid table size to 1MiB because current 8MiB contiguous physical memory allocation can be hard to come by. W/o a PASID table, the device could continue to work with only shared virtual memory impacted. So, let's go ahead with context mapping even the memory allocation for pasid table failed.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107783

Fixes cc580e41260d ("iommu/vt-d: Per PCI device pasid table interfaces")
Cc Ashok Raj <[email protected]>
Cc Jacob Pan <jacob.jun.pan-VuQAYsv1563Yd54FQh9/[email protected]>
Cc Mika Westerberg <mika.westerberg-VuQAYsv1563Yd54FQh9/[email protected]>
Reported-and-tested-by Pelton Kyle D <[email protected]>

---
Change log:
v1->v2:
- Add "Tested-by: Mika Westerberg <mika.westerberg-VuQAYsv1563Yd54FQh9/[email protected]>"
- Add bugzilla reference

 drivers/iommu/intel-iommu.c | 6 +++---
 drivers/iommu/intel-pasid.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/iommu/intel-iommu.c +3 -3
index 5f3f10cf9d9d..bedc801b06a0 100644
@@ -2540,9 +2540,9 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,
 	if (dev && dev_is_pci(dev) && info->pasid_supported) {
 		ret = intel_pasid_alloc_table(dev);
 		if (ret) {
-			__dmar_remove_one_dev_info(info);
-			spin_unlock_irqrestore(&device_domain_lock, flags);
-			return NULL;
+			pr_warn("No pasid table for %s, pasid disabled\n",
+				dev_name(dev));
+			info->pasid_supported = 0;
 		}
 	}
 	spin_unlock_irqrestore(&device_domain_lock, flags);
drivers/iommu/intel-pasid.h +1 -1
index 1c05ed6fc5a5..1fb5e12b029a 100644
@@ -11,7 +11,7 @@
 #define __INTEL_PASID_H
 
 #define PASID_MIN			0x1
-#define PASID_MAX			0x100000
+#define PASID_MAX			0x20000
 
 struct pasid_entry {
 	u64 val;
Signature · 1 line
2.17.1