[PATCH] tests/intel/xe_vm: Add test for 64k page corners
Matthew Brost
matthew.brost at intel.com
Tue Jul 23 17:34:26 UTC 2024
On Mon, Jul 22, 2024 at 07:57:38AM +0200, Zbigniew Kempczyński wrote:
> On Fri, Jul 19, 2024 at 12:11:26PM -0700, Matthew Brost wrote:
> > Add sections which split compact 64k pages in 4k pages.
> >
> > Signed-off-by: Matthew Brost <matthew.brost at intel.com>
> > ---
> > tests/intel/xe_vm.c | 128 ++++++++++++++++++++++++++++++++++++++++++++
> > 1 file changed, 128 insertions(+)
> >
> > diff --git a/tests/intel/xe_vm.c b/tests/intel/xe_vm.c
> > index a4f6c7a0b4..d507e7cb16 100644
> > --- a/tests/intel/xe_vm.c
> > +++ b/tests/intel/xe_vm.c
> > @@ -366,6 +366,128 @@ static void userptr_invalid(int fd)
> > xe_vm_destroy(fd, vm);
> > }
> >
> > +/**
> > + * SUBTEST: compact-64k-pages
> > + * Description:
> > + * Take corner cases related to compact and 64k pages
> > + * Functionality: bind
> > + * Test category: functionality test
> > + */
> > +static void compact_64k_pages(int fd, struct drm_xe_engine_class_instance *eci)
> > +{
> > + size_t page_size = xe_get_default_alignment(fd);
> > + uint64_t addr0 = 0x10000000ull, addr1;
> > + uint32_t vm;
> > + uint32_t bo0, bo1;
> > + uint32_t exec_queue;
> > + void *ptr0, *ptr1;
> > + struct drm_xe_sync sync[2] = {
> > + { .type = DRM_XE_SYNC_TYPE_SYNCOBJ,
> > + .flags = DRM_XE_SYNC_FLAG_SIGNAL, },
> > + { .type = DRM_XE_SYNC_TYPE_SYNCOBJ,
> > + .flags = DRM_XE_SYNC_FLAG_SIGNAL, },
> > + };
> > + struct {
> > + uint32_t batch[16];
> > + uint64_t pad;
> > + uint32_t data;
> > + } *data = NULL;
> > + struct drm_xe_exec exec = {
> > + .num_batch_buffer = 1,
> > + .num_syncs = 2,
> > + .syncs = to_user_pointer(sync),
> > + };
> > + int i, b;
> > +
> > +#define EIGHT_MB 0x800000
> > +#define SIXTY_FOUR_KB 0x10000
>
> You may use SZ_8M and SZ_64K.
>
Will do.
> > +
> > + vm = xe_vm_create(fd, 0, 0);
> > + exec_queue = xe_exec_queue_create(fd, vm, eci, 0);
> > +
> > + bo0 = xe_bo_create(fd, vm, EIGHT_MB,
> > + vram_if_possible(fd, eci->gt_id),
> > + DRM_XE_GEM_CREATE_FLAG_NEEDS_VISIBLE_VRAM);
> > + ptr0 = xe_bo_map(fd, bo0, EIGHT_MB);
> > +
> > + bo1 = xe_bo_create(fd, vm, EIGHT_MB / 2,
> > + vram_if_possible(fd, eci->gt_id),
> > + DRM_XE_GEM_CREATE_FLAG_NEEDS_VISIBLE_VRAM);
> > + ptr1 = xe_bo_map(fd, bo1, EIGHT_MB / 2);
> > +
> > + sync[0].handle = syncobj_create(fd, 0);
> > + if (page_size == 0x1000) {
> > + /* Setup mapping to split a 64k PTE in cache */
> > + xe_vm_bind_async(fd, vm, 0, bo0, 0, addr0, SIXTY_FOUR_KB, 0, 0);
> > +
> > + addr1 = addr0 + (SIXTY_FOUR_KB / 2);
> > + xe_vm_bind_async(fd, vm, 0, bo1, 0, addr1, SIXTY_FOUR_KB / 2,
> > + sync, 1);
>
> Won't this bind assert as it's overlaps first addr0 (+SZ_64K)?
>
>
That's the point of this test. Create a mapping with a 64k page and then
issue another bind which splits it. At one point this would fail in the
KMD before this was merged [1]. This bug was exposed by mesa, hence I
created an IGT for more coverage.
[1] https://patchwork.freedesktop.org/series/130097/
> > + } else if (page_size == SIXTY_FOUR_KB) {
> > + addr0 += page_size;
> > +
> > + /* Setup mapping to split compact 64k pages */
> > + xe_vm_bind_async(fd, vm, 0, bo0, 0, addr0, EIGHT_MB, 0, 0);
> > +
> > + addr1 = addr0 + (EIGHT_MB / 4);
> > + xe_vm_bind_async(fd, vm, 0, bo1, 0, addr1, EIGHT_MB / 2,
> > + sync, 1);
>
> Similar to the above.
>
Here we are spliting 'compact 64k pages' in which only the lower 32 pte
entries (of 512) are used. The second bind makes the compact 64k not
available, thus a split which needs to be tested.
> > + }
> > + igt_assert(syncobj_wait(fd, &sync[0].handle, 1, INT64_MAX, 0, NULL));
> > +
> > + /* Verify 1st mapping working */
> > + i = 0;
> > + {
> > + uint64_t batch_offset = (char *)&data[i].batch - (char *)data;
> > + uint64_t batch_addr = addr0 + batch_offset;
> > + uint64_t sdi_offset = (char *)&data[i].data - (char *)data;
> > + uint64_t sdi_addr = addr0 + sdi_offset;
> > + data = ptr0;
> > +
> > + b = 0;
> > + data[i].batch[b++] = MI_STORE_DWORD_IMM_GEN4;
> > + data[i].batch[b++] = sdi_addr;
> > + data[i].batch[b++] = sdi_addr >> 32;
> > + data[i].batch[b++] = 0xc0ffee;
> > +
> > + sdi_addr = addr1 + sdi_offset;
> > + data[i].batch[b++] = MI_STORE_DWORD_IMM_GEN4;
> > + data[i].batch[b++] = sdi_addr;
> > + data[i].batch[b++] = sdi_addr >> 32;
> > + data[i].batch[b++] = 0xc0ffee;
> > +
> > + data[i].batch[b++] = MI_BATCH_BUFFER_END;
> > + igt_assert(b <= ARRAY_SIZE(data[i].batch));
> > +
> > + sync[0].flags &= ~DRM_XE_SYNC_FLAG_SIGNAL;
> > + sync[1].handle = syncobj_create(fd, 0);
> > + exec.exec_queue_id = exec_queue;
> > + exec.address = batch_addr;
> > + xe_exec(fd, &exec);
> > +
> > + igt_assert(syncobj_wait(fd, &sync[1].handle, 1, INT64_MAX, 0,
> > + NULL));
> > + igt_assert_eq(data[i].data, 0xc0ffee);
> > + data = ptr1;
> > + igt_assert_eq(data[i].data, 0xc0ffee);
> > + }
>
> May you introduce a function instead of adding block here?
>
Most other tests have a for loop here, I went with local block to match
that style of declaring the 4 variables here. I'd rather leave it as or
alternatively just declare the 4 variables at the top of this function
and drop the braces.
Matt
> --
> Zbigniew
>
> > +
> > + sync[0].flags |= DRM_XE_SYNC_FLAG_SIGNAL;
> > + syncobj_reset(fd, &sync[0].handle, 1);
> > + xe_vm_unbind_all_async(fd, vm, 0, bo0, 0, 0);
> > + xe_vm_unbind_all_async(fd, vm, 0, bo1, sync, 1);
> > + igt_assert(syncobj_wait(fd, &sync[0].handle, 1, INT64_MAX, 0, NULL));
> > +
> > + xe_exec_queue_destroy(fd, exec_queue);
> > + syncobj_destroy(fd, sync[0].handle);
> > + syncobj_destroy(fd, sync[1].handle);
> > + munmap(ptr0, EIGHT_MB);
> > + munmap(ptr1, EIGHT_MB / 2);
> > + gem_close(fd, bo0);
> > + gem_close(fd, bo1);
> > + xe_vm_destroy(fd, vm);
> > +}
> > +
> > /**
> > * SUBTEST: shared-%s-page
> > * Description: Test shared arg[1] page
> > @@ -1973,6 +2095,12 @@ igt_main
> > igt_subtest("bind-flag-invalid")
> > bind_flag_invalid(fd);
> >
> > + igt_subtest("compact-64k-pages")
> > + xe_for_each_engine(fd, hwe) {
> > + compact_64k_pages(fd, hwe);
> > + break;
> > + }
> > +
> > igt_subtest("shared-pte-page")
> > xe_for_each_engine(fd, hwe)
> > shared_pte_page(fd, hwe, 4,
> > --
> > 2.34.1
> >
More information about the igt-dev
mailing list