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

iommu/vt-d: Use pci_get_domain_bus_and_slot() in pgtable_walk() 



Use pci_get_domain_bus_and_slot() instead of searching the global list
to retrieve the pci device pointer. This also removes the global
device_domain_list as there isn't any consumer anymore.

Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Link: https://lore.kernel.org/r/20220706025524.2904370-4-baolu.lu@linux.intel.com


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

drivers/iommu/intel/iommu.c

+6 −28
Original line number Diff line number Diff line
@@ -131,8 +131,6 @@ static struct intel_iommu **g_iommus; 


static void __init check_tylersburg_isoch(void);

static int rwbf_quirk;

static inline struct device_domain_info *

dmar_search_domain_by_dev_info(int segment, int bus, int devfn);



/*

 * set to 1 to panic kernel if can't successfully enable VT-d
@@ -315,8 +313,6 @@ static int iommu_skip_te_disable; 
#define IDENTMAP_AZALIA		4



static DEFINE_SPINLOCK(device_domain_lock);

static LIST_HEAD(device_domain_list);



const struct iommu_ops intel_iommu_ops;



static bool translation_pre_enabled(struct intel_iommu *iommu)
@@ -846,9 +842,14 @@ static void pgtable_walk(struct intel_iommu *iommu, unsigned long pfn, u8 bus, u 
	struct device_domain_info *info;

	struct dma_pte *parent, *pte;

	struct dmar_domain *domain;

	struct pci_dev *pdev;

	int offset, level;



	info = dmar_search_domain_by_dev_info(iommu->segment, bus, devfn);

	pdev = pci_get_domain_bus_and_slot(iommu->segment, bus, devfn);

	if (!pdev)

		return;



	info = dev_iommu_priv_get(&pdev->dev);

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

		pr_info("device [%02x:%02x.%d] not probed\n",

			bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
@@ -2357,19 +2358,6 @@ static void domain_remove_dev_info(struct dmar_domain *domain) 
	spin_unlock_irqrestore(&device_domain_lock, flags);

}



static inline struct device_domain_info *

dmar_search_domain_by_dev_info(int segment, int bus, int devfn)

{

	struct device_domain_info *info;



	list_for_each_entry(info, &device_domain_list, global)

		if (info->segment == segment && info->bus == bus &&

		    info->devfn == devfn)

			return info;



	return NULL;

}



static int domain_setup_first_level(struct intel_iommu *iommu,

				    struct dmar_domain *domain,

				    struct device *dev,
@@ -4573,7 +4561,6 @@ static struct iommu_device *intel_iommu_probe_device(struct device *dev) 
	struct pci_dev *pdev = dev_is_pci(dev) ? to_pci_dev(dev) : NULL;

	struct device_domain_info *info;

	struct intel_iommu *iommu;

	unsigned long flags;

	u8 bus, devfn;



	iommu = device_to_iommu(dev, &bus, &devfn);
@@ -4616,10 +4603,7 @@ static struct iommu_device *intel_iommu_probe_device(struct device *dev) 
		}

	}



	spin_lock_irqsave(&device_domain_lock, flags);

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

	dev_iommu_priv_set(dev, info);

	spin_unlock_irqrestore(&device_domain_lock, flags);



	return &iommu->iommu;

}
@@ -4627,15 +4611,9 @@ static struct iommu_device *intel_iommu_probe_device(struct device *dev) 
static void intel_iommu_release_device(struct device *dev)

{

	struct device_domain_info *info = dev_iommu_priv_get(dev);

	unsigned long flags;



	dmar_remove_one_dev_info(dev);



	spin_lock_irqsave(&device_domain_lock, flags);

	dev_iommu_priv_set(dev, NULL);

	list_del(&info->global);

	spin_unlock_irqrestore(&device_domain_lock, flags);



	kfree(info);

	set_dma_ops(dev, NULL);

}

drivers/iommu/intel/iommu.h

+0 −1
Original line number Diff line number Diff line
@@ -609,7 +609,6 @@ struct intel_iommu { 
/* PCI domain-device relationship */

struct device_domain_info {

	struct list_head link;	/* link to domain siblings */

	struct list_head global; /* link to global list */

	u32 segment;		/* PCI segment number */

	u8 bus;			/* PCI bus number */

	u8 devfn;		/* PCI devfn number */