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

Commit c6c2cebd authored by Joerg Roedel's avatar Joerg Roedel
Browse files

iommu/vt-d: Establish domain<->iommu link in dmar_insert_one_dev_info 



This makes domain attachment more synchronous with domain
deattachment. The domain<->iommu link is released in
dmar_remove_one_dev_info.

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

drivers/iommu/intel-iommu.c

+11 −17
Original line number Diff line number Diff line
@@ -1919,14 +1919,16 @@ static int domain_context_mapping_one(struct dmar_domain *domain, 
				      struct intel_iommu *iommu,

				      u8 bus, u8 devfn)

{

	u16 did = domain->iommu_did[iommu->seq_id];

	int translation = CONTEXT_TT_MULTI_LEVEL;

	struct device_domain_info *info = NULL;

	struct context_entry *context;

	unsigned long flags;

	struct dma_pte *pgd;

	int id;

	int agaw;



	WARN_ON(did == 0);



	if (hw_pass_through && domain_type_is_si(domain))

		translation = CONTEXT_TT_PASS_THROUGH;
@@ -1948,15 +1950,8 @@ static int domain_context_mapping_one(struct dmar_domain *domain, 


	pgd = domain->pgd;



	id = __iommu_attach_domain(domain, iommu);

	if (id < 0) {

		spin_unlock_irqrestore(&iommu->lock, flags);

		pr_err("%s: No free domain ids\n", iommu->name);

		return -EFAULT;

	}



	context_clear_entry(context);

	context_set_domain_id(context, id);

	context_set_domain_id(context, did);



	/*

	 * Skip top levels of page tables for iommu which has less agaw
@@ -2002,15 +1997,13 @@ static int domain_context_mapping_one(struct dmar_domain *domain, 
					   (((u16)bus) << 8) | devfn,

					   DMA_CCMD_MASK_NOBIT,

					   DMA_CCMD_DEVICE_INVL);

		iommu->flush.flush_iotlb(iommu, id, 0, 0, DMA_TLB_DSI_FLUSH);

		iommu->flush.flush_iotlb(iommu, did, 0, 0, DMA_TLB_DSI_FLUSH);

	} else {

		iommu_flush_write_buffer(iommu);

	}

	iommu_enable_dev_iotlb(info);

	spin_unlock_irqrestore(&iommu->lock, flags);



	domain_attach_iommu(domain, iommu);



	return 0;

}
@@ -2320,6 +2313,12 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu, 
		return found;

	}



	if (iommu_attach_domain(domain, iommu) < 0) {

		spin_unlock_irqrestore(&device_domain_lock, flags);

		return NULL;

	}

	domain_attach_iommu(domain, iommu);



	list_add(&info->link, &domain->devices);

	list_add(&info->global, &device_domain_list);

	if (dev)
@@ -2383,11 +2382,6 @@ static struct dmar_domain *get_domain_for_dev(struct device *dev, int gaw) 
	domain = alloc_domain(0);

	if (!domain)

		return NULL;

	if (iommu_attach_domain(domain, iommu) < 0) {

		free_domain_mem(domain);

		return NULL;

	}

	domain_attach_iommu(domain, iommu);

	if (domain_init(domain, iommu, gaw)) {

		domain_exit(domain);

		return NULL;