From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id D351110E0D6 for ; Wed, 20 Sep 2023 16:23:35 +0000 (UTC) From: Kamil Konieczny To: igt-dev@lists.freedesktop.org Date: Wed, 20 Sep 2023 18:19:11 +0200 Message-ID: <20230920161913.54521-2-kamil.konieczny@linux.intel.com> In-Reply-To: <20230920161913.54521-1-kamil.konieczny@linux.intel.com> References: <20230920161913.54521-1-kamil.konieczny@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH i-g-t 1/3] lib/drmtest: allow out of order device opening List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: Allow to open cards with filters out of order, not in the sequence 0...N. This will fix problem found out with test gem_exec_gttfill@multigpu-basic with three discrete GPUs: Opened device: /dev/dri/card1 Starting subtest: multigpu-basic Opened device: /dev/dri/card2 gem_exec_gttfill: ../lib/drmtest.c:313: _is_already_opened: Assertion `as_idx <= _opened_fds_count' failed. Added also some debug prints for diagnosing problems with multi-GPU tests. v2: fix setting opened count in _set_opened_fd() Signed-off-by: Kamil Konieczny --- lib/drmtest.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/lib/drmtest.c b/lib/drmtest.c index e1da66c87..926f388ee 100644 --- a/lib/drmtest.c +++ b/lib/drmtest.c @@ -296,13 +296,18 @@ static int _opened_fds_count; static void _set_opened_fd(int idx, int fd) { assert(idx < ARRAY_SIZE(_opened_fds)); - assert(idx <= _opened_fds_count); + + if (idx >= _opened_fds_count) { + for (int i = _opened_fds_count; i < idx; ++i) + _opened_fds[i].fd = -1; + } _opened_fds[idx].fd = fd; assert(fstat(fd, &_opened_fds[idx].stat) == 0); - _opened_fds_count = idx+1; + if (idx >= _opened_fds_count) + _opened_fds_count = idx + 1; } static bool _is_already_opened(const char *path, int as_idx) @@ -310,16 +315,23 @@ static bool _is_already_opened(const char *path, int as_idx) struct stat new; assert(as_idx < ARRAY_SIZE(_opened_fds)); - assert(as_idx <= _opened_fds_count); /* * we cannot even stat the device, so it's of no use - let's claim it's * already opened */ - if (igt_debug_on(stat(path, &new) != 0)) + if (igt_debug_on(stat(path, &new) != 0)) { + igt_debug("cannot stat device: %s\n", path); return true; + } + + if (as_idx >= _opened_fds_count) + return false; for (int i = 0; i < as_idx; ++i) { + if (_opened_fds[i].fd == -1) + continue; + /* did we cross filesystem boundary? */ assert(_opened_fds[i].stat.st_dev == new.st_dev); @@ -484,6 +496,7 @@ int __drm_open_driver_another(int idx, int chipset) { int fd = -1; + igt_debug("card idx: %d chipset: %d\n", idx, chipset); if (chipset != DRIVER_VGEM && igt_device_filter_count() > idx) { struct igt_device_card card; bool found; @@ -491,6 +504,7 @@ int __drm_open_driver_another(int idx, int chipset) found = __get_card_for_nth_filter(idx, &card); if (!found) { + igt_debug("cannot find card idx: %d, loading module\n", idx); drm_load_module(chipset); found = __get_card_for_nth_filter(idx, &card); } @@ -500,11 +514,14 @@ int __drm_open_driver_another(int idx, int chipset) igt_device_filter_get(idx)); else if (_is_already_opened(card.card, idx)) igt_warn("card maching filter %d is already opened\n", idx); - else + else { + igt_debug("card idx: %d found: %s\n", idx, card.card); fd = __open_driver_exact(card.card, chipset); + } } else { /* no filter for device idx, let's open whatever is available */ + igt_debug("No filter for device idx: %d\n", idx); fd = __open_driver("/dev/dri/card", 0, chipset, idx); } -- 2.42.0