From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 24749C4345F for ; Mon, 22 Apr 2024 14:47:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8C453112B9D; Mon, 22 Apr 2024 14:47:22 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="XcwH+KjT"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 39A46112B97 for ; Mon, 22 Apr 2024 14:47:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713797241; x=1745333241; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=cfAgAGnSGw2qwmxhR0TQmXkOqAA6fCMM2lPblrxW6U0=; b=XcwH+KjTVc5wBzHRdoZX0bbVHeNUcVQ6f/z2JNJCVvc6eyf1FZB7vx/7 b4ZwOedBTZyX7J9/0b+qZ/1ULtdHXFb37sRs/e4HG+QcS6qTKCE1DzI7E Fg4aoFI3dD15DVlaHmfrDIo5B9h705GiXzix+ZvNxHTS9E+bovRfKV5Pv NRWm4mY4jd4P1xm8NkhJnfHLE9OnPHfZHAGJGy9EHKlHikNZUBv6f1OPL mnxSRAXRHMWv1OOFdsywZYpWeRlmiWgxO5ye68QG0yw0a5KUnByCNfiHP 78xlzq/rKHBM/csThCpXzMbOSM8VyA798AqQbEksy/ZRX0fv08lB7Og13 w==; X-CSE-ConnectionGUID: wq/xQwbvQn2PPrdg5LbWeA== X-CSE-MsgGUID: MVRLXTu2SpihYsY54k/l8A== X-IronPort-AV: E=McAfee;i="6600,9927,11052"; a="13174537" X-IronPort-AV: E=Sophos;i="6.07,220,1708416000"; d="scan'208";a="13174537" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Apr 2024 07:47:19 -0700 X-CSE-ConnectionGUID: yJntRisoRzSlQU79JsqmXw== X-CSE-MsgGUID: 9q6wT4gAQwGADlRo8OtJyg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,220,1708416000"; d="scan'208";a="24552303" Received: from maurocar-mobl2.ger.corp.intel.com (HELO localhost) ([10.245.246.17]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Apr 2024 07:47:18 -0700 From: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= To: igt-dev@lists.freedesktop.org Cc: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= , Matthew Brost , Kamil Konieczny Subject: [PATCH i-g-t v2] tests/xe_evict|exec_threads: Use fd reopen to avoid corrupting global data Date: Mon, 22 Apr 2024 16:47:13 +0200 Message-Id: <20240422144713.76025-1-zbigniew.kempczynski@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" Device scanning and filtering was designed to work in multi-process environment. Due to that opening the device with drm_open_driver() in multiple threads lead to global device data corruption. At the moment there's no easy way to redesign this so simplest thing we may do is to just acquire device fd in main process and reopen it (this doesn't involve any device scanning) in spawned threads. Lets use drm_reopen_driver() to stop calling not thread-safe code. Signed-off-by: Zbigniew Kempczyński Cc: Matthew Brost Cc: Kamil Konieczny --- v2: Add reopen in test_evict_cm() (Kamil) --- tests/intel/xe_evict.c | 10 +++++----- tests/intel/xe_exec_threads.c | 22 ++++++++-------------- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/tests/intel/xe_evict.c b/tests/intel/xe_evict.c index 8ef55211f7..5994ebb142 100644 --- a/tests/intel/xe_evict.c +++ b/tests/intel/xe_evict.c @@ -61,7 +61,7 @@ test_evict(int fd, struct drm_xe_engine_class_instance *eci, bo = calloc(n_execs / 2, sizeof(*bo)); igt_assert(bo); - fd = drm_open_driver(DRIVER_XE); + fd = drm_reopen_driver(fd); vm = xe_vm_create(fd, 0, 0); if (flags & BIND_EXEC_QUEUE) @@ -241,7 +241,7 @@ test_evict_cm(int fd, struct drm_xe_engine_class_instance *eci, bo = calloc(n_execs / 2, sizeof(*bo)); igt_assert(bo); - fd = drm_open_driver(DRIVER_XE); + fd = drm_reopen_driver(fd); vm = xe_vm_create(fd, DRM_XE_VM_CREATE_FLAG_LR_MODE, 0); if (flags & BIND_EXEC_QUEUE) @@ -769,21 +769,21 @@ igt_main for (const struct section *s = sections; s->name; s++) { igt_subtest_f("evict-%s", s->name) - test_evict(-1, hwe, s->n_exec_queues, s->n_execs, + test_evict(fd, hwe, s->n_exec_queues, s->n_execs, calc_bo_size(vram_size, s->mul, s->div), s->flags, NULL); } for (const struct section_cm *s = sections_cm; s->name; s++) { igt_subtest_f("evict-%s", s->name) - test_evict_cm(-1, hwe, s->n_exec_queues, s->n_execs, + test_evict_cm(fd, hwe, s->n_exec_queues, s->n_execs, calc_bo_size(vram_size, s->mul, s->div), s->flags, NULL); } for (const struct section_threads *s = sections_threads; s->name; s++) { igt_subtest_f("evict-%s", s->name) - threads(-1, hwe, s->n_threads, s->n_exec_queues, + threads(fd, hwe, s->n_threads, s->n_exec_queues, s->n_execs, calc_bo_size(vram_size, s->mul, s->div), s->flags); diff --git a/tests/intel/xe_exec_threads.c b/tests/intel/xe_exec_threads.c index 8083980f90..1e80842b98 100644 --- a/tests/intel/xe_exec_threads.c +++ b/tests/intel/xe_exec_threads.c @@ -71,8 +71,8 @@ test_balancer(int fd, int gt, uint32_t vm, uint64_t addr, uint64_t userptr, igt_assert(n_exec_queues <= MAX_N_EXEC_QUEUES); - if (!fd) { - fd = drm_open_driver(DRIVER_XE); + if (flags & FD) { + fd = drm_reopen_driver(fd); owns_fd = true; } @@ -273,8 +273,8 @@ test_compute_mode(int fd, uint32_t vm, uint64_t addr, uint64_t userptr, igt_assert(n_exec_queues <= MAX_N_EXEC_QUEUES); - if (!fd) { - fd = drm_open_driver(DRIVER_XE); + if (flags & FD) { + fd = drm_reopen_driver(fd); owns_fd = true; } @@ -477,8 +477,8 @@ test_legacy_mode(int fd, uint32_t vm, uint64_t addr, uint64_t userptr, igt_assert(n_exec_queues <= MAX_N_EXEC_QUEUES); - if (!fd) { - fd = drm_open_driver(DRIVER_XE); + if (flags & FD) { + fd = drm_reopen_driver(fd); owns_fd = true; } @@ -995,10 +995,7 @@ static void threads(int fd, int flags) #define ADDRESS_SHIFT 39 threads_data[i].addr = addr | (i << ADDRESS_SHIFT); threads_data[i].userptr = userptr | (i << ADDRESS_SHIFT); - if (flags & FD) - threads_data[i].fd = 0; - else - threads_data[i].fd = fd; + threads_data[i].fd = fd; threads_data[i].vm_legacy_mode = vm_legacy_mode; threads_data[i].vm_compute_mode = vm_compute_mode; threads_data[i].eci = hwe; @@ -1046,10 +1043,7 @@ static void threads(int fd, int flags) threads_data[i].addr = addr; threads_data[i].userptr = userptr | (i << ADDRESS_SHIFT); - if (flags & FD) - threads_data[i].fd = 0; - else - threads_data[i].fd = fd; + threads_data[i].fd = fd; threads_data[i].gt = gt; threads_data[i].vm_legacy_mode = vm_legacy_mode; -- 2.34.1