* [Intel-gfx] [PATCH i-g-t 1/2] tests/i915/drm_fdinfo: Stress test context close versus fdinfo reads
2023-09-21 11:45 [Intel-gfx] [PATCH i-g-t 0/2] Basic tests for fdinfo client memory Tvrtko Ursulin
@ 2023-09-21 11:45 ` Tvrtko Ursulin
2023-09-21 11:45 ` [Intel-gfx] [PATCH i-g-t 2/2] tests/i915/drm_fdinfo: Add some memory info tests Tvrtko Ursulin
1 sibling, 0 replies; 3+ messages in thread
From: Tvrtko Ursulin @ 2023-09-21 11:45 UTC (permalink / raw)
To: igt-dev, Intel-gfx
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
A short smoke tests to exercise fdinfo reads in parallel to contexts
getting created and destroyed.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
tests/intel/drm_fdinfo.c | 68 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 68 insertions(+)
diff --git a/tests/intel/drm_fdinfo.c b/tests/intel/drm_fdinfo.c
index aca19db50680..a9910900358d 100644
--- a/tests/intel/drm_fdinfo.c
+++ b/tests/intel/drm_fdinfo.c
@@ -22,11 +22,14 @@
*
*/
+#include <fcntl.h>
+
#include "igt.h"
#include "igt_core.h"
#include "igt_device.h"
#include "igt_drm_fdinfo.h"
#include "i915/gem.h"
+#include "i915/gem_create.h"
#include "i915/gem_vm.h"
#include "intel_ctx.h"
/**
@@ -72,6 +75,8 @@
* SUBTEST: virtual-busy-idle-all
*
* SUBTEST: virtual-idle
+ *
+ * SUBTEST: context-close-stress
*/
IGT_TEST_DESCRIPTION("Test the i915 drm fdinfo data");
@@ -717,6 +722,56 @@ virtual_all(int i915, const intel_ctx_cfg_t *base_cfg, unsigned int flags)
}
}
+static void stress_context_close(int i915)
+{
+ const uint32_t bbe = MI_BATCH_BUFFER_END;
+ struct igt_helper_process reader = { };
+ struct drm_client_fdinfo info;
+ uint32_t batch;
+ int dir, ret;
+ char buf[64];
+
+ ret = snprintf(buf, sizeof(buf), "%u", i915);
+ igt_assert(ret > 0 && ret < sizeof(buf));
+
+ dir = open("/proc/self/fdinfo", O_DIRECTORY | O_RDONLY);
+ igt_assert_fd(dir);
+
+ memset(&info, 0, sizeof(info));
+ ret = __igt_parse_drm_fdinfo(dir, buf, &info, NULL, 0, NULL, 0);
+ igt_assert(ret > 0);
+ igt_require(info.num_regions);
+
+ batch = gem_create(i915, 4096);
+ gem_write(i915, batch, 0, &bbe, sizeof(bbe));
+
+ igt_fork_helper(&reader) {
+ for (;;) {
+ memset(&info, 0, sizeof(info));
+ ret = __igt_parse_drm_fdinfo(dir, buf, &info,
+ NULL, 0, NULL, 0);
+ igt_assert(ret > 0);
+ }
+ }
+
+ igt_until_timeout(10) {
+ struct drm_i915_gem_exec_object2 obj = {
+ .handle = batch,
+ };
+ struct drm_i915_gem_execbuffer2 eb = {
+ .buffers_ptr = to_user_pointer(&obj),
+ .buffer_count = 1,
+ };
+
+ eb.rsvd1 = gem_context_create(i915);
+ igt_assert(eb.rsvd1);
+ gem_execbuf(i915, &eb);
+ gem_context_destroy(i915, eb.rsvd1);
+ }
+
+ igt_stop_helper(&reader);
+}
+
#define test_each_engine(T, i915, ctx, e) \
igt_subtest_with_dynamic(T) for_each_ctx_engine(i915, ctx, e) \
igt_dynamic_f("%s", e->name)
@@ -847,6 +902,19 @@ igt_main
test_each_engine("isolation", i915, ctx, e)
single(i915, ctx, e, TEST_BUSY | TEST_ISOLATION);
+ igt_subtest_group {
+ int newfd;
+
+ igt_fixture
+ newfd = drm_reopen_driver(i915);
+
+ igt_subtest("context-close-stress")
+ stress_context_close(newfd);
+
+ igt_fixture
+ drm_close_driver(newfd);
+ }
+
igt_fixture {
intel_ctx_destroy(i915, ctx);
drm_close_driver(i915);
--
2.39.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* [Intel-gfx] [PATCH i-g-t 2/2] tests/i915/drm_fdinfo: Add some memory info tests
2023-09-21 11:45 [Intel-gfx] [PATCH i-g-t 0/2] Basic tests for fdinfo client memory Tvrtko Ursulin
2023-09-21 11:45 ` [Intel-gfx] [PATCH i-g-t 1/2] tests/i915/drm_fdinfo: Stress test context close versus fdinfo reads Tvrtko Ursulin
@ 2023-09-21 11:45 ` Tvrtko Ursulin
1 sibling, 0 replies; 3+ messages in thread
From: Tvrtko Ursulin @ 2023-09-21 11:45 UTC (permalink / raw)
To: igt-dev, Intel-gfx
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
A few basic smoke tests to check per client memory info looks legit.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
tests/intel/drm_fdinfo.c | 201 +++++++++++++++++++++++++++++++++++++++
1 file changed, 201 insertions(+)
diff --git a/tests/intel/drm_fdinfo.c b/tests/intel/drm_fdinfo.c
index a9910900358d..b5f1010d2fd4 100644
--- a/tests/intel/drm_fdinfo.c
+++ b/tests/intel/drm_fdinfo.c
@@ -23,6 +23,7 @@
*/
#include <fcntl.h>
+#include <sys/ioctl.h>
#include "igt.h"
#include "igt_core.h"
@@ -76,6 +77,16 @@
*
* SUBTEST: virtual-idle
*
+ * SUBTEST: memory-info-idle
+ *
+ * SUBTEST: memory-info-active
+ *
+ * SUBTEST: memory-info-resident
+ *
+ * SUBTEST: memory-info-purgeable
+ *
+ * SUBTEST: memory-info-shared
+ *
* SUBTEST: context-close-stress
*/
@@ -143,6 +154,11 @@ static unsigned int measured_usleep(unsigned int usec)
#define FLAG_HANG (8)
#define TEST_ISOLATION (16)
+#define TEST_ACTIVE TEST_BUSY
+#define TEST_RESIDENT (32)
+#define TEST_PURGEABLE (64)
+#define TEST_SHARED (128)
+
static void end_spin(int fd, igt_spin_t *spin, unsigned int flags)
{
if (!spin)
@@ -772,6 +788,156 @@ static void stress_context_close(int i915)
igt_stop_helper(&reader);
}
+static size_t read_fdinfo(char *buf, const size_t sz, int at, const char *name)
+{
+ size_t count;
+ int fd;
+
+ fd = openat(at, name, O_RDONLY);
+ if (fd < 0)
+ return 0;
+
+ count = read(fd, buf, sz - 1);
+ if (count > 0)
+ buf[count - 1] = 0;
+ close(fd);
+
+ return count > 0 ? count : 0;
+}
+
+#define fdinfo_assert(cond, d, sz, total) \
+ igt_assert_f(cond, "\ndelta=%"PRIu64" sz=%"PRIu64" total=%"PRIu64"\n%s\n", d, sz, total, fdinfo_buf)
+
+static void
+test_memory(int i915, struct gem_memory_region *r, unsigned int flags)
+{
+ struct drm_client_fdinfo prev_info = { };
+ struct drm_client_fdinfo info = { };
+ const uint64_t max_mem = 512ull * 1024 * 1024;
+ const uint64_t max_bo = 16ull * 1024 * 1024;
+ uint64_t total = 0, sz, d;
+ char buf[64], fdinfo_buf[4096];
+ igt_spin_t *spin = NULL;
+ int ret, dir;
+
+ i915 = drm_reopen_driver(i915);
+
+ ret = snprintf(buf, sizeof(buf), "%u", i915);
+ igt_assert(ret > 0 && ret < sizeof(buf));
+
+ dir = open("/proc/self/fdinfo", O_DIRECTORY | O_RDONLY);
+ igt_assert_fd(dir);
+
+ gem_quiescent_gpu(i915);
+ ret = __igt_parse_drm_fdinfo(dir, buf, &info, NULL, 0, NULL, 0);
+ igt_assert(ret > 0);
+ igt_require(info.num_regions);
+ memcpy(&prev_info, &info, sizeof(info));
+
+ while (total < max_mem) {
+ static const char *region_map[] = {
+ "system",
+ "lmem0",
+ };
+ uint32_t bo;
+ int j;
+
+ /* Align to 1MiB to work around drm_print_memory_stats */
+ sz = 1ull * 1024 * 1024 + random() % (max_bo - 1ull * 1024 * 1024);
+ sz &= ~((1ull * 1024 * 1024) - 1);
+ ret = __gem_create_in_memory_region_list(i915, &bo, &sz, 0, &r->ci, 1);
+ igt_assert_eq(ret, 0);
+ total += sz;
+
+ if (flags & (TEST_RESIDENT | TEST_PURGEABLE)) {
+ struct drm_i915_gem_exec_object2 obj[2];
+ struct drm_i915_gem_execbuffer2 eb = {
+ .buffers_ptr = to_user_pointer(obj),
+ .buffer_count = 2,
+ };
+ const uint32_t bbe = MI_BATCH_BUFFER_END;
+
+ obj[0].handle = bo;
+ obj[1].handle = gem_create(i915, 4096);
+ gem_write(i915, obj[1].handle, 0, &bbe, sizeof(bbe));
+ gem_execbuf(i915, &eb);
+ gem_sync(i915, obj[1].handle);
+ gem_close(i915, obj[1].handle);
+ }
+
+ if (flags & TEST_PURGEABLE)
+ gem_madvise(i915, bo, I915_MADV_DONTNEED);
+
+ if (flags & TEST_SHARED) {
+ struct drm_gem_open open_struct;
+ struct drm_gem_flink flink;
+
+ flink.handle = bo;
+ ret = ioctl(i915, DRM_IOCTL_GEM_FLINK, &flink);
+ igt_assert_eq(ret, 0);
+
+ open_struct.name = flink.name;
+ ret = ioctl(i915, DRM_IOCTL_GEM_OPEN, &open_struct);
+ igt_assert_eq(ret, 0);
+ igt_assert(open_struct.handle != 0);
+ }
+
+ if (flags & TEST_ACTIVE)
+ spin = igt_spin_new(i915, .dependency = bo);
+
+ memset(&info, 0, sizeof(info));
+ ret = __igt_parse_drm_fdinfo(dir, buf, &info,
+ NULL, 0,
+ region_map, ARRAY_SIZE(region_map));
+ igt_assert(ret > 0);
+ igt_assert(info.num_regions);
+
+ read_fdinfo(fdinfo_buf, sizeof(fdinfo_buf), dir, buf);
+
+ /* See region map */
+ j = r->ci.memory_class == I915_MEMORY_CLASS_SYSTEM ? 0 : 1;
+
+ fdinfo_assert(info.region_mem[j].total > prev_info.region_mem[j].total, d, sz, total);
+
+ d = info.region_mem[j].total - prev_info.region_mem[j].total;
+ /* >= to account for objects out of our control */
+ fdinfo_assert(d >= sz, d, sz, total);
+
+ d = info.region_mem[j].resident - prev_info.region_mem[j].resident;
+ if (flags & (TEST_RESIDENT | TEST_PURGEABLE | TEST_ACTIVE))
+ fdinfo_assert(d >= sz, d, sz, total);
+ else
+ fdinfo_assert(d < sz, d, sz, total);
+
+ d = info.region_mem[j].shared - prev_info.region_mem[j].shared;
+ if (flags & TEST_SHARED)
+ fdinfo_assert(d >= sz, d, sz, total);
+ else
+ fdinfo_assert(d == 0, d, sz, total);
+
+ d = info.region_mem[j].purgeable - prev_info.region_mem[j].purgeable;
+ if (flags & TEST_PURGEABLE)
+ fdinfo_assert(d >= sz, d, sz, total);
+ else
+ fdinfo_assert(d < sz, d, sz, total);
+
+ /* Active is one at a time so can't use delta */
+ if (flags & TEST_ACTIVE)
+ fdinfo_assert(info.region_mem[j].active >= sz, d, sz, total);
+ else
+ fdinfo_assert(info.region_mem[j].active < sz, d, sz, total);
+
+ memcpy(&prev_info, &info, sizeof(info));
+
+ if (flags & TEST_ACTIVE) {
+ igt_spin_free(i915, spin);
+ gem_quiescent_gpu(i915);
+ }
+ }
+
+ close(i915);
+}
+
#define test_each_engine(T, i915, ctx, e) \
igt_subtest_with_dynamic(T) for_each_ctx_engine(i915, ctx, e) \
igt_dynamic_f("%s", e->name)
@@ -902,6 +1068,41 @@ igt_main
test_each_engine("isolation", i915, ctx, e)
single(i915, ctx, e, TEST_BUSY | TEST_ISOLATION);
+ igt_subtest_with_dynamic("memory-info-idle") {
+ for_each_memory_region(r, i915) {
+ igt_dynamic_f("%s", r->name)
+ test_memory(i915, r, 0);
+ }
+ }
+
+ igt_subtest_with_dynamic("memory-info-resident") {
+ for_each_memory_region(r, i915) {
+ igt_dynamic_f("%s", r->name)
+ test_memory(i915, r, TEST_RESIDENT);
+ }
+ }
+
+ igt_subtest_with_dynamic("memory-info-purgeable") {
+ for_each_memory_region(r, i915) {
+ igt_dynamic_f("%s", r->name)
+ test_memory(i915, r, TEST_PURGEABLE);
+ }
+ }
+
+ igt_subtest_with_dynamic("memory-info-active") {
+ for_each_memory_region(r, i915) {
+ igt_dynamic_f("%s", r->name)
+ test_memory(i915, r, TEST_ACTIVE);
+ }
+ }
+
+ igt_subtest_with_dynamic("memory-info-shared") {
+ for_each_memory_region(r, i915) {
+ igt_dynamic_f("%s", r->name)
+ test_memory(i915, r, TEST_SHARED);
+ }
+ }
+
igt_subtest_group {
int newfd;
--
2.39.2
^ permalink raw reply related [flat|nested] 3+ messages in thread