Commit ad16a469 authored by Edward O'Callaghan's avatar Edward O'Callaghan Committed by Oded Gabbay

drm/amdkfd: Reuse function to find a process through pasid

The kfd_lookup_process_by_pasid() is just for that purpose,
so use it instead of repeating the code.

v2: return on the condition (p == NULL) instead of BUG_ON(!p).
Signed-off-by: default avatarEdward O'Callaghan <funfunctor@folklore1984.net>
Reviewed-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
parent 78b13f79
...@@ -404,58 +404,47 @@ void kfd_unbind_process_from_device(struct kfd_dev *dev, unsigned int pasid) ...@@ -404,58 +404,47 @@ void kfd_unbind_process_from_device(struct kfd_dev *dev, unsigned int pasid)
{ {
struct kfd_process *p; struct kfd_process *p;
struct kfd_process_device *pdd; struct kfd_process_device *pdd;
int idx, i;
BUG_ON(dev == NULL); BUG_ON(dev == NULL);
idx = srcu_read_lock(&kfd_processes_srcu);
/* /*
* Look for the process that matches the pasid. If there is no such * Look for the process that matches the pasid. If there is no such
* process, we either released it in amdkfd's own notifier, or there * process, we either released it in amdkfd's own notifier, or there
* is a bug. Unfortunately, there is no way to tell... * is a bug. Unfortunately, there is no way to tell...
*/ */
hash_for_each_rcu(kfd_processes_table, i, p, kfd_processes) p = kfd_lookup_process_by_pasid(pasid);
if (p->pasid == pasid) { if (!p)
return;
srcu_read_unlock(&kfd_processes_srcu, idx);
pr_debug("Unbinding process %d from IOMMU\n", pasid);
mutex_lock(&p->mutex); pr_debug("Unbinding process %d from IOMMU\n", pasid);
if ((dev->dbgmgr) && (dev->dbgmgr->pasid == p->pasid))
kfd_dbgmgr_destroy(dev->dbgmgr);
pqm_uninit(&p->pqm);
pdd = kfd_get_process_device_data(dev, p); if ((dev->dbgmgr) && (dev->dbgmgr->pasid == p->pasid))
kfd_dbgmgr_destroy(dev->dbgmgr);
if (!pdd) { pqm_uninit(&p->pqm);
mutex_unlock(&p->mutex);
return;
}
if (pdd->reset_wavefronts) { pdd = kfd_get_process_device_data(dev, p);
dbgdev_wave_reset_wavefronts(pdd->dev, p);
pdd->reset_wavefronts = false;
}
/* if (!pdd) {
* Just mark pdd as unbound, because we still need it mutex_unlock(&p->mutex);
* to call amd_iommu_unbind_pasid() in when the return;
* process exits. }
* We don't call amd_iommu_unbind_pasid() here
* because the IOMMU called us.
*/
pdd->bound = false;
mutex_unlock(&p->mutex); if (pdd->reset_wavefronts) {
dbgdev_wave_reset_wavefronts(pdd->dev, p);
pdd->reset_wavefronts = false;
}
return; /*
} * Just mark pdd as unbound, because we still need it
* to call amd_iommu_unbind_pasid() in when the
* process exits.
* We don't call amd_iommu_unbind_pasid() here
* because the IOMMU called us.
*/
pdd->bound = false;
srcu_read_unlock(&kfd_processes_srcu, idx); mutex_unlock(&p->mutex);
} }
struct kfd_process_device *kfd_get_first_process_device_data(struct kfd_process *p) struct kfd_process_device *kfd_get_first_process_device_data(struct kfd_process *p)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment