diff options
| author | Matthew Brost <matthew.brost@intel.com> | 2023-03-24 19:33:36 +0300 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2023-12-20 02:30:22 +0300 |
| commit | cf667aec0abeda839937cbd92884799b19df1ab7 (patch) | |
| tree | 9496152f8d78c8d010251d5c5b04bcc30c37ca7f | |
| parent | ef5e3c2f703d05c9d296d8f8ad0a0f48f6c1fcc9 (diff) | |
| download | linux-cf667aec0abeda839937cbd92884799b19df1ab7.tar.xz | |
drm/xe: Decrement fault mode counts in xe_vm_close_and_put
Rather waiting for the VM to be destroyed (all refs to VM go to zero),
drop the fault mode counts when the VM is closed in xe_vm_close_and_put.
This avoids a window where user space can create a faulting VM, close
it, and a subsequent creation of a non-faulting VM fails.
v2 (Lucas): Drop VLK reference in commit message
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Suggested-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
| -rw-r--r-- | drivers/gpu/drm/xe/xe_vm.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c index 207d20da5c68..49aa4ddedbf2 100644 --- a/drivers/gpu/drm/xe/xe_vm.c +++ b/drivers/gpu/drm/xe/xe_vm.c @@ -1427,6 +1427,13 @@ void xe_vm_close_and_put(struct xe_vm *vm) XE_WARN_ON(!list_empty(&vm->extobj.list)); up_write(&vm->lock); + mutex_lock(&xe->usm.lock); + if (vm->flags & XE_VM_FLAG_FAULT_MODE) + xe->usm.num_vm_in_fault_mode--; + else if (!(vm->flags & XE_VM_FLAG_MIGRATION)) + xe->usm.num_vm_in_non_fault_mode--; + mutex_unlock(&xe->usm.lock); + xe_vm_put(vm); } @@ -1469,18 +1476,10 @@ static void vm_destroy_work_func(struct work_struct *w) } xe_vm_unlock(vm, &ww); - mutex_lock(&xe->usm.lock); - if (vm->flags & XE_VM_FLAG_FAULT_MODE) - xe->usm.num_vm_in_fault_mode--; - else if (!(vm->flags & XE_VM_FLAG_MIGRATION)) - xe->usm.num_vm_in_non_fault_mode--; - mutex_unlock(&xe->usm.lock); - trace_xe_vm_free(vm); dma_fence_put(vm->rebind_fence); dma_resv_fini(&vm->resv); kfree(vm); - } void xe_vm_free(struct kref *ref) |