Commit 0b15f2fc authored by Christian König's avatar Christian König Committed by Alex Deucher

drm/amdgpu: add OOM fallback on PRT teardown (v2)

Don't assume kmalloc will always succeed.

v2: agd: rebase
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarNicolai Hähnle <nicolai.haehnle@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1b04e412
...@@ -1193,6 +1193,15 @@ static void amdgpu_vm_update_prt_state(struct amdgpu_device *adev) ...@@ -1193,6 +1193,15 @@ static void amdgpu_vm_update_prt_state(struct amdgpu_device *adev)
spin_unlock_irqrestore(&adev->vm_manager.prt_lock, flags); spin_unlock_irqrestore(&adev->vm_manager.prt_lock, flags);
} }
/**
* amdgpu_vm_prt_put - drop a PRT user
*/
static void amdgpu_vm_prt_put(struct amdgpu_device *adev)
{
if (atomic_dec_return(&adev->vm_manager.num_prt_mappings) == 0)
amdgpu_vm_update_prt_state(adev);
}
/** /**
* amdgpu_vm_prt - callback for updating the PRT status * amdgpu_vm_prt - callback for updating the PRT status
*/ */
...@@ -1200,8 +1209,7 @@ static void amdgpu_vm_prt_cb(struct dma_fence *fence, struct dma_fence_cb *_cb) ...@@ -1200,8 +1209,7 @@ static void amdgpu_vm_prt_cb(struct dma_fence *fence, struct dma_fence_cb *_cb)
{ {
struct amdgpu_prt_cb *cb = container_of(_cb, struct amdgpu_prt_cb, cb); struct amdgpu_prt_cb *cb = container_of(_cb, struct amdgpu_prt_cb, cb);
if (atomic_dec_return(&cb->adev->vm_manager.num_prt_mappings) == 0) amdgpu_vm_prt_put(cb->adev);
amdgpu_vm_update_prt_state(cb->adev);
kfree(cb); kfree(cb);
} }
...@@ -1224,10 +1232,18 @@ static void amdgpu_vm_free_mapping(struct amdgpu_device *adev, ...@@ -1224,10 +1232,18 @@ static void amdgpu_vm_free_mapping(struct amdgpu_device *adev,
struct amdgpu_prt_cb *cb = kmalloc(sizeof(struct amdgpu_prt_cb), struct amdgpu_prt_cb *cb = kmalloc(sizeof(struct amdgpu_prt_cb),
GFP_KERNEL); GFP_KERNEL);
cb->adev = adev; if (!cb) {
if (!fence || dma_fence_add_callback(fence, &cb->cb, /* Last resort when we are OOM */
amdgpu_vm_prt_cb)) if (fence)
amdgpu_vm_prt_cb(fence, &cb->cb); dma_fence_wait(fence, false);
amdgpu_vm_prt_put(cb->adev);
} else {
cb->adev = adev;
if (!fence || dma_fence_add_callback(fence, &cb->cb,
amdgpu_vm_prt_cb))
amdgpu_vm_prt_cb(fence, &cb->cb);
}
} }
kfree(mapping); kfree(mapping);
} }
......
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