UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

iommu/vt-d: Use common helper to lookup svm devices 

It's common to iterate the svm device list and find a matched device. Add
common helpers to do this and consolidate the code.

Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Link: https://lore.kernel.org/r/20210520031531.712333-1-baolu.lu@linux.intel.com
Link: https://lore.kernel.org/r/20210610020115.1637656-9-baolu.lu@linux.intel.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Lu Baolu 2021-06-10 10:01:00 +08:00 committed by Joerg Roedel
parent 4048377414
commit 9e52cc0fed
1 changed files with 40 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
drivers/iommu/intel/svm.c
View File

@ -48,6 +48,40 @@ static void *pasid_private_find(ioasid_t pasid)
return xa_load(&pasid_private_array, pasid); return xa_load(&pasid_private_array, pasid);
} }
static struct intel_svm_dev *
svm_lookup_device_by_sid(struct intel_svm *svm, u16 sid)
{
struct intel_svm_dev *sdev = NULL, *t;
rcu_read_lock();
list_for_each_entry_rcu(t, &svm->devs, list) {
if (t->sid == sid) {
sdev = t;
break;
}
}
rcu_read_unlock();
return sdev;
}
static struct intel_svm_dev *
svm_lookup_device_by_dev(struct intel_svm *svm, struct device *dev)
{
struct intel_svm_dev *sdev = NULL, *t;
rcu_read_lock();
list_for_each_entry_rcu(t, &svm->devs, list) {
if (t->dev == dev) {
sdev = t;
break;
}
}
rcu_read_unlock();
return sdev;
}
int intel_svm_enable_prq(struct intel_iommu *iommu) int intel_svm_enable_prq(struct intel_iommu *iommu)
{ {
struct page *pages; struct page *pages;
@ -225,15 +259,11 @@ static const struct mmu_notifier_ops intel_mmuops = {
static DEFINE_MUTEX(pasid_mutex); static DEFINE_MUTEX(pasid_mutex);
#define for_each_svm_dev(sdev, svm, d) \
list_for_each_entry((sdev), &(svm)->devs, list) \
if ((d) != (sdev)->dev) {} else
static int pasid_to_svm_sdev(struct device *dev, unsigned int pasid, static int pasid_to_svm_sdev(struct device *dev, unsigned int pasid,
struct intel_svm **rsvm, struct intel_svm **rsvm,
struct intel_svm_dev **rsdev) struct intel_svm_dev **rsdev)
{ {
struct intel_svm_dev *d, *sdev = NULL; struct intel_svm_dev *sdev = NULL;
struct intel_svm *svm; struct intel_svm *svm;
/* The caller should hold the pasid_mutex lock */ /* The caller should hold the pasid_mutex lock */
@ -256,15 +286,7 @@ static int pasid_to_svm_sdev(struct device *dev, unsigned int pasid,
*/ */
if (WARN_ON(list_empty(&svm->devs))) if (WARN_ON(list_empty(&svm->devs)))
return -EINVAL; return -EINVAL;
sdev = svm_lookup_device_by_dev(svm, dev);
rcu_read_lock();
list_for_each_entry_rcu(d, &svm->devs, list) {
if (d->dev == dev) {
sdev = d;
break;
}
}
rcu_read_unlock();
out: out:
*rsvm = svm; *rsvm = svm;
@ -533,7 +555,8 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu,
} }
/* Find the matching device in svm list */ /* Find the matching device in svm list */
for_each_svm_dev(sdev, svm, dev) { sdev = svm_lookup_device_by_dev(svm, dev);
if (sdev) {
sdev->users++; sdev->users++;
goto success; goto success;
} }
@ -901,19 +924,8 @@ static irqreturn_t prq_event_thread(int irq, void *d)
} }
} }
if (!sdev || sdev->sid != req->rid) { if (!sdev || sdev->sid != req->rid)
struct intel_svm_dev *t; sdev = svm_lookup_device_by_sid(svm, req->rid);
sdev = NULL;
rcu_read_lock();
list_for_each_entry_rcu(t, &svm->devs, list) {
if (t->sid == req->rid) {
sdev = t;
break;
}
}
rcu_read_unlock();
}
/* Since we're using init_mm.pgd directly, we should never take /* Since we're using init_mm.pgd directly, we should never take
* any faults on kernel addresses. */ * any faults on kernel addresses. */