Commit de4ee728 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jason Gunthorpe

nouveau: unlock mmap_sem on all errors from nouveau_range_fault

Currently nouveau_svm_fault expects nouveau_range_fault to never unlock
mmap_sem, but the latter unlocks it for a random selection of error
codes. Fix this up by always unlocking mmap_sem for non-zero return values
in nouveau_range_fault, and only unlocking it in the caller for successful
returns.

Link: https://lore.kernel.org/r/20190724065258.16603-5-hch@lst.deTested-by: default avatarRalph Campbell <rcampbell@nvidia.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 5fbcf501
...@@ -495,8 +495,10 @@ nouveau_range_fault(struct hmm_mirror *mirror, struct hmm_range *range) ...@@ -495,8 +495,10 @@ nouveau_range_fault(struct hmm_mirror *mirror, struct hmm_range *range)
ret = hmm_range_register(range, mirror, ret = hmm_range_register(range, mirror,
range->start, range->end, range->start, range->end,
PAGE_SHIFT); PAGE_SHIFT);
if (ret) if (ret) {
up_read(&range->vma->vm_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->vma->vm_mm->mmap_sem); up_read(&range->vma->vm_mm->mmap_sem);
...@@ -505,10 +507,9 @@ nouveau_range_fault(struct hmm_mirror *mirror, struct hmm_range *range) ...@@ -505,10 +507,9 @@ nouveau_range_fault(struct hmm_mirror *mirror, struct hmm_range *range)
ret = hmm_range_fault(range, true); ret = hmm_range_fault(range, true);
if (ret <= 0) { if (ret <= 0) {
if (ret == -EBUSY || !ret) { if (ret == 0)
up_read(&range->vma->vm_mm->mmap_sem);
ret = -EBUSY; ret = -EBUSY;
} up_read(&range->vma->vm_mm->mmap_sem);
hmm_range_unregister(range); hmm_range_unregister(range);
return ret; return ret;
} }
...@@ -706,8 +707,8 @@ nouveau_svm_fault(struct nvif_notify *notify) ...@@ -706,8 +707,8 @@ nouveau_svm_fault(struct nvif_notify *notify)
NULL); NULL);
svmm->vmm->vmm.object.client->super = false; svmm->vmm->vmm.object.client->super = false;
mutex_unlock(&svmm->mutex); mutex_unlock(&svmm->mutex);
up_read(&svmm->mm->mmap_sem);
} }
up_read(&svmm->mm->mmap_sem);
/* Cancel any faults in the window whose pages didn't manage /* Cancel any faults in the window whose pages didn't manage
* to keep their valid bit, or stay writeable when required. * to keep their valid bit, or stay writeable when required.
......
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