From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: Francois Dugast <francois.dugast@intel.com>
Cc: <igt-dev@lists.freedesktop.org>
Subject: Re: [PATCH i-g-t 4/5] tests/intel/xe_fault_injection: Inject errors during vm create IOCTL
Date: Fri, 8 Nov 2024 15:10:36 -0500 [thread overview]
Message-ID: <Zy5wPKerSmtBhxOh@intel.com> (raw)
In-Reply-To: <20241108160021.1202234-5-francois.dugast@intel.com>
On Fri, Nov 08, 2024 at 04:59:32PM +0100, Francois Dugast wrote:
> Use the fault injection infrastructure to make targeted internal KMD
> functions fail when executing xe_vm_create_ioctl() so that more code
> paths are tested, such as error handling and unwinding.
>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Signed-off-by: Francois Dugast <francois.dugast@intel.com>
> ---
> tests/intel/xe_fault_injection.c | 55 ++++++++++++++++++++++++++++++--
> 1 file changed, 53 insertions(+), 2 deletions(-)
>
> diff --git a/tests/intel/xe_fault_injection.c b/tests/intel/xe_fault_injection.c
> index 87e567a54..eb80f6af8 100644
> --- a/tests/intel/xe_fault_injection.c
> +++ b/tests/intel/xe_fault_injection.c
> @@ -17,6 +17,8 @@
> #include "igt_device.h"
> #include "igt_kmod.h"
> #include "igt_sysfs.h"
> +#include "xe/xe_ioctl.h"
> +#include "xe/xe_query.h"
>
> #define INJECT_ERRNO -ENOMEM
>
> @@ -154,13 +156,47 @@ inject_fault_probe(int fd, char pci_slot[], const char function_name[])
> injection_list_do(INJECTION_LIST_REMOVE, function_name);
> }
>
> +static int
> +simple_vm_create(int fd, unsigned int flags)
> +{
> + struct drm_xe_vm_create create = {
> + .flags = flags,
> + };
> +
> + return igt_ioctl(fd, DRM_IOCTL_XE_VM_CREATE, &create);
> +}
> +
> +/**
> + * SUBTEST: vm-create-fail-%s
> + * Description: inject an error in function %arg[1] used in vm create IOCTL to make it fail
> + * Functionality: fault
> + *
> + * arg[1]:
> + * @xe_pt_create: xe_pt_create
> + * @xe_exec_queue_create_bind: xe_exec_queue_create_bind
> + * @xe_vm_create_scratch: xe_vm_create_scratch
> + */
> +static void
> +vm_create_fail(int fd, const char function_name[], unsigned int flags)
> +{
> + igt_assert_eq(simple_vm_create(fd, flags), 0);
> +
> + injection_list_do(INJECTION_LIST_ADD, function_name);
> + set_retval(function_name, INJECT_ERRNO);
> + igt_assert(simple_vm_create(fd, flags) != 0);
> + injection_list_do(INJECTION_LIST_REMOVE, function_name);
> +
> + igt_assert_eq(simple_vm_create(fd, flags), 0);
> +}
> +
> igt_main
> {
> int fd;
> char pci_slot[NAME_MAX];
> const struct section {
> const char *name;
> - } probe_function_sections[] = {
> + unsigned int flags;
> + } probe_fail_functions[] = {
> { "wait_for_lmem_ready" },
> { "xe_device_create" },
> { "xe_ggtt_init_early" },
> @@ -176,16 +212,29 @@ igt_main
> { "xe_sriov_init" },
> { }
> };
> + const struct section vm_create_fail_functions[] = {
> + { "xe_pt_create", 0 },
> + { "xe_exec_queue_create_bind", 0 },
> + { "xe_vm_create_scratch", DRM_XE_VM_CREATE_FLAG_SCRATCH_PAGE },
> + { }
> + };
>
> igt_fixture {
> igt_require(fail_function_injection_enabled());
> fd = drm_open_driver(DRIVER_XE);
> igt_device_get_pci_slot_name(fd, pci_slot);
> setup_injection_fault();
> + }
> +
> + for (const struct section *s = vm_create_fail_functions; s->name; s++)
> + igt_subtest_f("vm-create-fail-%s", s->name)
> + vm_create_fail(fd, s->name, s->flags);
> +
> + igt_fixture {
> xe_sysfs_driver_do(fd, pci_slot, XE_SYSFS_DRIVER_UNBIND);
> }
>
> - for (const struct section *s = probe_function_sections; s->name; s++)
> + for (const struct section *s = probe_fail_functions; s->name; s++)
> igt_subtest_f("inject-fault-probe-function-%s", s->name)
> inject_fault_probe(fd, pci_slot, s->name);
>
> @@ -193,4 +242,6 @@ igt_main
> drm_close_driver(fd);
> xe_sysfs_driver_do(fd, pci_slot, XE_SYSFS_DRIVER_BIND);
> }
> +
> +
> }
> --
> 2.43.0
>
next prev parent reply other threads:[~2024-11-08 20:10 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-08 15:59 [PATCH i-g-t 0/5] xe_fault_injection improvements Francois Dugast
2024-11-08 15:59 ` [PATCH i-g-t 1/5] tests/intel/xe_fault_injection: Use a static list of functions Francois Dugast
2024-11-08 19:09 ` Rodrigo Vivi
2024-11-08 15:59 ` [PATCH i-g-t 2/5] lib/igt_sysfs: Add igt_sysfs_{get,set}_s32 Francois Dugast
2024-11-08 15:59 ` [PATCH i-g-t 3/5] tests/intel/xe_fault_injection: Use igt_sysfs helpers Francois Dugast
2024-11-08 19:18 ` Rodrigo Vivi
2024-11-08 15:59 ` [PATCH i-g-t 4/5] tests/intel/xe_fault_injection: Inject errors during vm create IOCTL Francois Dugast
2024-11-08 20:10 ` Rodrigo Vivi [this message]
2024-11-08 15:59 ` [PATCH i-g-t 5/5] tests/intel/xe_fault_injection: Inject errors during vm bind IOCTL Francois Dugast
2024-11-08 20:10 ` Rodrigo Vivi
2024-11-08 17:09 ` ✗ Fi.CI.BAT: failure for xe_fault_injection improvements (rev2) Patchwork
2024-11-08 17:14 ` ✗ CI.xeBAT: " Patchwork
2024-11-09 19:11 ` ✗ CI.xeFULL: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Zy5wPKerSmtBhxOh@intel.com \
--to=rodrigo.vivi@intel.com \
--cc=francois.dugast@intel.com \
--cc=igt-dev@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.