Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be9e6598 authored by Lu Baolu's avatar Lu Baolu Committed by Joerg Roedel
Browse files

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: cc580e41 ("iommu/vt-d: Per PCI device pasid table interfaces")

Cc: Ashok Raj <ashok.raj@intel.com>
Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Reported-and-tested-by: default avatarPelton Kyle D <kyle.d.pelton@intel.com>
Tested-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 74bc2abc

drivers/iommu/intel-iommu.c

+3 −3
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;