It should not be driver specific anymore. Make it run for multiple drivers, though there is still only Xe now.
Signed-off-by: Thadeu Lima de Souza Cascardo <[email protected]> --- .../xe_cgroups.c => drv_dmem_cgroups.c} | 61 +++++++++++-------- tests/meson.build | 2 +- 2 files changed, 38 insertions(+), 25 deletions(-) rename tests/{intel/xe_cgroups.c => drv_dmem_cgroups.c} (83%) diff --git a/tests/intel/xe_cgroups.c b/tests/drv_dmem_cgroups.c similarity index 83% rename from tests/intel/xe_cgroups.c rename to tests/drv_dmem_cgroups.c index 9ff8d46570ab..6f4f779f3c2c 100644 --- a/tests/intel/xe_cgroups.c +++ b/tests/drv_dmem_cgroups.c @@ -4,13 +4,12 @@ */ /** - * TEST: xe_cgroups - * DESCRIPTION: Tests exercising the dmem cgroup controller on xe devices. + * TEST: drv_dmem_cgroups + * DESCRIPTION: Tests exercising the dmem cgroup controller on devices. * Category: Core * Mega feature: General Core features * Sub-category: cgroup * FUNCTIONALITY: cgroup dmem controller - * SUBSETS: xe */ #include <errno.h> @@ -26,9 +25,6 @@ #include "igt_aux.h" #include "igt_cgroup.h" #include "igt_dmem_driver.h" -#include "xe_drm.h" -#include "xe/xe_ioctl.h" -#include "xe/xe_query.h" #define BO_SIZE SZ_128M #define MAX_LIMIT ((uint64_t)4 * SZ_1G) @@ -45,13 +41,12 @@ * DESCRIPTION: * Create a dmem cgroup, move the current process into it and set the max * device memory limit for the first VRAM region to 4 GiB. Then fill VRAM - * by creating BOs with %DRM_XE_GEM_CREATE_FLAG_DEFER_BACKING (so that the - * physical allocation is deferred until VM_BIND) and binding them into an - * LR VM until the cgroup limit is hit. Verify that the reported cgroup - * current usage is within the expected range when the error occurs. + * by creating BOs. + * Verify that the reported cgroup current usage is within the expected + * range when the error occurs. * Finally lower the max limit in 256 MiB steps and verify that the cgroup * usage follows. - * REQUIREMENTS: must run as root; xe device with at least one VRAM region + * REQUIREMENTS: must run as root; device with at least one VRAM region */ /** @@ -61,7 +56,7 @@ * igt_fork_signal_helper() to verify that the dmem.max write path handles * signal interruption correctly. A signal handler counts received signals * and the count is reported as debug output at the end of the test. - * REQUIREMENTS: must run as root; xe device with at least one VRAM region + * REQUIREMENTS: must run as root; device with at least one VRAM region */ static atomic_int signal_count; @@ -111,7 +106,7 @@ static uint64_t wait_for_usage_drop(struct igt_cgroup *cg, const char *region, return current; } -static int fill_vram(struct igt_dmem_driver *drv, void *ctx, int fd, int max_bo) +static int fill_vram(const struct igt_dmem_driver *drv, void *ctx, int fd, int max_bo) { int n_bo, err = 0; @@ -128,7 +123,7 @@ static int fill_vram(struct igt_dmem_driver *drv, void *ctx, int fd, int max_bo) return n_bo; } -static void test_write_eviction(int fd, unsigned int flags, struct igt_dmem_driver *drv) +static void test_write_eviction(int fd, unsigned int flags, const struct igt_dmem_driver *drv) { void *ctx; struct igt_cgroup *cg; @@ -161,7 +156,7 @@ static void test_write_eviction(int fd, unsigned int flags, struct igt_dmem_driv install_sigcont_counter(); /* Create cgroup and move into it */ - cg = igt_cgroup_new("xe_cgroups_test"); + cg = igt_cgroup_new("igt_cgroups_test"); igt_cgroup_move_current(cg); igt_cgroup_dmem_set_max(cg, cg_region, cg_max); @@ -236,20 +231,38 @@ static const struct { { } }; +static const struct { + int driver_flag; + const struct igt_dmem_driver *driver; +} drivers[] = { + { DRIVER_XE, &xe_dmem_driver }, + { }, +}; + int igt_main() { - int fd = -1; - igt_fixture() { - fd = drm_open_driver(DRIVER_XE); igt_require_f(getuid() == 0, "Test requires root\n"); } - for (int i = 0; subtests[i].name; i++) - igt_subtest(subtests[i].name) - test_write_eviction(fd, subtests[i].flags, &xe_dmem_driver); - - igt_fixture() { - drm_close_driver(fd); + for (int d = 0; drivers[d].driver; d++) { + igt_subtest_group() { + int fd = -1; + igt_fixture() { + fd = drm_open_driver(drivers[d].driver_flag); + igt_require_f(fd >= 0, + "No %s device found, skipping\n", + drivers[d].driver->name); + } + + for (int i = 0; subtests[i].name; i++) + igt_subtest_f("%s-%s", drivers[d].driver->name, subtests[i].name) + test_write_eviction(fd, subtests[i].flags, drivers[d].driver); + + igt_fixture() { + if (fd >= 0) + drm_close_driver(fd); + } + } } } diff --git a/tests/meson.build b/tests/meson.build index b4463a722361..deb049875b46 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -17,6 +17,7 @@ test_progs = [ 'drm_mm', 'drm_read', 'drm_virtgpu', + 'drv_dmem_cgroups', 'fbdev', 'kms_3d', 'kms_addfb_basic', @@ -292,7 +293,6 @@ intel_xe_progs = [ 'xe_dma_buf_sync', 'xe_drm_fdinfo', 'xe_eu_stall', - 'xe_cgroups', 'xe_evict', 'xe_evict_ccs', 'xe_exec_atomic', -- 2.47.3
