Re: [Intel-gfx] [PATCH i-g-t 2/9] tests/i915/drm_fdinfo: Stress test context close versus fdinfo reads

[Tvrtko Ursulin]

On 03/11/2023 18:32, Kamil Konieczny wrote:
Hi Tvrtko,
On 2023-10-12 at 09:15:40 +0100, Tvrtko Ursulin wrote:
From: Tvrtko Ursulin <tvrtko.ursu...@intel.com>

A short smoke tests to exercise fdinfo reads in parallel to contexts
getting created and destroyed.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursu...@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 344c44dce78b..c4218b0d16e6 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);

You repeat this pattern later, it can be made into
function:

igt_parse_drm_fdinfo(dir, buf, *info, p1, i1, p2, i2)
{
        memset(info, 0, sizeof(*info));
        ret = __igt_parse_drm_fdinfo(dir, buf, info, p1, i1, p2, i2);
        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);

Here you repeat this.

With or without makeing this a function,
Reviewed-by: Kamil Konieczny <kamil.koniec...@linux.intel.com>

Thanks Kamil!

I opted to keep it as is to avoid having to come with a name for a new 
helper, and because it is only two instances.

Doing another CI pass on both IGT and i915 series and fingers crossed it 
is still all healthy.

Regards,

Tvrtko


+               }
+       }
+
+       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)
@@ -848,6 +903,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