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 AE5E3ECE564 for ; Tue, 10 Sep 2024 05:50:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 69FEB10E6FF; Tue, 10 Sep 2024 05:50:15 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="VSmvEzXf"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id BBC8610E6FF for ; Tue, 10 Sep 2024 05:50:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1725947413; x=1757483413; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=/etZajQ33EnR5IKn0/8VLlN6l/Q575xMk+miW90vNlQ=; b=VSmvEzXfD7VdLm/QInna+1tVExBQ8CydIFZQKHrh8Sab3Q02Aby1yA4D v1iaR3IX2iIkNaIDALbYCMqRMFZBBSU+TQZ4tFb4/CzJQ56WzLUTC4yt1 G8IHVrd4XvRV9s9DtGNlxkCuxfLZN8FXF1fIX51f2wbv7OC3YsP6i1tXB gEnNez3jPbY+bKuYQqs5gsBej7NAQFM/fcXzwGC8If69FPUvRBO4+WA0c g90SzIpb3nw2yala1e3FgD6PExH1vkE87tnivaCwJyeAFnWIMC5cl5F6U EWa+z1/5cRFwPrbeSCE0ZLG0u/sFsOUTZy3rXo89GWKJ6QkZzyMi6PKPW w==; X-CSE-ConnectionGUID: UGN+Bd7sSWim1klXNcKJGA== X-CSE-MsgGUID: GIvd9PYMQN2YeL3KrOnDew== X-IronPort-AV: E=McAfee;i="6700,10204,11190"; a="35246256" X-IronPort-AV: E=Sophos;i="6.10,216,1719903600"; d="scan'208";a="35246256" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Sep 2024 22:50:12 -0700 X-CSE-ConnectionGUID: zjFsUC4uT2+hyW6e70WIAw== X-CSE-MsgGUID: 158KbzbPRk6E/DUCUmq9dA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,216,1719903600"; d="scan'208";a="66866176" Received: from kbommu-desk.iind.intel.com ([10.145.169.159]) by orviesa009.jf.intel.com with ESMTP; 09 Sep 2024 22:50:11 -0700 From: Bommu Krishnaiah To: igt-dev@lists.freedesktop.org Cc: Bommu Krishnaiah Subject: [PATCH v2] tests/core_setmaster: Handle the test even if cards are non-continuous Date: Tue, 10 Sep 2024 11:07:47 +0530 Message-Id: <20240910053747.14305-1-krishnaiah.bommu@intel.com> X-Mailer: git-send-email 2.25.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" Although most of user space assumes drm cards to be populated continuously, this assumption may not be always true. After hot unpluging and repluging of card, the card may be non-continuous. To address such scenarios where the cards can be non-continuous Modify the tweak_perm function to loop all possible card numbers(card0-card255) and break after first card found. Problem Description: The test fails after running the `core_hotunplug@hot*` subtest, where Card0 is populated as card1, This leads to a failure in the subsequent `master-drop-set-user` test. Command sequence for reproducing the issue: - Check available cards: `ls /dev/dri/` - Output: by-path card0 renderD128 - Run the test: `# ./core_hotunplug --r hotrebind-lateclose` - Check again: ‘ls /dev/dri/’ - Output after core_hotunplug : by-path card1 renderD129 - Run the test: `# ./core_setmaster --r master-drop-set-user` - Output: gta@ core_setmaster@master-drop-set-user failure This failures on both XE and i915 for above sequence. v2: Break the loop after first card found and check return value of chmod. Signed-off-by: Bommu Krishnaiah krishnaiah.bommu@intel.com Cc: Emil Velikov emil.l.velikov@gmail.com Cc: Himal Prasad Ghimiray himal.prasad.ghimiray@intel.com Cc: Kamil Konieczny kamil.konieczny@linux.intel.com --- tests/core_setmaster.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/tests/core_setmaster.c b/tests/core_setmaster.c index 9c2083f66..bfcfb5d25 100644 --- a/tests/core_setmaster.c +++ b/tests/core_setmaster.c @@ -107,18 +107,20 @@ static void check_drop_set(void) drm_close_driver(master); } -static unsigned tweak_perm(uint8_t *saved_perm, unsigned max_perm, bool save) +static int tweak_perm(uint8_t *saved_perm, unsigned max_perm, bool save) { char path[256]; struct stat st; - unsigned i; + int i; for (i = 0; i < max_perm; i++) { + int ret = 0; + snprintf(path, sizeof(path), "/dev/dri/card%u", i); /* Existing userspace assumes there's no gaps, do the same. */ if (stat(path, &st) != 0) - break; + continue; if (save) { /* Save and toggle */ @@ -136,7 +138,12 @@ static unsigned tweak_perm(uint8_t *saved_perm, unsigned max_perm, bool save) * - __drm_open_driver() can open another device, aka the * failure may be irrelevant. */ - chmod(path, st.st_mode); + ret = chmod(path, st.st_mode); + if (ret) + return ret; + + if (save) + return i; } return i; } @@ -161,7 +168,7 @@ igt_main igt_subtest_group { uint8_t saved_perm[255]; - unsigned num; + int num; /* Upon dropping root we end up as random user, which * a) is not in the video group, and -- 2.25.1