[PATCH i-g-t v2 1/2] tests/xe_eudebug: Implement faultable variations of some testcases
Manszewski, Christoph
christoph.manszewski at intel.com
Mon Apr 14 11:23:55 UTC 2025
Hi Jan,
On 1.04.2025 11:06, Jan Sokolowski wrote:
> From: Dominik Grzegorzek <dominik.grzegorzek at intel.com>
>
> Implement fault variation of tests, which are accessing the memory via
> debugfd, by creating a vm in FAULT_MODE.
>
> Signed-off-by: Dominik Grzegorzek <dominik.grzegorzek at intel.com>
> Signed-off-by: Jan Sokolowski <jan.sokolowski at intel.com>
> ---
> tests/intel/xe_eudebug.c | 96 ++++++++++++++++++++++++++++++++--------
> 1 file changed, 77 insertions(+), 19 deletions(-)
>
> diff --git a/tests/intel/xe_eudebug.c b/tests/intel/xe_eudebug.c
> index 76870805c..d61ab373f 100644
> --- a/tests/intel/xe_eudebug.c
> +++ b/tests/intel/xe_eudebug.c
> @@ -64,6 +64,7 @@ static void test_sysfs_toggle(int fd)
> #define VM_BIND_DELAY_UFENCE_ACK (1 << 8)
> #define VM_BIND_UFENCE_RECONNECT (1 << 9)
> #define VM_BIND_UFENCE_SIGINT_CLIENT (1 << 10)
> +#define TEST_FAULTABLE (1 << 30)
> #define TEST_DISCOVERY (1 << 31)
>
> #define PAGE_SIZE SZ_4K
> @@ -1445,16 +1446,19 @@ static void test_basic_sessions_th(int fd, unsigned int flags, int num_clients,
> static void vm_access_client(struct xe_eudebug_client *c)
> {
> struct drm_xe_engine_class_instance *hwe = c->ptr;
> + uint32_t vm_flags = DRM_XE_VM_CREATE_FLAG_LR_MODE;
> uint32_t bo_placement;
> struct bind_list *bl;
> uint32_t vm;
> int fd, i, j;
>
> +
> igt_debug("Using %s\n", xe_engine_class_string(hwe->engine_class));
>
> fd = xe_eudebug_client_open_driver(c);
>
> - vm = xe_eudebug_client_vm_create(c, fd, DRM_XE_VM_CREATE_FLAG_LR_MODE, 0);
> + vm_flags |= (c->flags & TEST_FAULTABLE) ? DRM_XE_VM_CREATE_FLAG_FAULT_MODE : 0;
> + vm = xe_eudebug_client_vm_create(c, fd, vm_flags, 0);
>
> if (c->flags & VM_BIND_OP_MAP_USERPTR)
> bo_placement = 0;
> @@ -1567,17 +1571,31 @@ static void vm_trigger(struct xe_eudebug_debugger *d,
> * vm fd, concerning many different offsets inside the vm,
> * and many virtual addresses of the vm_bound object.
> *
> + * SUBTEST: basic-vm-access-faultable
> + * Sub-category: EUdebug framework
I think this may be dropped since we have this label for the top level
test doc.
> + * Functionality: VM access with FAULTABLE_VM
> + * Description:
> + * Fault variation of test basic-vm-access.
> + *
> * SUBTEST: basic-vm-access-userptr
> * Description:
> * Exercise XE_EUDEBUG_VM_OPEN with pread and pwrite into the
> * vm fd, concerning many different offsets inside the vm,
> * and many virtual addresses of the vm_bound object, but backed
> * by userptr.
> + *
> + * SUBTEST: basic-vm-access-userptr-faultable
> + * Sub-category: EUdebug framework
> + * Functionality: VM access with FAULTABLE_VM
> + * Description:
> + * Fault variation of test basic-vm-access-userptr.
> */
> static void test_vm_access(int fd, unsigned int flags, int num_clients)
> {
> struct drm_xe_engine_class_instance *hwe;
>
> + igt_require(!(flags & TEST_FAULTABLE) || !xe_supports_faults(fd));
> +
> xe_eudebug_for_each_engine(fd, hwe)
> test_client_with_trigger(fd, flags, num_clients,
> vm_access_client,
> @@ -1717,15 +1735,29 @@ static void vm_trigger_access_parameters(struct xe_eudebug_debugger *d,
> * Check negative scenarios of VM_OPEN ioctl and pread/pwrite usage
> * with bo backing storage.
> *
> + * SUBTEST: basic-vm-access-parameters-faultable
> + * Sub-category: EUdebug framework
> + * Functionality: VM access with FAULTABLE_VM
> + * Description:
> + * Fault variation of test basic-vm-access-parameters.
> + *
> * SUBTEST: basic-vm-access-parameters-userptr
> * Description:
> * Check negative scenarios of VM_OPEN ioctl and pread/pwrite usage
> * with userptr backing storage.
> + *
> + * SUBTEST: basic-vm-access-parameters-userptr-faultable
> + * Sub-category: EUdebug framework
> + * Functionality: VM access with FAULTABLE_VM
> + * Description:
> + * Fault variation of test basic-vm-access-parameters-userptr.
> */
> static void test_vm_access_parameters(int fd, unsigned int flags, int num_clients)
> {
> struct drm_xe_engine_class_instance *hwe;
>
> + igt_require(!(flags & TEST_FAULTABLE) || !xe_supports_faults(fd));
> +
> xe_eudebug_for_each_engine(fd, hwe)
> test_client_with_trigger(fd, flags, num_clients,
> vm_access_client,
> @@ -2185,7 +2217,8 @@ static void *vm_bind_clear_thread(void *data)
> struct vm_bind_clear_thread_priv *priv = data;
> int fd = xe_eudebug_client_open_driver(priv->c);
> uint32_t gtt_size = 1ull << min_t(uint32_t, xe_va_bits(fd), 48);
> - uint32_t vm = xe_eudebug_client_vm_create(priv->c, fd, DRM_XE_VM_CREATE_FLAG_LR_MODE, 0);
> + uint32_t vm_flags = (priv->c->flags & TEST_FAULTABLE) ? DRM_XE_VM_CREATE_FLAG_FAULT_MODE : 0;
> + uint32_t vm = xe_eudebug_client_vm_create(priv->c, fd, DRM_XE_VM_CREATE_FLAG_LR_MODE | vm_flags, 0);
Nit: that's quite a long line and since we add a 'flags` variable we may
set it in one go with a line break and then just pass flags to vm
creation. Or we could do the 'test_basic_sessions' approach from above
and move the optional fault flag setting and vm creation to the code
part. Same nit for this pattern which repeats below.
All in all - LGTM, with the above addressed:
Reviewed-by: Christoph Manszewski <christoph.manszewski at intel.com>
Regards,
Christoph
> size_t bo_size = xe_bb_size(fd, batch_size);
> unsigned long count = 0;
> uint64_t *fence_data;
> @@ -2397,14 +2430,22 @@ static void vm_bind_clear_ack_trigger(struct xe_eudebug_debugger *d,
> * SUBTEST: vm-bind-clear
> * Description:
> * Check that fresh buffers we vm_bind into the ppGTT are always clear.
> + *
> + * SUBTEST: vm-bind-clear-faultable
> + * Sub-category: EUdebug framework
> + * Functionality: memory access with FAULTABLE_VM
> + * Description:
> + * Fault variation of test vm-bind-clear.
> */
> -static void test_vm_bind_clear(int fd)
> +static void test_vm_bind_clear(int fd, uint32_t flags)
> {
> struct vm_bind_clear_priv *priv;
> struct xe_eudebug_session *s;
>
> + igt_require(!(flags & TEST_FAULTABLE) || !xe_supports_faults(fd));
> +
> priv = vm_bind_clear_priv_create();
> - s = xe_eudebug_session_create(fd, vm_bind_clear_client, 0, priv);
> + s = xe_eudebug_session_create(fd, vm_bind_clear_client, flags, priv);
>
> xe_eudebug_debugger_add_trigger(s->debugger, DRM_XE_EUDEBUG_EVENT_VM_BIND_OP,
> vm_bind_clear_test_trigger);
> @@ -2433,7 +2474,8 @@ static void vma_ufence_client(struct xe_eudebug_client *c)
> const unsigned int n = UFENCE_EVENT_COUNT_EXPECTED;
> int fd = xe_eudebug_client_open_driver(c);
> struct ufence_bind *binds = create_binds_with_ufence(fd, n);
> - uint32_t vm = xe_eudebug_client_vm_create(c, fd, DRM_XE_VM_CREATE_FLAG_LR_MODE, 0);
> + uint32_t vm_flags = (c->flags & TEST_FAULTABLE) ? DRM_XE_VM_CREATE_FLAG_FAULT_MODE : 0;
> + uint32_t vm = xe_eudebug_client_vm_create(c, fd, vm_flags | DRM_XE_VM_CREATE_FLAG_LR_MODE, 0);
> size_t bo_size = xe_get_default_alignment(fd);
> uint64_t items = bo_size / sizeof(uint32_t);
> uint32_t bo[UFENCE_EVENT_COUNT_EXPECTED];
> @@ -2613,12 +2655,20 @@ static void vma_ufence_trigger(struct xe_eudebug_debugger *d,
> * Description:
> * Intercept vm bind after receiving ufence event, then access target vm and write to it.
> * Then check on client side if the write was successful.
> + *
> + * SUBTEST: vma-ufence-faultable
> + * Sub-category: EUdebug framework
> + * Functionality: check ufence blocking with FAULTABLE_VM
> + * Description:
> + * Fault variation of test vma-ufence.
> */
> static void test_vma_ufence(int fd, unsigned int flags)
> {
> struct xe_eudebug_session *s;
> struct ufence_priv *priv;
>
> + igt_require(!(flags & TEST_FAULTABLE) || !xe_supports_faults(fd));
> +
> priv = ufence_priv_create();
> s = xe_eudebug_session_create(fd, vma_ufence_client, flags, priv);
>
> @@ -2742,17 +2792,31 @@ igt_main
> igt_subtest("basic-client-th")
> test_basic_sessions_th(fd, 0, 1, true);
>
> - igt_subtest("basic-vm-access")
> - test_vm_access(fd, 0, 1);
>
> - igt_subtest("basic-vm-access-userptr")
> - test_vm_access(fd, VM_BIND_OP_MAP_USERPTR, 1);
> + igt_subtest_group {
> + uint32_t flags[] = {0, TEST_FAULTABLE};
> + const char *suffix[] = {"", "-faultable"};
> +
> + for (int i = 0; i < ARRAY_SIZE(flags); i++) {
> + igt_subtest_f("basic-vm-access%s", suffix[i])
> + test_vm_access(fd, flags[i], 1);
> +
> + igt_subtest_f("basic-vm-access-userptr%s", suffix[i])
> + test_vm_access(fd, VM_BIND_OP_MAP_USERPTR | flags[i], 1);
> +
> + igt_subtest_f("basic-vm-access-parameters%s", suffix[i])
> + test_vm_access_parameters(fd, flags[i], 1);
>
> - igt_subtest("basic-vm-access-parameters")
> - test_vm_access_parameters(fd, 0, 1);
> + igt_subtest_f("basic-vm-access-parameters-userptr%s", suffix[i])
> + test_vm_access_parameters(fd, VM_BIND_OP_MAP_USERPTR | flags[i], 1);
>
> - igt_subtest("basic-vm-access-parameters-userptr")
> - test_vm_access_parameters(fd, VM_BIND_OP_MAP_USERPTR, 1);
> + igt_subtest_f("vma-ufence%s", suffix[i])
> + test_vma_ufence(fd, flags[i]);
> +
> + igt_subtest_f("vm-bind-clear%s", suffix[i])
> + test_vm_bind_clear(fd, flags[i]);
> + }
> + }
>
> igt_subtest("multiple-sessions")
> test_basic_sessions(fd, CREATE_VMS | CREATE_EXEC_QUEUES, 4, true);
> @@ -2781,12 +2845,6 @@ igt_main
> igt_subtest("basic-vm-bind-ufence-sigint-client")
> test_basic_ufence(fd, VM_BIND_UFENCE_SIGINT_CLIENT);
>
> - igt_subtest("vma-ufence")
> - test_vma_ufence(fd, 0);
> -
> - igt_subtest("vm-bind-clear")
> - test_vm_bind_clear(fd);
> -
> igt_subtest("basic-vm-bind-discovery")
> test_basic_discovery(fd, VM_BIND, true);
>
More information about the igt-dev
mailing list