AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-23 12:34:55 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

nouveau: pass struct nouveau_svmm to nouveau_range_fault

Browse Source 
We'll need the nouveau_svmm structure to improve the function soon.  For
now this allows using the svmm->mm reference to unlock the mmap_sem, and
thus the same dereference chain that the caller uses to lock and unlock
it.

Link: https://lore.kernel.org/r/20190806160554.14046-4-hch@lst.de
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
Christoph Hellwig 2019-08-06 19:05:41 +03:00 committed by Jason Gunthorpe
parent 07d82211b8
commit 5aa0acb374
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/nouveau/nouveau_svm.c
View File

@ -485,23 +485,23 @@ nouveau_range_done(struct hmm_range *range)
} }
static int static int
nouveau_range_fault(struct hmm_mirror *mirror, struct hmm_range *range) nouveau_range_fault(struct nouveau_svmm *svmm, struct hmm_range *range)
{ {
long ret; long ret;
range->default_flags = 0; range->default_flags = 0;
range->pfn_flags_mask = -1UL; range->pfn_flags_mask = -1UL;
ret = hmm_range_register(range, mirror, ret = hmm_range_register(range, &svmm->mirror,
range->start, range->end, range->start, range->end,
PAGE_SHIFT); PAGE_SHIFT);
if (ret) { if (ret) {
up_read(&range->hmm->mm->mmap_sem); up_read(&svmm->mm->mmap_sem);
return (int)ret; return (int)ret;
} }
if (!hmm_range_wait_until_valid(range, HMM_RANGE_DEFAULT_TIMEOUT)) { if (!hmm_range_wait_until_valid(range, HMM_RANGE_DEFAULT_TIMEOUT)) {
up_read(&range->hmm->mm->mmap_sem); up_read(&svmm->mm->mmap_sem);
return -EBUSY; return -EBUSY;
} }
@ -509,7 +509,7 @@ nouveau_range_fault(struct hmm_mirror *mirror, struct hmm_range *range)
if (ret <= 0) { if (ret <= 0) {
if (ret == 0) if (ret == 0)
ret = -EBUSY; ret = -EBUSY;
up_read(&range->hmm->mm->mmap_sem); up_read(&svmm->mm->mmap_sem);
hmm_range_unregister(range); hmm_range_unregister(range);
return ret; return ret;
} }
@ -689,7 +689,7 @@ nouveau_svm_fault(struct nvif_notify *notify)
range.values = nouveau_svm_pfn_values; range.values = nouveau_svm_pfn_values;
range.pfn_shift = NVIF_VMM_PFNMAP_V0_ADDR_SHIFT; range.pfn_shift = NVIF_VMM_PFNMAP_V0_ADDR_SHIFT;
again: again:
ret = nouveau_range_fault(&svmm->mirror, &range); ret = nouveau_range_fault(svmm, &range);
if (ret == 0) { if (ret == 0) {
mutex_lock(&svmm->mutex); mutex_lock(&svmm->mutex);
if (!nouveau_range_done(&range)) { if (!nouveau_range_done(&range)) {