shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

nouveau/svm: fix missing folio unlock + put after make_device_exclusive_range()

Browse Source 
[ Upstream commit b3fefbb30a1691533cb905006b69b2a474660744 ]

In case we have to retry the loop, we are missing to unlock+put the
folio. In that case, we will keep failing make_device_exclusive_range()
because we cannot grab the folio lock, and even return from the function
with the folio locked and referenced, effectively never succeeding the
make_device_exclusive_range().

While at it, convert the other unlock+put to use a folio as well.

This was found by code inspection.

Fixes: 8f187163eb ("nouveau/svm: implement atomic SVM access")
Signed-off-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Alistair Popple <apopple@nvidia.com>
Tested-by: Alistair Popple <apopple@nvidia.com>
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20250124181524.3584236-2-david@redhat.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
David Hildenbrand
2025-01-24 19:15:23 +01:00
committed by Greg Kroah-Hartman
parent 51ae6861c4
commit 7f7f3f42e8
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -592,6 +592,7 @@ static int nouveau_atomic_range_fault(struct nouveau_svmm *svmm,
unsigned long timeout = unsigned long timeout =
jiffies + msecs_to_jiffies(HMM_RANGE_DEFAULT_TIMEOUT); jiffies + msecs_to_jiffies(HMM_RANGE_DEFAULT_TIMEOUT);
struct mm_struct *mm = svmm->notifier.mm; struct mm_struct *mm = svmm->notifier.mm;
struct folio *folio;
struct page *page; struct page *page;
unsigned long start = args->p.addr; unsigned long start = args->p.addr;
unsigned long notifier_seq; unsigned long notifier_seq;
@@ -618,12 +619,16 @@ static int nouveau_atomic_range_fault(struct nouveau_svmm *svmm,
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
folio = page_folio(page);
mutex_lock(&svmm->mutex); mutex_lock(&svmm->mutex);
if (!mmu_interval_read_retry(&notifier->notifier, if (!mmu_interval_read_retry(&notifier->notifier,
notifier_seq)) notifier_seq))
break; break;
mutex_unlock(&svmm->mutex); mutex_unlock(&svmm->mutex);
folio_unlock(folio);
folio_put(folio);
} }
/* Map the page on the GPU. */ /* Map the page on the GPU. */
@@ -639,8 +644,8 @@ static int nouveau_atomic_range_fault(struct nouveau_svmm *svmm,
ret = nvif_object_ioctl(&svmm->vmm->vmm.object, args, size, NULL); ret = nvif_object_ioctl(&svmm->vmm->vmm.object, args, size, NULL);
mutex_unlock(&svmm->mutex); mutex_unlock(&svmm->mutex);
unlock_page(page); folio_unlock(folio);
put_page(page); folio_put(folio);
out: out:
mmu_interval_notifier_remove(&notifier->notifier); mmu_interval_notifier_remove(&notifier->notifier);