drm/amdgpu: reserve root PD while releasing it
Subsystems (2)
PATCH 1/1 drm/amdgpu: reserve root PD while releasing it
From: Christian König <[email protected]>
Otherwise somebody could try to evict it at the same time and try to use halve torn down structures.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +11 -2
@@ -2759,8 +2759,9 @@ void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm) {struct amdgpu_bo_va_mapping *mapping, *tmp;bool prt_fini_needed = !!adev->gart.gart_funcs->set_prt; +struct amdgpu_bo *root;u64 fault; -int i; +int i, r;/* Clear pending page faults from IH when the VM is destroyed */ while (kfifo_get (&vm->faults, &fault))
@@ -2794,7 +2795,15 @@ void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm)amdgpu_vm_free_mapping (adev, vm, mapping,NULL ); } -amdgpu_vm_free_levels (&vm->root); + root =amdgpu_bo_ref (vm->root.base.bo); + r =amdgpu_bo_reserve (root, true); +if (r) { +dev_err (adev->dev,"Leaking page tables because BO reservation failed\n" ); + }else { +amdgpu_vm_free_levels (&vm->root); +amdgpu_bo_unreserve (root); + } +amdgpu_bo_unref (&root);dma_fence_put (vm->last_update);for (i =0 ; i <AMDGPU_MAX_VMHUBS ; i++)amdgpu_vm_free_reserved_vmid (adev, vm, i);
Signature · 6 lines
2.11.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20171013152608.2036-1-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 7 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Christian König
Sent: Friday, October 13, 2017 11:26 AM
To: [email protected]
Subject: [PATCH] drm/amdgpu: reserve root PD while releasing it
Quoted 6 lines
From: Christian König <[email protected]>
Otherwise somebody could try to evict it at the same time and try to use halve torn down structures.
Signed-off-by Christian König <[email protected]>
Quoted 43 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +2
-1@@ -2759,8 +2759,9 @@ void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm) {struct amdgpu_bo_va_mapping *mapping, *tmp;bool prt_fini_needed = !!adev->gart.gart_funcs->set_prt; +struct amdgpu_bo *root;u64 fault; -int i; +int i, r;/* Clear pending page faults from IH when the VM is destroyed */ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +9
-1while (kfifo_get (&vm->faults, &fault))@@ -2794,7 +2795,15 @@ void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm)amdgpu_vm_free_mapping (adev, vm, mapping,NULL ); } -amdgpu_vm_free_levels (&vm->root); + root =amdgpu_bo_ref (vm->root.base.bo); + r =amdgpu_bo_reserve (root, true); +if (r) { + dev_err(adev->dev, "Leaking page tables because BO reservation failed\n"); + } else { + amdgpu_vm_free_levels(&vm->root); +amdgpu_bo_unreserve (root); + } +amdgpu_bo_unref (&root);dma_fence_put (vm->last_update);drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0
-1for (i =0 ; i <AMDGPU_MAX_VMHUBS ; i++)amdgpu_vm_free_reserved_vmid (adev, vm, i); --2.11.0
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 4 lines · Christian König
From: Christian König <[email protected]>
Otherwise somebody could try to evict it at the same time and try to use halve torn down structures.
Typo: "half torn down"
Quoted 28 lines
Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +4
-2@@ -2759,8 +2759,9 @@ void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm) {struct amdgpu_bo_va_mapping *mapping, *tmp;bool prt_fini_needed = !!adev->gart.gart_funcs->set_prt; +struct amdgpu_bo *root;u64 fault; -int i; +int i, r;/* Clear pending page faults from IH when the VM is destroyed */ while (kfifo_get (&vm->faults, &fault))@@ -2794,7 +2795,15 @@ void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm)amdgpu_vm_free_mapping (adev, vm, mapping,NULL ); } -amdgpu_vm_free_levels (&vm->root); + root =amdgpu_bo_ref (vm->root.base.bo); + r =amdgpu_bo_reserve (root, true);
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm) · line 2809
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +7
-0+if (r) { +dev_err (adev->dev,"Leaking page tables because BO reservation failed\n" ); + }else { +amdgpu_vm_free_levels (&vm->root); +amdgpu_bo_unreserve (root); + } +amdgpu_bo_unref (&root);dma_fence_put (vm->last_update);for (i =0 ; i <AMDGPU_MAX_VMHUBS ; i++)amdgpu_vm_free_reserved_vmid (adev, vm, i);
That seems to do the trick, thanks!
Signature · 6 lines
Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Mesa and X developer _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx