drm/xe: Use xe_vma_ops to implement page fault rebinds

In effort to make multiple VMA binds operations atomic (1 job), all
device page tables updates will be implemented via a xe_vma_ops (atomic
unit) interface,

Add xe_vma_rebind function which is implemented using xe_vma_ops
interface. Use xe_vma_rebind in GPU page faults for rebinds rather than
directly called deprecated function in PT layer.

v3:
 - Update commit message (Oak)
v4:
 - Fix tile_mask argument (CI)

Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Oak Zeng <oak.zeng@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240425045513.1913039-8-matthew.brost@intel.com

diff --git a/drivers/gpu/drm/xe/xe_gt_pagefault.c b/drivers/gpu/drm/xe/xe_gt_pagefault.c
index fa9e9853c53ba605e0e35870bed69e7d09d25934..040dd142c49c36005412ccad645a692838845d0a 100644 (file)
--- a/drivers/gpu/drm/xe/xe_gt_pagefault.c
+++ b/drivers/gpu/drm/xe/xe_gt_pagefault.c
@@ -19,7 +19,6 @@
 #include "xe_guc.h"
 #include "xe_guc_ct.h"
 #include "xe_migrate.h"
-#include "xe_pt.h"
 #include "xe_trace.h"
 #include "xe_vm.h"
 
@@ -204,15 +203,14 @@ retry_userptr:
                drm_exec_retry_on_contention(&exec);
                if (ret)
                        goto unlock_dma_resv;
-       }
 
-       /* Bind VMA only to the GT that has faulted */
-       trace_xe_vma_pf_bind(vma);
-       fence = __xe_pt_bind_vma(tile, vma, xe_tile_migrate_engine(tile), NULL, 0,
-                                vma->tile_present & BIT(tile->id));
-       if (IS_ERR(fence)) {
-               ret = PTR_ERR(fence);
-               goto unlock_dma_resv;
+               /* Bind VMA only to the GT that has faulted */
+               trace_xe_vma_pf_bind(vma);
+               fence = xe_vma_rebind(vm, vma, BIT(tile->id));
+               if (IS_ERR(fence)) {
+                       ret = PTR_ERR(fence);
+                       goto unlock_dma_resv;
+               }
        }
 
        /*

diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
index 66a27ade77d7b8e6ed18a3ce8e77647a877560b0..cb38acabe6825a7bcf1c80e6bb7513270fefee51 100644 (file)
--- a/drivers/gpu/drm/xe/xe_vm.c
+++ b/drivers/gpu/drm/xe/xe_vm.c
@@ -716,6 +716,7 @@ static void xe_vm_populate_rebind(struct xe_vma_op *op, struct xe_vma *vma,
                                  u8 tile_mask)
 {
        INIT_LIST_HEAD(&op->link);
+       op->tile_mask = tile_mask;
        op->base.op = DRM_GPUVA_OP_MAP;
        op->base.map.va.addr = vma->gpuva.va.addr;
        op->base.map.va.range = vma->gpuva.va.range;
@@ -794,6 +795,33 @@ free_ops:
        return err;
 }
 
+struct dma_fence *xe_vma_rebind(struct xe_vm *vm, struct xe_vma *vma, u8 tile_mask)
+{
+       struct dma_fence *fence = NULL;
+       struct xe_vma_ops vops;
+       struct xe_vma_op *op, *next_op;
+       int err;
+
+       lockdep_assert_held(&vm->lock);
+       xe_vm_assert_held(vm);
+       xe_assert(vm->xe, xe_vm_in_fault_mode(vm));
+
+       xe_vma_ops_init(&vops);
+
+       err = xe_vm_ops_add_rebind(&vops, vma, tile_mask);
+       if (err)
+               return ERR_PTR(err);
+
+       fence = ops_execute(vm, &vops);
+
+       list_for_each_entry_safe(op, next_op, &vops.list, link) {
+               list_del(&op->link);
+               kfree(op);
+       }
+
+       return fence;
+}
+
 static void xe_vma_free(struct xe_vma *vma)
 {
        if (xe_vma_is_userptr(vma))
@@ -1694,7 +1722,7 @@ err_fences:
 static struct dma_fence *
 xe_vm_bind_vma(struct xe_vma *vma, struct xe_exec_queue *q,
               struct xe_sync_entry *syncs, u32 num_syncs,
-              bool first_op, bool last_op)
+              u8 tile_mask, bool first_op, bool last_op)
 {
        struct xe_tile *tile;
        struct dma_fence *fence;
@@ -1702,7 +1730,7 @@ xe_vm_bind_vma(struct xe_vma *vma, struct xe_exec_queue *q,
        struct dma_fence_array *cf = NULL;
        struct xe_vm *vm = xe_vma_vm(vma);
        int cur_fence = 0, i;
-       int number_tiles = hweight8(vma->tile_mask);
+       int number_tiles = hweight8(tile_mask);
        int err;
        u8 id;
 
@@ -1716,7 +1744,7 @@ xe_vm_bind_vma(struct xe_vma *vma, struct xe_exec_queue *q,
        }
 
        for_each_tile(tile, vm->xe, id) {
-               if (!(vma->tile_mask & BIT(id)))
+               if (!(tile_mask & BIT(id)))
                        goto next;
 
                fence = __xe_pt_bind_vma(tile, vma, q ? q : vm->q[id],
@@ -1784,7 +1812,7 @@ find_ufence_get(struct xe_sync_entry *syncs, u32 num_syncs)
 static struct dma_fence *
 xe_vm_bind(struct xe_vm *vm, struct xe_vma *vma, struct xe_exec_queue *q,
           struct xe_bo *bo, struct xe_sync_entry *syncs, u32 num_syncs,
-          bool immediate, bool first_op, bool last_op)
+          u8 tile_mask, bool immediate, bool first_op, bool last_op)
 {
        struct dma_fence *fence;
        struct xe_exec_queue *wait_exec_queue = to_wait_exec_queue(vm, q);
@@ -1800,8 +1828,8 @@ xe_vm_bind(struct xe_vm *vm, struct xe_vma *vma, struct xe_exec_queue *q,
        vma->ufence = ufence ?: vma->ufence;
 
        if (immediate) {
-               fence = xe_vm_bind_vma(vma, q, syncs, num_syncs, first_op,
-                                      last_op);
+               fence = xe_vm_bind_vma(vma, q, syncs, num_syncs, tile_mask,
+                                      first_op, last_op);
                if (IS_ERR(fence))
                        return fence;
        } else {
@@ -1993,7 +2021,7 @@ xe_vm_prefetch(struct xe_vm *vm, struct xe_vma *vma,
 
        if (vma->tile_mask != (vma->tile_present & ~vma->tile_invalidated)) {
                return xe_vm_bind(vm, vma, q, xe_vma_bo(vma), syncs, num_syncs,
-                                 true, first_op, last_op);
+                                 vma->tile_mask, true, first_op, last_op);
        } else {
                struct dma_fence *fence =
                        xe_exec_queue_last_fence_get(wait_exec_queue, vm);
@@ -2306,10 +2334,15 @@ static int vm_bind_ioctl_ops_parse(struct xe_vm *vm, struct xe_exec_queue *q,
        struct xe_device *xe = vm->xe;
        struct xe_vma_op *last_op = NULL;
        struct drm_gpuva_op *__op;
+       struct xe_tile *tile;
+       u8 id, tile_mask = 0;
        int err = 0;
 
        lockdep_assert_held_write(&vm->lock);
 
+       for_each_tile(tile, vm->xe, id)
+               tile_mask |= 0x1 << id;
+
        drm_gpuva_for_each_op(__op, ops) {
                struct xe_vma_op *op = gpuva_op_to_vma_op(__op);
                struct xe_vma *vma;
@@ -2326,6 +2359,7 @@ static int vm_bind_ioctl_ops_parse(struct xe_vm *vm, struct xe_exec_queue *q,
                }
 
                op->q = q;
+               op->tile_mask = tile_mask;
 
                switch (op->base.op) {
                case DRM_GPUVA_OP_MAP:
@@ -2471,6 +2505,7 @@ static struct dma_fence *op_execute(struct xe_vm *vm, struct xe_vma *vma,
        case DRM_GPUVA_OP_MAP:
                fence = xe_vm_bind(vm, vma, op->q, xe_vma_bo(vma),
                                   op->syncs, op->num_syncs,
+                                  op->tile_mask,
                                   op->map.immediate || !xe_vm_in_fault_mode(vm),
                                   op->flags & XE_VMA_OP_FIRST,
                                   op->flags & XE_VMA_OP_LAST);
@@ -2498,7 +2533,9 @@ static struct dma_fence *op_execute(struct xe_vm *vm, struct xe_vma *vma,
                        dma_fence_put(fence);
                        fence = xe_vm_bind(vm, op->remap.prev, op->q,
                                           xe_vma_bo(op->remap.prev), op->syncs,
-                                          op->num_syncs, true, false,
+                                          op->num_syncs,
+                                          op->remap.prev->tile_mask, true,
+                                          false,
                                           op->flags & XE_VMA_OP_LAST && !next);
                        op->remap.prev->gpuva.flags &= ~XE_VMA_LAST_REBIND;
                        if (IS_ERR(fence))
@@ -2512,8 +2549,8 @@ static struct dma_fence *op_execute(struct xe_vm *vm, struct xe_vma *vma,
                        fence = xe_vm_bind(vm, op->remap.next, op->q,
                                           xe_vma_bo(op->remap.next),
                                           op->syncs, op->num_syncs,
-                                          true, false,
-                                          op->flags & XE_VMA_OP_LAST);
+                                          op->remap.next->tile_mask, true,
+                                          false, op->flags & XE_VMA_OP_LAST);
                        op->remap.next->gpuva.flags &= ~XE_VMA_LAST_REBIND;
                        if (IS_ERR(fence))
                                break;

diff --git a/drivers/gpu/drm/xe/xe_vm.h b/drivers/gpu/drm/xe/xe_vm.h
index 306cd0934a190ba0d5580787522c59e762b3b163..204a4ff63f8805ec45c04fbc130115af303603e4 100644 (file)
--- a/drivers/gpu/drm/xe/xe_vm.h
+++ b/drivers/gpu/drm/xe/xe_vm.h
@@ -208,6 +208,8 @@ int __xe_vm_userptr_needs_repin(struct xe_vm *vm);
 int xe_vm_userptr_check_repin(struct xe_vm *vm);
 
 int xe_vm_rebind(struct xe_vm *vm, bool rebind_worker);
+struct dma_fence *xe_vma_rebind(struct xe_vm *vm, struct xe_vma *vma,
+                               u8 tile_mask);
 
 int xe_vm_invalidate_vma(struct xe_vma *vma);
 

diff --git a/drivers/gpu/drm/xe/xe_vm_types.h b/drivers/gpu/drm/xe/xe_vm_types.h
index 149ab892967e810a36c20c0a516137e23bb6af75..e9cd6da6263a60d20a2417713be16abdb3225429 100644 (file)
--- a/drivers/gpu/drm/xe/xe_vm_types.h
+++ b/drivers/gpu/drm/xe/xe_vm_types.h
@@ -343,6 +343,8 @@ struct xe_vma_op {
        struct list_head link;
        /** @flags: operation flags */
        enum xe_vma_op_flags flags;
+       /** @tile_mask: Tile mask for operation */
+       u8 tile_mask;
 
        union {
                /** @map: VMA map operation specific data */