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

iommu/vt-d: Add get_domain_info() helper 



Add a get_domain_info() helper to retrieve the valid per-device
iommu private data.

Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Link: https://lore.kernel.org/r/20200516062101.29541-10-baolu.lu@linux.intel.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 3375303e

drivers/iommu/intel-iommu.c

+27 −13
Original line number Diff line number Diff line
@@ -365,6 +365,21 @@ EXPORT_SYMBOL_GPL(intel_iommu_gfx_mapped); 


#define DUMMY_DEVICE_DOMAIN_INFO ((struct device_domain_info *)(-1))

#define DEFER_DEVICE_DOMAIN_INFO ((struct device_domain_info *)(-2))

struct device_domain_info *get_domain_info(struct device *dev)

{

	struct device_domain_info *info;



	if (!dev)

		return NULL;



	info = dev->archdata.iommu;

	if (unlikely(info == DUMMY_DEVICE_DOMAIN_INFO ||

		     info == DEFER_DEVICE_DOMAIN_INFO))

		return NULL;



	return info;

}



DEFINE_SPINLOCK(device_domain_lock);

static LIST_HEAD(device_domain_list);
@@ -2429,7 +2444,7 @@ struct dmar_domain *find_domain(struct device *dev) 
		dev = &pci_real_dma_dev(to_pci_dev(dev))->dev;



	/* No lock here, assumes no domain exit in normal case */

	info = dev->archdata.iommu;

	info = get_domain_info(dev);

	if (likely(info))

		return info->domain;
@@ -5012,9 +5027,8 @@ static void dmar_remove_one_dev_info(struct device *dev) 
	unsigned long flags;



	spin_lock_irqsave(&device_domain_lock, flags);

	info = dev->archdata.iommu;

	if (info && info != DEFER_DEVICE_DOMAIN_INFO

	    && info != DUMMY_DEVICE_DOMAIN_INFO)

	info = get_domain_info(dev);

	if (info)

		__dmar_remove_one_dev_info(info);

	spin_unlock_irqrestore(&device_domain_lock, flags);

}
@@ -5104,7 +5118,7 @@ static void intel_iommu_domain_free(struct iommu_domain *domain) 
static inline bool

is_aux_domain(struct device *dev, struct iommu_domain *domain)

{

	struct device_domain_info *info = dev->archdata.iommu;

	struct device_domain_info *info = get_domain_info(dev);



	return info && info->auxd_enabled &&

			domain->type == IOMMU_DOMAIN_UNMANAGED;
@@ -5113,7 +5127,7 @@ is_aux_domain(struct device *dev, struct iommu_domain *domain) 
static void auxiliary_link_device(struct dmar_domain *domain,

				  struct device *dev)

{

	struct device_domain_info *info = dev->archdata.iommu;

	struct device_domain_info *info = get_domain_info(dev);



	assert_spin_locked(&device_domain_lock);

	if (WARN_ON(!info))
@@ -5126,7 +5140,7 @@ static void auxiliary_link_device(struct dmar_domain *domain, 
static void auxiliary_unlink_device(struct dmar_domain *domain,

				    struct device *dev)

{

	struct device_domain_info *info = dev->archdata.iommu;

	struct device_domain_info *info = get_domain_info(dev);



	assert_spin_locked(&device_domain_lock);

	if (WARN_ON(!info))
@@ -5214,7 +5228,7 @@ static void aux_domain_remove_dev(struct dmar_domain *domain, 
		return;



	spin_lock_irqsave(&device_domain_lock, flags);

	info = dev->archdata.iommu;

	info = get_domain_info(dev);

	iommu = info->iommu;



	auxiliary_unlink_device(domain, dev);
@@ -5404,7 +5418,7 @@ intel_iommu_sva_invalidate(struct iommu_domain *domain, struct device *dev, 


	spin_lock_irqsave(&device_domain_lock, flags);

	spin_lock(&iommu->lock);

	info = dev->archdata.iommu;

	info = get_domain_info(dev);

	if (!info) {

		ret = -EINVAL;

		goto out_unlock;
@@ -5768,7 +5782,7 @@ int intel_iommu_enable_pasid(struct intel_iommu *iommu, struct device *dev) 
	spin_lock(&iommu->lock);



	ret = -EINVAL;

	info = dev->archdata.iommu;

	info = get_domain_info(dev);

	if (!info || !info->pasid_supported)

		goto out;
@@ -5864,7 +5878,7 @@ static int intel_iommu_enable_auxd(struct device *dev) 
		return -ENODEV;



	spin_lock_irqsave(&device_domain_lock, flags);

	info = dev->archdata.iommu;

	info = get_domain_info(dev);

	info->auxd_enabled = 1;

	spin_unlock_irqrestore(&device_domain_lock, flags);
@@ -5877,7 +5891,7 @@ static int intel_iommu_disable_auxd(struct device *dev) 
	unsigned long flags;



	spin_lock_irqsave(&device_domain_lock, flags);

	info = dev->archdata.iommu;

	info = get_domain_info(dev);

	if (!WARN_ON(!info))

		info->auxd_enabled = 0;

	spin_unlock_irqrestore(&device_domain_lock, flags);
@@ -5954,7 +5968,7 @@ intel_iommu_dev_disable_feat(struct device *dev, enum iommu_dev_features feat) 
static bool

intel_iommu_dev_feat_enabled(struct device *dev, enum iommu_dev_features feat)

{

	struct device_domain_info *info = dev->archdata.iommu;

	struct device_domain_info *info = get_domain_info(dev);



	if (feat == IOMMU_DEV_FEAT_AUX)

		return scalable_mode_support() && info && info->auxd_enabled;

drivers/iommu/intel-pasid.c

+6 −6
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ int intel_pasid_alloc_table(struct device *dev) 
	int size;



	might_sleep();

	info = dev->archdata.iommu;

	info = get_domain_info(dev);

	if (WARN_ON(!info || !dev_is_pci(dev) || info->pasid_table))

		return -EINVAL;
@@ -198,7 +198,7 @@ void intel_pasid_free_table(struct device *dev) 
	struct pasid_entry *table;

	int i, max_pde;



	info = dev->archdata.iommu;

	info = get_domain_info(dev);

	if (!info || !dev_is_pci(dev) || !info->pasid_table)

		return;
@@ -224,7 +224,7 @@ struct pasid_table *intel_pasid_get_table(struct device *dev) 
{

	struct device_domain_info *info;



	info = dev->archdata.iommu;

	info = get_domain_info(dev);

	if (!info)

		return NULL;
@@ -235,7 +235,7 @@ int intel_pasid_get_dev_max_id(struct device *dev) 
{

	struct device_domain_info *info;



	info = dev->archdata.iommu;

	info = get_domain_info(dev);

	if (!info || !info->pasid_table)

		return 0;
@@ -256,7 +256,7 @@ struct pasid_entry *intel_pasid_get_entry(struct device *dev, int pasid) 
		return NULL;



	dir = pasid_table->table;

	info = dev->archdata.iommu;

	info = get_domain_info(dev);

	dir_index = pasid >> PASID_PDE_SHIFT;

	index = pasid & PASID_PTE_MASK;
@@ -462,7 +462,7 @@ devtlb_invalidation_with_pasid(struct intel_iommu *iommu, 
	struct device_domain_info *info;

	u16 sid, qdep, pfsid;



	info = dev->archdata.iommu;

	info = get_domain_info(dev);

	if (!info || !info->ats_enabled)

		return;

drivers/iommu/intel-svm.c

+1 −1
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_ 
		goto out;

	}



	info = dev->archdata.iommu;

	info = get_domain_info(dev);

	if (!info || !info->pasid_supported) {

		kfree(sdev);

		goto out;

include/linux/intel-iommu.h

+1 −0
Original line number Diff line number Diff line
@@ -714,6 +714,7 @@ int for_each_device_domain(int (*fn)(struct device_domain_info *info, 
void iommu_flush_write_buffer(struct intel_iommu *iommu);

int intel_iommu_enable_pasid(struct intel_iommu *iommu, struct device *dev);

struct dmar_domain *find_domain(struct device *dev);

struct device_domain_info *get_domain_info(struct device *dev);



#ifdef CONFIG_INTEL_IOMMU_SVM

extern void intel_svm_check(struct intel_iommu *iommu);

CRA Git | Maintained and supported by SUSTech CRA and CCSE