drm/xe/tests: Test both CPU- and GPU page-table updates with the migrate test

Add a test parameter to force GPU page-table updates with the migrate
test and test both CPU- and GPU updates. Also provide some timing
results.

Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/xe/tests/xe_migrate.c b/drivers/gpu/drm/xe/tests/xe_migrate.c
index a3bace16282ee80da4c3b9f39ec0a52f73c3ace9..e50b6ceb56e63eddc0af3d69665a17454a63e552 100644 (file)
--- a/drivers/gpu/drm/xe/tests/xe_migrate.c
+++ b/drivers/gpu/drm/xe/tests/xe_migrate.c
@@ -64,6 +64,8 @@ sanity_populate_cb(struct xe_migrate_pt_update *pt_update,
                   u32 qword_ofs, u32 num_qwords,
                   const struct xe_vm_pgtable_update *update)
 {
+       struct migrate_test_params *p =
+               to_migrate_test_params(xe_cur_kunit_priv(XE_TEST_LIVE_MIGRATE));
        int i;
        u64 *ptr = dst;
        u64 value;
@@ -76,6 +78,10 @@ sanity_populate_cb(struct xe_migrate_pt_update *pt_update,
                else
                        ptr[i] = value;
        }
+
+       kunit_info(xe_cur_kunit(), "Used %s.\n", map ? "CPU" : "GPU");
+       if (p->force_gpu && map)
+               KUNIT_FAIL(xe_cur_kunit(), "GPU pagetable update used CPU.\n");
 }
 
 static const struct xe_migrate_pt_update_ops sanity_ops = {
@@ -177,11 +183,12 @@ out_unlock:
 }
 
 static void test_pt_update(struct xe_migrate *m, struct xe_bo *pt,
-                          struct kunit *test)
+                          struct kunit *test, bool force_gpu)
 {
        struct xe_device *xe = gt_to_xe(m->gt);
        struct dma_fence *fence;
        u64 retval, expected;
+       ktime_t then, now;
        int i;
 
        struct xe_vm_pgtable_update update = {
@@ -192,16 +199,26 @@ static void test_pt_update(struct xe_migrate *m, struct xe_bo *pt,
        struct xe_migrate_pt_update pt_update = {
                .ops = &sanity_ops,
        };
+       struct migrate_test_params p = {
+               .base.id = XE_TEST_LIVE_MIGRATE,
+               .force_gpu = force_gpu,
+       };
 
+       test->priv = &p;
        /* Test xe_migrate_update_pgtables() updates the pagetable as expected */
        expected = 0xf0f0f0f0f0f0f0f0ULL;
        xe_map_memset(xe, &pt->vmap, 0, (u8)expected, pt->size);
 
+       then = ktime_get();
        fence = xe_migrate_update_pgtables(m, NULL, NULL, m->eng, &update, 1,
                                           NULL, 0, &pt_update);
+       now = ktime_get();
        if (sanity_fence_failed(xe, fence, "Migration pagetable update", test))
                return;
 
+       kunit_info(test, "Updating without syncing took %llu us,\n",
+                  (unsigned long long)ktime_to_us(ktime_sub(now, then)));
+
        dma_fence_put(fence);
        retval = xe_map_rd(xe, &pt->vmap, 0, u64);
        check(retval, expected, "PTE[0] must stay untouched", test);
@@ -344,7 +361,10 @@ static void xe_migrate_sanity_test(struct xe_migrate *m, struct kunit *test)
                test_copy(m, big, test);
        }
 
-       test_pt_update(m, pt, test);
+       kunit_info(test, "Testing page table update using CPU if GPU idle.\n");
+       test_pt_update(m, pt, test, false);
+       kunit_info(test, "Testing page table update using GPU\n");
+       test_pt_update(m, pt, test, true);
 
 out:
        xe_bb_free(bb, NULL);

diff --git a/drivers/gpu/drm/xe/tests/xe_test.h b/drivers/gpu/drm/xe/tests/xe_test.h
index 00c8a3f9af8146ecb6d9938587d09c4d7be879f6..7a1ae213e750ac928e9e6957846ba24ee94c9112 100644 (file)
--- a/drivers/gpu/drm/xe/tests/xe_test.h
+++ b/drivers/gpu/drm/xe/tests/xe_test.h
@@ -18,6 +18,7 @@
  */
 enum xe_test_priv_id {
        XE_TEST_LIVE_DMA_BUF,
+       XE_TEST_LIVE_MIGRATE,
 };
 
 /**

diff --git a/drivers/gpu/drm/xe/xe_migrate.c b/drivers/gpu/drm/xe/xe_migrate.c
index 4a600c64b5d0e0ad42bd62ab57bad2c65e0630b7..3ee3d707a8ca751bd509d3a3f0557604f7581826 100644 (file)
--- a/drivers/gpu/drm/xe/xe_migrate.c
+++ b/drivers/gpu/drm/xe/xe_migrate.c
@@ -13,6 +13,7 @@
 #include <drm/xe_drm.h>
 
 #include "regs/xe_gpu_commands.h"
+#include "tests/xe_test.h"
 #include "xe_bb.h"
 #include "xe_bo.h"
 #include "xe_engine.h"
@@ -967,6 +968,16 @@ struct xe_vm *xe_migrate_get_vm(struct xe_migrate *m)
        return xe_vm_get(m->eng->vm);
 }
 
+#if IS_ENABLED(CONFIG_DRM_XE_KUNIT_TEST)
+struct migrate_test_params {
+       struct xe_test_priv base;
+       bool force_gpu;
+};
+
+#define to_migrate_test_params(_priv) \
+       container_of(_priv, struct migrate_test_params, base)
+#endif
+
 static struct dma_fence *
 xe_migrate_update_pgtables_cpu(struct xe_migrate *m,
                               struct xe_vm *vm, struct xe_bo *bo,
@@ -974,11 +985,17 @@ xe_migrate_update_pgtables_cpu(struct xe_migrate *m,
                               u32 num_updates, bool wait_vm,
                               struct xe_migrate_pt_update *pt_update)
 {
+       XE_TEST_DECLARE(struct migrate_test_params *test =
+                       to_migrate_test_params
+                       (xe_cur_kunit_priv(XE_TEST_LIVE_MIGRATE));)
        const struct xe_migrate_pt_update_ops *ops = pt_update->ops;
        struct dma_fence *fence;
        int err;
        u32 i;
 
+       if (XE_TEST_ONLY(test && test->force_gpu))
+               return ERR_PTR(-ETIME);
+
        if (bo && !dma_resv_test_signaled(bo->ttm.base.resv,
                                          DMA_RESV_USAGE_KERNEL))
                return ERR_PTR(-ETIME);