From patchwork Fri Jan 31 11:02:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Eric Pelloux-Prayer X-Patchwork-Id: 13955233 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 0FF2FC0218D for ; Fri, 31 Jan 2025 11:04:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 82F9F10EA65; Fri, 31 Jan 2025 11:04:10 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.b="tTJdRr5A"; dkim-atps=neutral Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2047.outbound.protection.outlook.com [40.107.244.47]) by gabe.freedesktop.org (Postfix) with ESMTPS id C3BCF10EA65 for ; Fri, 31 Jan 2025 11:04:08 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xmq8MxhV60LIyZ1a0/SPWfO2y+AnmCXQpM5A6LEVj1g9VXHyaDypWIFI1F3ySkY5AogTitHGiUDs07xmi3glcwzdfizWAI0hkmPxXxtbHeBsRP5TeermjZq+0gAbZK2Cg8UkSDL6gisP8NiuqXpTq5XzpuEloepSJSL1ZvrOpNPB4HXXwfV8Jt22e3cXyXFXbdFCnV8yg2ew3Ci+OFirYkqvayBlyqcSUHb9LA1au7DO2UHPRFq6p6Lm7uUobUapwVpt5TuTNU3xnPlTn00S2F4gadd3K0FXdHf1k9U4VU/DFEwLw3g2aOFYpfVhqbLPD9Gx98+TbBqIRIwFMaeEvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=dsEhqp6tIv9yIf41m2j46e1J9ABlGKzXj7zRykOd4tQ=; b=IwBIuyEVRdpQfjkmwOQLlvk5TlLBofbqORb40ykK4kgjVZhTH7YVq/DSQdbvxnHG50YX9jmheRlvb1xxCaCGtCEg8/cWiHyYwFd9UBs0qgOVb/G4cFq6l86WDrexWTeZEkHLCkOzfAFPEdl3xdY84X3DOL2qmd0vPk4DqW6+U4zB5bq+doOEoSLfSn/d1SKL1ze/+Q0U2DQIeDsvqugJ5Fg5r3MChyUHB4RhJMtc/mIfVbnVS1OtQmwfxPyCN3CcMxSIjNrADuApLHZ6OhQCLgT+liZFdO3TT/H2j2pjgsWxw0o5vqh/SxUIHpcn9EaErb9mHxJIbkTveQhr+K01nQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linux.intel.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dsEhqp6tIv9yIf41m2j46e1J9ABlGKzXj7zRykOd4tQ=; b=tTJdRr5AS9f6LoxqFobcLmjWSK0i+PIurH1dXwpx236xsGmAo05Ak0AC00aWXATvcCxmt4AMzOlxL1pLDA6IlxxJyQeQI6iPeWhckK28Nb72WUDg5aZEnMQa9e+Kv28vV3/u19LjKFTUOOo/tCbbJ1lBYE+lJj4b+oNLzvEgidw= Received: from BYAPR05CA0034.namprd05.prod.outlook.com (2603:10b6:a03:c0::47) by DM6PR12MB4169.namprd12.prod.outlook.com (2603:10b6:5:215::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.18; Fri, 31 Jan 2025 11:04:05 +0000 Received: from CO1PEPF000044F0.namprd05.prod.outlook.com (2603:10b6:a03:c0:cafe::26) by BYAPR05CA0034.outlook.office365.com (2603:10b6:a03:c0::47) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8398.21 via Frontend Transport; Fri, 31 Jan 2025 11:04:04 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1PEPF000044F0.mail.protection.outlook.com (10.167.241.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8398.14 via Frontend Transport; Fri, 31 Jan 2025 11:04:03 +0000 Received: from patedamande.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Fri, 31 Jan 2025 05:04:00 -0600 From: Pierre-Eric Pelloux-Prayer To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter CC: Pierre-Eric Pelloux-Prayer , , Subject: [PATCH v7 1/7] drm/debugfs: output client_id in in drm_clients_info Date: Fri, 31 Jan 2025 12:02:59 +0100 Message-ID: <20250131110328.706695-2-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250131110328.706695-1-pierre-eric.pelloux-prayer@amd.com> References: <20250131110328.706695-1-pierre-eric.pelloux-prayer@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044F0:EE_|DM6PR12MB4169:EE_ X-MS-Office365-Filtering-Correlation-Id: db42df61-f9f0-4a22-ff5a-08dd41e6f962 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: frQZOsqmFfEXrU/grdDQckwmL5RYdinp7bFjp00jSdzyb497Vcz8Wu1A9/LLXNhtQKJd9uwbuX27VwpukuNZrp0aoaiGlNyWV8nXdw6OvtvDrl/mVlO4SYgrO17dedgWyU4vpc68kZ1nDU879NqtR8PSHe6bOr6evgRKQxIpSyXxXNTNv2pjpS5TEvdCpct/yKnQ/6WyF9xaP/XrOox3kWEuo9PFRSdKnyZ7CH4U/WGRaWcjS6ZJIzUKzOUxwV+Lp1JJrCDU36z5A5lO0hFhNcxNs0GzYLC0DtgcL9rh+JMRvkQ/pbhkFA1c4/jNHe+9lVdyBP4xuDEjBWxu2SunC8nxI1IrI/w0W+/ElBG4RfhQaDbSWixFoxNAj5bYQpQaP2LOHTZ5hv7JEediWdU8zwHZN3JoLsG/CGbtEUaUJeMZtq5HhxWfEHmnURxc31OyYNoPWYpWZmk0SA8FaNTCJChhi/ujG5ThHl2TJHCxa3WwpUryPSr8d5+SnQy6oJo2Zv8AATlY9e1md5msmH1Ymn63XsOggPK+Wd28dSNCKziob44b/KHcUvh6+bpPJchR2g03GDhGiVF5Ksz1oxZt+7BISuVLnyIqcTc0tsUIcMdP7PeGhQ74Vsf97h+xUaEJNqAAWIDnkUhvEQ2eS4dIj/MfgW8HgSMhJmn0xnRQSynE552FOw9uGNnpw5HgC0xxZ5pprZkEF86L9Y/O3Ha722mDqVs+Ww5FikWhM1+zxcGMcPM8yVQMLvFCbHuJnPow1/XN3LmUtZ94IT0ldfuOc0PMBi+hpCYJGpoAGGK7qU0OGfKwBLIzffZDt+/pJ1poXKBvSsOhfF4AdXyzct4DZ9TYbPgfuSe7bZvxXUxsFSqq9SUP6VQccDKXdPAikCNadlBqC0H7fAiLUHaJClUgpLBiUiTM7UI9qsNa7bYSv35mAnK5HdRlOwxYTH5m99WUPLZWOwWApJvtMmgh7Q4NnGHDaBtVKlgdvgnkwqZA65tFbPfLGS3n5dcQMwX/1ZOJRvfcm3ImmTGcADqXydoTd1bwhN4GaJ1Y8kc81i64O2XkolTUTuwn2KFHlCoceIVGq8BIRiOMWT7zQtYSjuE7sfFPve3bIb3cW5rFW85kBNlBsArMr/5SfvXc62ca/LqJj6fVzd/nscBSVlmdRsdNhWi9FoSOQsTqi85mHMoXOex6XoxQnr6Q6g8g1YxrP99U8HE2/Mh+/eSIj0n9jQNcThq8e1YpGNy81x2RI+96S6cGRILxxBiziFNQdOTp65C5jcbOARQFfqksCnwY0JLJul4aNRLOebgZeYQnNdylYExXjkK55gUZa5PX1VcB/SA5M89zCvP0FIuiSKON4v27UsS/EB13j7SRezh6Vxrcv7S3CA1JbZyMCYKhMnQT0HJTx9h3s6UuOyI7w8uykDGbhHYbfca+c7RcJiEUyJeGHmiVqTE/MrPMmzg5Cch70NbsWGo0S3hA6F0Bmd3l1wfo20PNtggqEsOvqRrbyACSit4= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(376014)(82310400026)(36860700013)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2025 11:04:03.7057 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: db42df61-f9f0-4a22-ff5a-08dd41e6f962 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044F0.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4169 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" client_id is a unique id used by fdinfo. Having it listed in 'clients' output means a userspace application can correlate the fields, eg: given a fdinfo id get the fdinfo name. Geiven that client_id is a uint64_t, we use a %20llu printf format to keep the output aligned (20 = digit count of the biggest uint64_t). Signed-off-by: Pierre-Eric Pelloux-Prayer --- drivers/gpu/drm/drm_debugfs.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c index 536409a35df4..061601211bc2 100644 --- a/drivers/gpu/drm/drm_debugfs.c +++ b/drivers/gpu/drm/drm_debugfs.c @@ -77,14 +77,15 @@ static int drm_clients_info(struct seq_file *m, void *data) kuid_t uid; seq_printf(m, - "%20s %5s %3s master a %5s %10s %*s\n", + "%20s %5s %3s master a %5s %10s %*s %20s\n", "command", "tgid", "dev", "uid", "magic", DRM_CLIENT_NAME_MAX_LEN, - "name"); + "name", + "id"); /* dev->filelist is sorted youngest first, but we want to present * oldest first (i.e. kernel, servers, clients), so walk backwardss. @@ -100,7 +101,7 @@ static int drm_clients_info(struct seq_file *m, void *data) pid = rcu_dereference(priv->pid); task = pid_task(pid, PIDTYPE_TGID); uid = task ? __task_cred(task)->euid : GLOBAL_ROOT_UID; - seq_printf(m, "%20s %5d %3d %c %c %5d %10u %*s\n", + seq_printf(m, "%20s %5d %3d %c %c %5d %10u %*s %20llu\n", task ? task->comm : "", pid_vnr(pid), priv->minor->index, @@ -109,7 +110,8 @@ static int drm_clients_info(struct seq_file *m, void *data) from_kuid_munged(seq_user_ns(m), uid), priv->magic, DRM_CLIENT_NAME_MAX_LEN, - priv->client_name ? priv->client_name : ""); + priv->client_name ? priv->client_name : "", + priv->client_id); rcu_read_unlock(); mutex_unlock(&priv->client_name_lock); } From patchwork Fri Jan 31 11:03:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Eric Pelloux-Prayer X-Patchwork-Id: 13955236 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 46BACC02194 for ; Fri, 31 Jan 2025 11:04:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 89B9710EA6E; Fri, 31 Jan 2025 11:04:51 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.b="Y6YTTeQb"; dkim-atps=neutral Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2072.outbound.protection.outlook.com [40.107.237.72]) by gabe.freedesktop.org (Postfix) with ESMTPS id D98B110EA69; Fri, 31 Jan 2025 11:04:49 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QrgGxVJvQG5W9+68Z9hCTduSfYuZKa1YjjcXwh0HT49wQxS7JhuKb9XejS2dVFrDV6jaUTbDE2nlnTeATtm6ZYB1FvN1AJqZDOz/MdJO7JDsscs+wjMDCJxE803T7OOeOp6yobMiMrqaLdSrhZ8tzvcBPzPDEe0REEUfUMISD4ZSOf00l2OTUjAm7QMTtiuPieFOna77jBLdNHbz96aeRPKdtgl8dEDsOYGiRjAaRicaXXCbtoyCYr+m+PuCo+k+maC4bhLDMKp3PRfydCAe/4W3OfcvuQsSHE4rks7cSVTqnuKjxY54FVkU5cj4YrBxWQYIWYbwA6g4xbbSVEZ2+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=FH9pFxO2uE/4DZKakNyM8CwSXSsS7Nz1LNCfC2NYfAE=; b=TA4BRl/BeTYfeldlzAbjgBCQke6raBGaWB4lu7CYQhyxgLoVWYt/CKiYrCsBsWxOgYoyjqcwoenL6W/n2oRYQdr1IYV0idULqKvD23r8M7fE5i9hj0PkYM6pSVtAqKWfD4DVc7/C7+DTRncH32C7sTZgIkUCSTC57p0JmC28SYRObeVzqwZCos1Zbf1HaJkX6eL0DHIAWm0YNrbMlIfZXTp9HRiSf2tUNk889vE/xlTH7mNXcne0TU6facc7rrOfyIi2PtXSraWrF792u566/pMtH3hVQ4ncKbDtXSe9r2EcFHEQjzSSfUP1ecFFXgU3i5uhB8lA3FeTWgzaD8V45A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FH9pFxO2uE/4DZKakNyM8CwSXSsS7Nz1LNCfC2NYfAE=; b=Y6YTTeQbtZvKMW2l2ldfdeMo6PXWTvXmSNS641nwUSacfiq66haXwfQk78msxlRaSkCOxXQNOuu9rc/koOi9Fz9aVLTqJzK9SpT8zGi+x7dPVgqbMlJ5EpprfMAjzbCxuq3FAw5AsT4M5432nYjGkMINYJ95FI3mFHIAPe0PO0M= Received: from MW3PR06CA0022.namprd06.prod.outlook.com (2603:10b6:303:2a::27) by DS7PR12MB9527.namprd12.prod.outlook.com (2603:10b6:8:251::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.20; Fri, 31 Jan 2025 11:04:46 +0000 Received: from CO1PEPF000044EE.namprd05.prod.outlook.com (2603:10b6:303:2a:cafe::bf) by MW3PR06CA0022.outlook.office365.com (2603:10b6:303:2a::27) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8398.20 via Frontend Transport; Fri, 31 Jan 2025 11:04:46 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1PEPF000044EE.mail.protection.outlook.com (10.167.241.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8398.14 via Frontend Transport; Fri, 31 Jan 2025 11:04:46 +0000 Received: from patedamande.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Fri, 31 Jan 2025 05:04:35 -0600 From: Pierre-Eric Pelloux-Prayer To: Min Ma , Lizhi Hou , Oded Gabbay , Felix Kuehling , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , Xinhui Pan , David Airlie , Simona Vetter , Lucas Stach , Russell King , Christian Gmeiner , Frank Binns , Matt Coster , "Maarten Lankhorst" , Maxime Ripard , Thomas Zimmermann , Qiang Yu , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , Karol Herbst , Lyude Paul , "Danilo Krummrich" , Boris Brezillon , Rob Herring , Steven Price , "Liviu Dudau" , Luben Tuikov , "Matthew Brost" , Philipp Stanner , Melissa Wen , =?utf-8?q?Ma=C3=ADra_Canal?= , Lucas De Marchi , =?utf-8?q?Thomas_Hellstr=C3=B6m?= , Rodrigo Vivi CC: Pierre-Eric Pelloux-Prayer , , , , , , , , , Subject: [PATCH v7 2/7] drm/sched: store the drm client_id in drm_sched_fence Date: Fri, 31 Jan 2025 12:03:00 +0100 Message-ID: <20250131110328.706695-3-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250131110328.706695-1-pierre-eric.pelloux-prayer@amd.com> References: <20250131110328.706695-1-pierre-eric.pelloux-prayer@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044EE:EE_|DS7PR12MB9527:EE_ X-MS-Office365-Filtering-Correlation-Id: 884e93c8-e419-4954-5daf-08dd41e712fc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|1800799024|36860700013|7416014|376014|921020; X-Microsoft-Antispam-Message-Info: piI/oQQqTZ0rcejbHtJAniIQcT8wXa2mpny3JgE/wJvnLQr27u+KbD6Q2gnGHip7VpP6MELASsb+QqAt7Rp/w6stzzl6ycChfBji+TFBn/rd7JZ/7UZiIWwHqEcO9PCokF3q7kGHacBBIAfhAFj8iyCyVlm1BDh/nYgPAUyLDFOSsVzJllNZFd2TqnFQyHuW7wgp4cBZrNBcOcMCgJLWnxuCGQ25J49sLHGpp9apnQX/6I4hwQqmFR0iFS1J1JD142d4eWkNqzjD6pm8esFaCd8mbOBalx3otj3SlM5rulUbQfoQlAJGM8TTzejvhB3HmO8jMRmb2NFojAm9Do9I5DQg2YptUOtYEOoNBsyl3/s8ymqqlT+bmOEzrh7y4Qr/ui7IkGm55axiTp2mDP3pZJC4mG9mADWhS/x4Pob0LKLDYdSv1QIwHLikBQxOInBJZ9GHtXt+BQHa8iTobeG0ZxFeJzaNkzPrhRqOjQkIPpTAePcGIpiwNb4p0FAB2QuGSUJ1M8YkSrxWmDNvUPzWKzWG9+Bl5OCf3ZiPQkKKw6wsAJ/djVfooVfHCCLLt1mBnQs6HOG151d9jSxjJ+IQsheXAaK+nKBUbrd+BNxV6c/r3LaKWMaliLeNYVYWj3ubEVArqdGw0HHc8+jWCuzIXpF2N/DhdLfwYc8fT5ehQUYxpmUjIzZSta6ZvPidl8bvR12g7p35LvARpn3/7rNDz+Y+M/+OzmO4s0hlWo3iDxbg2+4pXhyfCXuIh7XAD0/IPV7hYTwsBAfak4mxJLTJVwqv5JKHFHnV5DtRsBT0hDNbyisVKbeN/MAPM5TtOb1OnNgTHjeHQXnGICwmrTcV6uhcMbfiDrLBhnhy/lkdPmSYi/fVCWoI9Ivr7URbrsOVRs0b6TKeomsfqoz4AV4w1PSY0lahwbHy+zl90n8lICh1hJ7NbHNdHHYZ2XptEoT//FXxKzmxeUjtHv2L/6obZINdkM3KePZTI78ilXHcPIFdeqhrLdb3xl/CmmwKumVkm9ck0pLiqL7TAmUnqDysen3vc98E9zRv788JGAMGgMx9qIq30pnRm9epXpXHweaVZ3ABACM8C040fctUbLXLSXlpSSc6NEE6x9F7QwW3YECelEWwTLynhx9fuS75Jp7aQUF/6wa6EIOPHQWYvJ+fzInSmN/phlEc9IB8zwNNwQWOruA2QWqm3wontXE+LkIjpmqCfZ0wAvDpYUVCXKiqmzvFp9aFsz2Azx2AR9zTQh4H13vJ7lIIBhzZIOR3Q8I9A1xdJqnAWlGZfos777uC+q1jbjTUyESs0CDMlSw9uyg+2X2aLmY0jy9PuRyGS9Qbkt3ukprLE7GtmxsCOyIZ/p+6831T5kU7KftVuB/4DP/y1NyvORPkJEbeiHLcrUK2lfSrcskf3fBN8eo8+hTUYJBi7lBFBMpD+LS65YDKwweqzEgwOzXPO12wrUISA46EeCFSffeZjNANXu6yJoEX+tzLiq7oNWfGMtkEvPAekUR5m7FRSP2LRUb5sWslxm0M X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(82310400026)(1800799024)(36860700013)(7416014)(376014)(921020); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2025 11:04:46.6539 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 884e93c8-e419-4954-5daf-08dd41e712fc X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044EE.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB9527 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This will be used in a later commit to trace the drm client_id in some of the gpu_scheduler trace events. This requires changing all the users of drm_sched_job_init to add an extra parameter. The newly added drm_client_id field in the drm_sched_fence is a bit of a duplicate of the owner one. One suggestion I received was to merge those 2 fields - this can't be done right now as amdgpu uses some special values (AMDGPU_FENCE_OWNER_*) that can't really be translated into a client id. Christian is working on getting rid of those; when it's done we should be able to squash owner/drm_client_id together. Signed-off-by: Pierre-Eric Pelloux-Prayer --- drivers/accel/amdxdna/aie2_ctx.c | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 8 +++++--- drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 3 ++- drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 2 +- drivers/gpu/drm/imagination/pvr_job.c | 2 +- drivers/gpu/drm/imagination/pvr_queue.c | 5 +++-- drivers/gpu/drm/imagination/pvr_queue.h | 2 +- drivers/gpu/drm/lima/lima_gem.c | 2 +- drivers/gpu/drm/lima/lima_sched.c | 6 ++++-- drivers/gpu/drm/lima/lima_sched.h | 3 ++- drivers/gpu/drm/msm/msm_gem_submit.c | 8 +++++--- drivers/gpu/drm/nouveau/nouveau_sched.c | 3 ++- drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +- drivers/gpu/drm/panthor/panthor_drv.c | 3 ++- drivers/gpu/drm/panthor/panthor_mmu.c | 2 +- drivers/gpu/drm/panthor/panthor_sched.c | 5 +++-- drivers/gpu/drm/panthor/panthor_sched.h | 3 ++- drivers/gpu/drm/scheduler/sched_fence.c | 4 +++- drivers/gpu/drm/scheduler/sched_main.c | 6 ++++-- drivers/gpu/drm/v3d/v3d_submit.c | 2 +- drivers/gpu/drm/xe/xe_sched_job.c | 3 ++- include/drm/gpu_scheduler.h | 12 ++++++++++-- 24 files changed, 61 insertions(+), 33 deletions(-) diff --git a/drivers/accel/amdxdna/aie2_ctx.c b/drivers/accel/amdxdna/aie2_ctx.c index 5f43db02b240..d33e62f1b127 100644 --- a/drivers/accel/amdxdna/aie2_ctx.c +++ b/drivers/accel/amdxdna/aie2_ctx.c @@ -819,7 +819,8 @@ int aie2_cmd_submit(struct amdxdna_hwctx *hwctx, struct amdxdna_sched_job *job, goto up_sem; } - ret = drm_sched_job_init(&job->base, &hwctx->priv->entity, 1, hwctx); + ret = drm_sched_job_init(&job->base, &hwctx->priv->entity, 1, hwctx, + hwctx->client->filp->client_id); if (ret) { XDNA_ERR(xdna, "DRM job init failed, ret %d", ret); goto free_chain; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c index 2e5732dfd425..d480be803784 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c @@ -681,7 +681,7 @@ int amdgpu_amdkfd_submit_ib(struct amdgpu_device *adev, goto err; } - ret = amdgpu_job_alloc(adev, NULL, NULL, NULL, 1, &job); + ret = amdgpu_job_alloc(adev, NULL, NULL, NULL, 1, &job, 0); if (ret) goto err; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 5cc5f59e3018..d115fa10f8ee 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -293,7 +293,8 @@ static int amdgpu_cs_pass1(struct amdgpu_cs_parser *p, for (i = 0; i < p->gang_size; ++i) { ret = amdgpu_job_alloc(p->adev, vm, p->entities[i], vm, - num_ibs[i], &p->jobs[i]); + num_ibs[i], &p->jobs[i], + p->filp->client_id); if (ret) goto free_all_kdata; p->jobs[i]->enforce_isolation = p->adev->enforce_isolation[fpriv->xcp_id]; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index 100f04475943..0a9a53f2e78a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c @@ -185,7 +185,8 @@ static enum drm_gpu_sched_stat amdgpu_job_timedout(struct drm_sched_job *s_job) int amdgpu_job_alloc(struct amdgpu_device *adev, struct amdgpu_vm *vm, struct drm_sched_entity *entity, void *owner, - unsigned int num_ibs, struct amdgpu_job **job) + unsigned int num_ibs, struct amdgpu_job **job, + u64 drm_client_id) { if (num_ibs == 0) return -EINVAL; @@ -203,7 +204,8 @@ int amdgpu_job_alloc(struct amdgpu_device *adev, struct amdgpu_vm *vm, if (!entity) return 0; - return drm_sched_job_init(&(*job)->base, entity, 1, owner); + return drm_sched_job_init(&(*job)->base, entity, 1, owner, + drm_client_id); } int amdgpu_job_alloc_with_ib(struct amdgpu_device *adev, @@ -213,7 +215,7 @@ int amdgpu_job_alloc_with_ib(struct amdgpu_device *adev, { int r; - r = amdgpu_job_alloc(adev, NULL, entity, owner, 1, job); + r = amdgpu_job_alloc(adev, NULL, entity, owner, 1, job, 0); if (r) return r; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.h index ce6b9ba967ff..5a8bc6342222 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.h @@ -90,7 +90,8 @@ static inline struct amdgpu_ring *amdgpu_job_ring(struct amdgpu_job *job) int amdgpu_job_alloc(struct amdgpu_device *adev, struct amdgpu_vm *vm, struct drm_sched_entity *entity, void *owner, - unsigned int num_ibs, struct amdgpu_job **job); + unsigned int num_ibs, struct amdgpu_job **job, + u64 drm_client_id); int amdgpu_job_alloc_with_ib(struct amdgpu_device *adev, struct drm_sched_entity *entity, void *owner, size_t size, enum amdgpu_ib_pool_type pool_type, diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c index 3c0a5c3e0e3d..76c742328edb 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c @@ -534,7 +534,7 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data, ret = drm_sched_job_init(&submit->sched_job, &ctx->sched_entity[args->pipe], - 1, submit->ctx); + 1, submit->ctx, file->client_id); if (ret) goto err_submit_put; diff --git a/drivers/gpu/drm/imagination/pvr_job.c b/drivers/gpu/drm/imagination/pvr_job.c index 618503a212a7..64152b57e8b1 100644 --- a/drivers/gpu/drm/imagination/pvr_job.c +++ b/drivers/gpu/drm/imagination/pvr_job.c @@ -446,7 +446,7 @@ create_job(struct pvr_device *pvr_dev, if (err) goto err_put_job; - err = pvr_queue_job_init(job); + err = pvr_queue_job_init(job, pvr_file->file->client_id); if (err) goto err_put_job; diff --git a/drivers/gpu/drm/imagination/pvr_queue.c b/drivers/gpu/drm/imagination/pvr_queue.c index c4f08432882b..240d85e1006d 100644 --- a/drivers/gpu/drm/imagination/pvr_queue.c +++ b/drivers/gpu/drm/imagination/pvr_queue.c @@ -1059,6 +1059,7 @@ static int pvr_queue_cleanup_fw_context(struct pvr_queue *queue) /** * pvr_queue_job_init() - Initialize queue related fields in a pvr_job object. * @job: The job to initialize. + * @drm_client_id: drm_file.client_id submitting the job * * Bind the job to a queue and allocate memory to guarantee pvr_queue_job_arm() * and pvr_queue_job_push() can't fail. We also make sure the context type is @@ -1068,7 +1069,7 @@ static int pvr_queue_cleanup_fw_context(struct pvr_queue *queue) * * 0 on success, or * * An error code if something failed. */ -int pvr_queue_job_init(struct pvr_job *job) +int pvr_queue_job_init(struct pvr_job *job, u64 drm_client_id) { /* Fragment jobs need at least one native fence wait on the geometry job fence. */ u32 min_native_dep_count = job->type == DRM_PVR_JOB_TYPE_FRAGMENT ? 1 : 0; @@ -1085,7 +1086,7 @@ int pvr_queue_job_init(struct pvr_job *job) if (!pvr_cccb_cmdseq_can_fit(&queue->cccb, job_cmds_size(job, min_native_dep_count))) return -E2BIG; - err = drm_sched_job_init(&job->base, &queue->entity, 1, THIS_MODULE); + err = drm_sched_job_init(&job->base, &queue->entity, 1, THIS_MODULE, drm_client_id); if (err) return err; diff --git a/drivers/gpu/drm/imagination/pvr_queue.h b/drivers/gpu/drm/imagination/pvr_queue.h index e06ced69302f..0cfbe1cd311e 100644 --- a/drivers/gpu/drm/imagination/pvr_queue.h +++ b/drivers/gpu/drm/imagination/pvr_queue.h @@ -139,7 +139,7 @@ struct pvr_queue { bool pvr_queue_fence_is_ufo_backed(struct dma_fence *f); -int pvr_queue_job_init(struct pvr_job *job); +int pvr_queue_job_init(struct pvr_job *job, u64 drm_client_id); void pvr_queue_job_cleanup(struct pvr_job *job); diff --git a/drivers/gpu/drm/lima/lima_gem.c b/drivers/gpu/drm/lima/lima_gem.c index 9bb997dbb4b9..f46f961afc56 100644 --- a/drivers/gpu/drm/lima/lima_gem.c +++ b/drivers/gpu/drm/lima/lima_gem.c @@ -341,7 +341,7 @@ int lima_gem_submit(struct drm_file *file, struct lima_submit *submit) err = lima_sched_task_init( submit->task, submit->ctx->context + submit->pipe, - bos, submit->nr_bos, vm); + bos, submit->nr_bos, vm, file->client_id); if (err) goto err_out1; diff --git a/drivers/gpu/drm/lima/lima_sched.c b/drivers/gpu/drm/lima/lima_sched.c index b40c90e97d7e..ffc369dd4301 100644 --- a/drivers/gpu/drm/lima/lima_sched.c +++ b/drivers/gpu/drm/lima/lima_sched.c @@ -113,7 +113,8 @@ static inline struct lima_sched_pipe *to_lima_pipe(struct drm_gpu_scheduler *sch int lima_sched_task_init(struct lima_sched_task *task, struct lima_sched_context *context, struct lima_bo **bos, int num_bos, - struct lima_vm *vm) + struct lima_vm *vm, + u64 drm_client_id) { int err, i; @@ -124,7 +125,8 @@ int lima_sched_task_init(struct lima_sched_task *task, for (i = 0; i < num_bos; i++) drm_gem_object_get(&bos[i]->base.base); - err = drm_sched_job_init(&task->base, &context->base, 1, vm); + err = drm_sched_job_init(&task->base, &context->base, 1, vm, + drm_client_id); if (err) { kfree(task->bos); return err; diff --git a/drivers/gpu/drm/lima/lima_sched.h b/drivers/gpu/drm/lima/lima_sched.h index 85b23ba901d5..1a08faf8a529 100644 --- a/drivers/gpu/drm/lima/lima_sched.h +++ b/drivers/gpu/drm/lima/lima_sched.h @@ -88,7 +88,8 @@ struct lima_sched_pipe { int lima_sched_task_init(struct lima_sched_task *task, struct lima_sched_context *context, struct lima_bo **bos, int num_bos, - struct lima_vm *vm); + struct lima_vm *vm, + u64 drm_client_id); void lima_sched_task_fini(struct lima_sched_task *task); int lima_sched_context_init(struct lima_sched_pipe *pipe, diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c index dee470403036..378119155673 100644 --- a/drivers/gpu/drm/msm/msm_gem_submit.c +++ b/drivers/gpu/drm/msm/msm_gem_submit.c @@ -30,7 +30,7 @@ static struct msm_gem_submit *submit_create(struct drm_device *dev, struct msm_gpu *gpu, struct msm_gpu_submitqueue *queue, uint32_t nr_bos, - uint32_t nr_cmds) + uint32_t nr_cmds, u64 drm_client_id) { static atomic_t ident = ATOMIC_INIT(0); struct msm_gem_submit *submit; @@ -54,7 +54,8 @@ static struct msm_gem_submit *submit_create(struct drm_device *dev, return ERR_PTR(ret); } - ret = drm_sched_job_init(&submit->base, queue->entity, 1, queue); + ret = drm_sched_job_init(&submit->base, queue->entity, 1, queue, + drm_client_id); if (ret) { kfree(submit->hw_fence); kfree(submit); @@ -693,7 +694,8 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, } } - submit = submit_create(dev, gpu, queue, args->nr_bos, args->nr_cmds); + submit = submit_create(dev, gpu, queue, args->nr_bos, args->nr_cmds, + file->client_id); if (IS_ERR(submit)) { ret = PTR_ERR(submit); goto out_post_unlock; diff --git a/drivers/gpu/drm/nouveau/nouveau_sched.c b/drivers/gpu/drm/nouveau/nouveau_sched.c index 4412f2711fb5..ebc31adea39a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_sched.c +++ b/drivers/gpu/drm/nouveau/nouveau_sched.c @@ -87,7 +87,8 @@ nouveau_job_init(struct nouveau_job *job, } ret = drm_sched_job_init(&job->base, &sched->entity, - args->credits, NULL); + args->credits, NULL, + job->file_priv->client_id); if (ret) goto err_free_chains; diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c index 0f3935556ac7..f4f20d11ecd9 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -312,7 +312,7 @@ static int panfrost_ioctl_submit(struct drm_device *dev, void *data, ret = drm_sched_job_init(&job->base, &file_priv->sched_entity[slot], - 1, NULL); + 1, NULL, file->client_id); if (ret) goto out_put_job; diff --git a/drivers/gpu/drm/panthor/panthor_drv.c b/drivers/gpu/drm/panthor/panthor_drv.c index d5dcd3d1b33a..bf8c92ebcc2d 100644 --- a/drivers/gpu/drm/panthor/panthor_drv.c +++ b/drivers/gpu/drm/panthor/panthor_drv.c @@ -988,7 +988,8 @@ static int panthor_ioctl_group_submit(struct drm_device *ddev, void *data, const struct drm_panthor_queue_submit *qsubmit = &jobs_args[i]; struct drm_sched_job *job; - job = panthor_job_create(pfile, args->group_handle, qsubmit); + job = panthor_job_create(pfile, args->group_handle, qsubmit, + file->client_id); if (IS_ERR(job)) { ret = PTR_ERR(job); goto out_cleanup_submit_ctx; diff --git a/drivers/gpu/drm/panthor/panthor_mmu.c b/drivers/gpu/drm/panthor/panthor_mmu.c index c39e3eb1c15d..9c49b1aef759 100644 --- a/drivers/gpu/drm/panthor/panthor_mmu.c +++ b/drivers/gpu/drm/panthor/panthor_mmu.c @@ -2480,7 +2480,7 @@ panthor_vm_bind_job_create(struct drm_file *file, kref_init(&job->refcount); job->vm = panthor_vm_get(vm); - ret = drm_sched_job_init(&job->base, &vm->entity, 1, vm); + ret = drm_sched_job_init(&job->base, &vm->entity, 1, vm, file->client_id); if (ret) goto err_put_job; diff --git a/drivers/gpu/drm/panthor/panthor_sched.c b/drivers/gpu/drm/panthor/panthor_sched.c index 77b184c3fb0c..b81c428bf66c 100644 --- a/drivers/gpu/drm/panthor/panthor_sched.c +++ b/drivers/gpu/drm/panthor/panthor_sched.c @@ -3672,7 +3672,8 @@ struct panthor_vm *panthor_job_vm(struct drm_sched_job *sched_job) struct drm_sched_job * panthor_job_create(struct panthor_file *pfile, u16 group_handle, - const struct drm_panthor_queue_submit *qsubmit) + const struct drm_panthor_queue_submit *qsubmit, + u64 drm_client_id) { struct panthor_group_pool *gpool = pfile->groups; struct panthor_job *job; @@ -3744,7 +3745,7 @@ panthor_job_create(struct panthor_file *pfile, ret = drm_sched_job_init(&job->base, &job->group->queues[job->queue_idx]->entity, - credits, job->group); + credits, job->group, drm_client_id); if (ret) goto err_put_job; diff --git a/drivers/gpu/drm/panthor/panthor_sched.h b/drivers/gpu/drm/panthor/panthor_sched.h index 5ae6b4bde7c5..d80c040ebf13 100644 --- a/drivers/gpu/drm/panthor/panthor_sched.h +++ b/drivers/gpu/drm/panthor/panthor_sched.h @@ -28,7 +28,8 @@ int panthor_group_get_state(struct panthor_file *pfile, struct drm_sched_job * panthor_job_create(struct panthor_file *pfile, u16 group_handle, - const struct drm_panthor_queue_submit *qsubmit); + const struct drm_panthor_queue_submit *qsubmit, + u64 drm_client_id); struct drm_sched_job *panthor_job_get(struct drm_sched_job *job); struct panthor_vm *panthor_job_vm(struct drm_sched_job *sched_job); void panthor_job_put(struct drm_sched_job *job); diff --git a/drivers/gpu/drm/scheduler/sched_fence.c b/drivers/gpu/drm/scheduler/sched_fence.c index 0f35f009b9d3..41c3d596603c 100644 --- a/drivers/gpu/drm/scheduler/sched_fence.c +++ b/drivers/gpu/drm/scheduler/sched_fence.c @@ -204,7 +204,8 @@ struct drm_sched_fence *to_drm_sched_fence(struct dma_fence *f) EXPORT_SYMBOL(to_drm_sched_fence); struct drm_sched_fence *drm_sched_fence_alloc(struct drm_sched_entity *entity, - void *owner) + void *owner, + u64 drm_client_id) { struct drm_sched_fence *fence = NULL; @@ -213,6 +214,7 @@ struct drm_sched_fence *drm_sched_fence_alloc(struct drm_sched_entity *entity, return NULL; fence->owner = owner; + fence->drm_client_id = drm_client_id; spin_lock_init(&fence->lock); return fence; diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c index 57da84908752..ad306d3d7282 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -776,6 +776,7 @@ EXPORT_SYMBOL(drm_sched_resubmit_jobs); * @credits: the number of credits this job contributes to the schedulers * credit limit * @owner: job owner for debugging + * @drm_client_id: drm_file.client_id of the owner * * Refer to drm_sched_entity_push_job() documentation * for locking considerations. @@ -796,7 +797,8 @@ EXPORT_SYMBOL(drm_sched_resubmit_jobs); */ int drm_sched_job_init(struct drm_sched_job *job, struct drm_sched_entity *entity, - u32 credits, void *owner) + u32 credits, void *owner, + uint64_t drm_client_id) { if (!entity->rq) { /* This will most likely be followed by missing frames @@ -822,7 +824,7 @@ int drm_sched_job_init(struct drm_sched_job *job, job->entity = entity; job->credits = credits; - job->s_fence = drm_sched_fence_alloc(entity, owner); + job->s_fence = drm_sched_fence_alloc(entity, owner, drm_client_id); if (!job->s_fence) return -ENOMEM; diff --git a/drivers/gpu/drm/v3d/v3d_submit.c b/drivers/gpu/drm/v3d/v3d_submit.c index 4ff5de46fb22..5171ffe9012d 100644 --- a/drivers/gpu/drm/v3d/v3d_submit.c +++ b/drivers/gpu/drm/v3d/v3d_submit.c @@ -169,7 +169,7 @@ v3d_job_init(struct v3d_dev *v3d, struct drm_file *file_priv, job->file = file_priv; ret = drm_sched_job_init(&job->base, &v3d_priv->sched_entity[queue], - 1, v3d_priv); + 1, v3d_priv, file_priv->client_id); if (ret) return ret; diff --git a/drivers/gpu/drm/xe/xe_sched_job.c b/drivers/gpu/drm/xe/xe_sched_job.c index 1905ca590965..f4679cb9a56b 100644 --- a/drivers/gpu/drm/xe/xe_sched_job.c +++ b/drivers/gpu/drm/xe/xe_sched_job.c @@ -113,7 +113,8 @@ struct xe_sched_job *xe_sched_job_create(struct xe_exec_queue *q, kref_init(&job->refcount); xe_exec_queue_get(job->q); - err = drm_sched_job_init(&job->drm, q->entity, 1, NULL); + err = drm_sched_job_init(&job->drm, q->entity, 1, NULL, + q->xef->drm->client_id); if (err) goto err_free; diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h index 95e17504e46a..7982ca8d7ca5 100644 --- a/include/drm/gpu_scheduler.h +++ b/include/drm/gpu_scheduler.h @@ -311,6 +311,13 @@ struct drm_sched_fence { * @owner: job owner for debugging */ void *owner; + + /** + * @drm_client_id: + * + * The client_id of the drm_file which owns the job. + */ + uint64_t drm_client_id; }; struct drm_sched_fence *to_drm_sched_fence(struct dma_fence *f); @@ -563,7 +570,8 @@ int drm_sched_init(struct drm_gpu_scheduler *sched, void drm_sched_fini(struct drm_gpu_scheduler *sched); int drm_sched_job_init(struct drm_sched_job *job, struct drm_sched_entity *entity, - u32 credits, void *owner); + u32 credits, void *owner, + u64 drm_client_id); void drm_sched_job_arm(struct drm_sched_job *job); int drm_sched_job_add_dependency(struct drm_sched_job *job, struct dma_fence *fence); @@ -624,7 +632,7 @@ bool drm_sched_entity_is_ready(struct drm_sched_entity *entity); int drm_sched_entity_error(struct drm_sched_entity *entity); struct drm_sched_fence *drm_sched_fence_alloc( - struct drm_sched_entity *s_entity, void *owner); + struct drm_sched_entity *s_entity, void *owner, u64 drm_client_id); void drm_sched_fence_init(struct drm_sched_fence *fence, struct drm_sched_entity *entity); void drm_sched_fence_free(struct drm_sched_fence *fence); From patchwork Fri Jan 31 11:03:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Eric Pelloux-Prayer X-Patchwork-Id: 13955237 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 BC0CCC0218D for ; Fri, 31 Jan 2025 11:05:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 33B8110EA69; Fri, 31 Jan 2025 11:05:18 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.b="iJnTPNJ3"; dkim-atps=neutral Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2086.outbound.protection.outlook.com [40.107.102.86]) by gabe.freedesktop.org (Postfix) with ESMTPS id BECA610EA69 for ; Fri, 31 Jan 2025 11:05:16 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qEMEGh/d7nDok/4+2u8l12k0bolwbvSX6gKaybsKZwipPjzKz/UlIgs61cS91J+N4su3Y+5A2G05Yqz+E7ziCZJmiB9+Z8h3bL25Q/ofsPDVL6RrD0PCjdUMCtpdRFUPxbJISFoXGs0hNEI7UBi8uzPsETMCM3SmZfFYwHzgt0o4YaBQdbI/UXGYFdTZf3qqUkdyrdoDcfs9na6DqviBD6TRqRAxbLS46M7pMgz/wY5eeYN1JXoDulgIcYGDkrnXLsQNfbCQCtFmKCrFrMxq7BiEhn1S7CJXxb3TF/kPCQMjIh1C+saB98nH0hjG+mCql0JeyawQgzWzf6fw+p8IwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=OwvyX2C6ss87REpadHgdl/uYANK5iqlmjjZHTvstluo=; b=bRbeMyMNdkMrOkSxzaRZBQl04ye98zhGZkai5xWtUMLFnLg2UuD1GSWasSzPYaKvDJiujEflBpzNb0LF8tvoYkhVo0kw4f6Wjul+NjJwy9+V8QkWE2WE9WESOa2wZaT8HtVxlEm1ChUmApvCK0VeLKrK54+nbORmHd4fEDaCqlD7Vg/uevcs3ycigYTpDAIiAbCGDqnwKXAe7Yz6/kcdJ3YtcyyP3/RbkwBQdzEZaNlengZAWEapTIJpdJ19NgFDWit/ckE2QkEH6MdRIacS6s8vhFxsAPQXjIZIdaN3JN/9Zs06w+qE3hh8zsOEkaGlJlDYjokI+Q4rbMlq57VQ2A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gmail.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OwvyX2C6ss87REpadHgdl/uYANK5iqlmjjZHTvstluo=; b=iJnTPNJ3yqxAW8k23EaNXcKOcYYAfYeleiLoCjb+DyJVX+6TSdUGO0K+UWnwiW9wrSi9B2OY7utlMUfOCg/9Ddw+h/6df96zxXhb5sjJGfzNeTr5I+0sS/Qc/k00n7r3xufr93FnFqAof269oPWs6Uls+FgLaKVhc6qoAXOTH1c= Received: from BY3PR03CA0021.namprd03.prod.outlook.com (2603:10b6:a03:39a::26) by PH7PR12MB5656.namprd12.prod.outlook.com (2603:10b6:510:13b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8377.19; Fri, 31 Jan 2025 11:05:11 +0000 Received: from CO1PEPF000044F5.namprd05.prod.outlook.com (2603:10b6:a03:39a:cafe::76) by BY3PR03CA0021.outlook.office365.com (2603:10b6:a03:39a::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8398.20 via Frontend Transport; Fri, 31 Jan 2025 11:05:11 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1PEPF000044F5.mail.protection.outlook.com (10.167.241.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8398.14 via Frontend Transport; Fri, 31 Jan 2025 11:05:11 +0000 Received: from patedamande.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Fri, 31 Jan 2025 05:05:06 -0600 From: Pierre-Eric Pelloux-Prayer To: Luben Tuikov , Matthew Brost , Danilo Krummrich , "Philipp Stanner" , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter CC: Pierre-Eric Pelloux-Prayer , , Subject: [PATCH v7 3/7] drm/sched: add device name to the drm_sched_process_job event Date: Fri, 31 Jan 2025 12:03:01 +0100 Message-ID: <20250131110328.706695-4-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250131110328.706695-1-pierre-eric.pelloux-prayer@amd.com> References: <20250131110328.706695-1-pierre-eric.pelloux-prayer@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044F5:EE_|PH7PR12MB5656:EE_ X-MS-Office365-Filtering-Correlation-Id: 0c86406d-b1ce-411a-e603-08dd41e72185 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|1800799024|376014|7416014|82310400026; X-Microsoft-Antispam-Message-Info: 0gq30+WTofcUH0yVFh5OBNOvB9J013T3Esn9FFusAVQlf8t29bRuRtEBcwIXBODg1h66A/BbphHDJ+tM9f4PbfJZkhPXNsnVjkTsveYmpM1L3rw/ESXv9MGvZBx3z6HcjCJHBKjw1SF58TxdgO8qqg4rvgnfdwsEegp/ZGXVhBSsR/xDOifc6wgHs30aDeAmZk5YQ+orbBtxWjy5krz3EpwZULgAF6S03AJvEQwYQo3x6El/Qc4oYe/GEJ0m92QZIhluuJXPYcsPNAM4OEmnZqBhdVry7JsLYrTSD+1/c+peLbJpkkdsB5tkunSodLKFIsejCPgNulXVqpcd9BgLc0F0uHXt6ye7aErWNIXGAFizZSv1AFNcuLeOkSPm0TnLTX+aAxWbdEVuU226QkVZCUyNe9PVCYpiOssWoREReX8bDzJJZ1u1qMSulP/hZxLYXNhu0bbYIAQ8ND4AQWvjsipR7t4O8gNJUjLmggmjSLSUrW6Hv1zsCB61BSyEzdT3LRQnC3V0SenFXqZi3cQ4cFk0QxzDhDyl03EmfFb8MphUtKO0dNWi/caYkJi4hR9KvvZAwzJOvrMS8XR0UKrGdB59JOATzfEHqIIqv1COBDenRU8aemCxthDQM2eKDyHQ9VyeN0FYN88jkHfHYCElY5YtJULoYzBrGGMidEonpFfE29r58eZiKMjGJouSwVQDKDt8/PzKpgtByDr5TONQd3qAjmTrIC11MrGwo/ZQx6Zj3OQAPblqMA9MboIJKbjJvWd8qHeUy7QAsWNxFKtvYwcKKhD6/KTYMzhSFY725IU14IlnOperWlPzfoYOjsTgvQblE16CfJ5HNIuo5GQfifxaJQmtguwhdOY3EEO10W+PJizKx2nZ2kZNltc2c0ZFrAqGMEqiBc51Ob8eWQVOekk93ZQnKyZQwtHSqttoltsuCUKIMKC7BkXbnpTYUgfENl52AnwC8Epmme4tawVUBWas5jFMqLyqLUCdTSi8ro49FZ2wR836tUZ2+qkYkcwnwwikgkmnRTgzd90A6LhFsnqQlRVqiHX63L6sQTubWsDlA8RsQYtg77AB0mk4KnJgXl4LL32HBZrig/bu0uCYUKF0nDloepXukNGhaqCisKx4L8tFj5VRTbExbtoLPWmB4hjLRXRTmcErzgqRUGpIO5MVQDLNcE0U22xLAmxQ/jGC6NInUnTHRNleHsvcQuyJIsJZXM10huZnLT5qtRxWOwsp3nyE6lRYDpYnGi8sAraQpCTNVkVg5ogHWGIqFKx3d6oexxBL1/VlD25mkeDhUv5O0465unOR5IKh7svvXJtpuGNzUcql+pd32Yd7hoe3TdtbyLfiM6NQcmmaHnPrq+vIlKnVALnyxdC89eOpyUxUoWIcpQal3MZgoPVSJenOZZwSAorCv4Pvzc6c6o872+ISZk1ZFkrvOLe0cY/ROUR3Lv2zGb2lwF8vz/q+q/FO8Rgvjjeb9fhLgDbAd0H5Bq67sjRTHMeq/jk+GTGDRSg= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(36860700013)(1800799024)(376014)(7416014)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2025 11:05:11.0433 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0c86406d-b1ce-411a-e603-08dd41e72185 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044F5.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB5656 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Since switching the scheduler from using kthreads to workqueues in commit a6149f039369 ("drm/sched: Convert drm scheduler to use a work queue rather than kthread") userspace applications cannot determine the device from the PID of the threads sending the trace events anymore. Each queue had its own kthread which had a given PID for the whole time. So, at least for amdgpu, it was possible to associate a PID to the hardware queues of each GPU in the system. Then, when a drm_run_job trace event was received by userspace, the source PID allowed to associate it back to the correct GPU. With workqueues this is not possible anymore, so the event needs to contain the dev_name() to identify the device. Signed-off-by: Pierre-Eric Pelloux-Prayer --- drivers/gpu/drm/scheduler/gpu_scheduler_trace.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h index c75302ca3427..c4ec28540656 100644 --- a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h +++ b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h @@ -42,6 +42,7 @@ DECLARE_EVENT_CLASS(drm_sched_job, __field(uint64_t, id) __field(u32, job_count) __field(int, hw_job_count) + __string(dev, dev_name(sched_job->sched->dev)) ), TP_fast_assign( @@ -52,9 +53,10 @@ DECLARE_EVENT_CLASS(drm_sched_job, __entry->job_count = spsc_queue_count(&entity->job_queue); __entry->hw_job_count = atomic_read( &sched_job->sched->credit_count); + __assign_str(dev); ), - TP_printk("entity=%p, id=%llu, fence=%p, ring=%s, job count:%u, hw job count:%d", - __entry->entity, __entry->id, + TP_printk("dev=%s, entity=%p, id=%llu, fence=%p, ring=%s, job count:%u, hw job count:%d", + __get_str(dev), __entry->entity, __entry->id, __entry->fence, __get_str(name), __entry->job_count, __entry->hw_job_count) ); From patchwork Fri Jan 31 11:03:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Eric Pelloux-Prayer X-Patchwork-Id: 13955238 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 80DD1C0218F for ; Fri, 31 Jan 2025 11:05:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0194B10EA6F; Fri, 31 Jan 2025 11:05:24 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.b="E0Wc7862"; dkim-atps=neutral Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2069.outbound.protection.outlook.com [40.107.96.69]) by gabe.freedesktop.org (Postfix) with ESMTPS id E8BF210EA6F for ; Fri, 31 Jan 2025 11:05:22 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=mLFiFwacajTPcsu/XfSKla/TTaTc6S1HxAJvZ1yqy8XLI7gnpoDBpVtk6CEbnpJSE/Dn1tEvRPDJP5AD7lHytlK7t1WyucmvzhLECG78Sg5Id0dZa7LSIsvN+BxnOoSZhfN8bufrivpgWNurF/6xOsL8YGhVgHTMxj0kXlYlzXl+dg23LG56NJzUbQ06JZMVC8QV2llNGSCneMfqXymYBoyfnTQA/+pv+Xg8Q3AquKeSo8WNUmyrtrbEBp08PHOhJbMe2SxwZEhDCj2VocWDmJS6N9QozMf/Cg8Mhf3kIaoCVXbUgU5ISLZT21q4bAFRKif/GCc8nV7hmXCCbZa/og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=AbVB3K4iAlptVsFtd9e4Bea1YECynVrEXatr2kSge7s=; b=eh+/OdSMISxD5cGOU9gCiP5FLnayKL1Cnv78fbkx5TpbU8LYcy5r+zUhdl7HQwhq+uIcbr+mkj873Bm9DalU6I9unS7m6dpSyFf6NkD0TdisuImZPp3vst85zyKNeGacWTMWwRDywIMALRpGd8XnVG+uSjrNrV+GU6RiZkOw+4S69zkJ+fIPNs0KYCocyIT6o6I56XAu5JS86pxGMJ9KNTPHIPq1d63mKMAVUJrqtOBgWL+RVxxrLSyVGpVkj7j6zMDj8kOTxcT8+YDD33/FvgCMqmZFLVJ50dSqKbnLiXpvnVLU340ff648fkd2YS0TIIu3yX7tWr8smb0mthR8vg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gmail.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AbVB3K4iAlptVsFtd9e4Bea1YECynVrEXatr2kSge7s=; b=E0Wc7862NKWT9zYx7i6xZ1CsNIwG0i1hy0lSffn2Aa39OyHLg9s8s3SKFxbleD8jcoaFn/LYX99wO/CXv/IItQeAJQr1WAQ8V4x3oIRUanKjeUaX4YnUUCQR3ZZKwHpDMko51ngFwSEY3KgNpPTyvae5h9+pR5cAqlrW+Qxxdwg= Received: from MW3PR06CA0004.namprd06.prod.outlook.com (2603:10b6:303:2a::9) by DS0PR12MB8197.namprd12.prod.outlook.com (2603:10b6:8:f1::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.22; Fri, 31 Jan 2025 11:05:19 +0000 Received: from CO1PEPF000044EE.namprd05.prod.outlook.com (2603:10b6:303:2a:cafe::3c) by MW3PR06CA0004.outlook.office365.com (2603:10b6:303:2a::9) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8398.20 via Frontend Transport; Fri, 31 Jan 2025 11:05:19 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1PEPF000044EE.mail.protection.outlook.com (10.167.241.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8398.14 via Frontend Transport; Fri, 31 Jan 2025 11:05:19 +0000 Received: from patedamande.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Fri, 31 Jan 2025 05:05:13 -0600 From: Pierre-Eric Pelloux-Prayer To: Luben Tuikov , Matthew Brost , Danilo Krummrich , "Philipp Stanner" , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Sumit Semwal , =?utf-8?q?Christian_K=C3=B6nig?= CC: Pierre-Eric Pelloux-Prayer , , , , Subject: [PATCH v7 4/7] drm/sched: cleanup gpu_scheduler trace events Date: Fri, 31 Jan 2025 12:03:02 +0100 Message-ID: <20250131110328.706695-5-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250131110328.706695-1-pierre-eric.pelloux-prayer@amd.com> References: <20250131110328.706695-1-pierre-eric.pelloux-prayer@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044EE:EE_|DS0PR12MB8197:EE_ X-MS-Office365-Filtering-Correlation-Id: aecc2e34-f71e-44ab-1b46-08dd41e72646 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|7416014|376014|36860700013|82310400026|921020; X-Microsoft-Antispam-Message-Info: 79KnJqRGl/5ozeWagdjPzNsZISFXi2iPf9De0ikRwwlP4WS5yMHVW+8HPdYD97lzDU7/LzNhknAsjHQlgBWxRJF1iiOA+NgTNGh6W8BglHhnnNjCZSGSEIfozfmPMuyngKM5wzWIDGwEzs2v4WiNoTqgcuLstgRq5bjl+vJiv/271Xzp6HnrCIEgKbkU4Lc+dlY5OVcIeXMoO4KrmqK3vnVcnwTEAHyuHDYUAliaynK94nrztOLtxvzVtTr+Vwhf6KwLbir/tBAIXts80o6cMtBWjI+3MojmUwSapLgdtLTN2RNV2C8MrJUEGKbvFLSEonABd/vK2w+mEAVTW3bBKrOFcr82ghfSH/+MUH7wi+yDxwa4pbl4GJ4c3PqFdTPKXKdKrGqw4l3VAcFKuM7iRmOqebC4z4E5cYwibOtGMPGVWuCW9kzbe+VCUZSUXh5WEGe5V3Lt9bij7w1InFP/SEii/CYwYi/jcFyXreUBuAIiO4xsvjVOPjHbMk7SMbSOVl1rHvJ5YT6jp9W9T8HttSAl0K9klr/Y8758Fw1EE5gfG6B+koBYIN8rnXAHQar3rCcDoOp/4NZSbbVkynn+5RU8BkwIvsHJxl99Gtz1k69xZIpKg/i3Em9X8H40oZZ5gE0A4iiKrcSNdsfVKAIE1jHJff00CYP8oNor+qwfv1dq195OTdu46FnhDHartRMBQ+2iIsvTh2a9FzJMtLlM5ojEwaiak073IBPxcE4YEx8JNhZV1AzIQuXPug2fB6x24MGw6ODxfglF6CaPUmUzgxUShpE4J6LywmBFKQfSsI/S95TfqC2fUrETIpc/zxquIkb2INniIBMVerfsn23XzvWeC3UNUrh0eZQQ7vElouF50hHv+Es4nGQ55KrbLOvLAWA71sVlnqGhPrInEW1Ve8r0azzy2KpEfHFwRR+p8/5LAALEKGxQ0dxD5HRRs+R5ShBT+cMNb/kKLYR6vx0ehG5coL0A5WgDOCs+NKZKY1EpS/Dfy+1Nk/cUTpcbjPtPSTdB6z300bwe7b+r3pn8+pAnWUdyvOEb+3YLJoNOBwfiFHzkiZ897F6jOxDjGEWZV0PN/lIW+OLTILZ4VwTCvIlHUJQjAbnuaaEvCWp4RiOGEp2IshtXZpd0c2mIDquAWfI9mc3sOaw5WnwrNhPqP7MVJkOv7uNuJ+OxCDbWfJdyWv8s3OCbJflYNapStkENns3R0OovT3inOD5UYab8FgrAXF2mIKy6Yqx93dHRvGt/ebQNM0De1LMFOJusdN9U2LWGYg1fe3a38+Nhon3vQ4B60/H3caTGhZsNR7M7OEVXRvuzKcC2HeZI+KQAvYDc2ns7zriPASLzGpAE7EI1QlNs77EKi+yS2YIlnh63ErKZqryBe655NJUqhgchgTFFcexTR+A9YaAogpckz+wPtkmyx3F3ADKh/A1MXKSsU5hLni25vNRGj8FUi4W2eymMm40PlS0zR6xz6BcKrpWhPSahmDzol0fetF8n5catpnsWwQeCgcKoSmWisQ1oaJ83 X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(1800799024)(7416014)(376014)(36860700013)(82310400026)(921020); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2025 11:05:19.0295 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aecc2e34-f71e-44ab-1b46-08dd41e72646 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044EE.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8197 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" A fence uniquely identify a job, so this commits updates the places where a kernel pointer was used as an identifier by: "fence=%llu:%llu" Signed-off-by: Pierre-Eric Pelloux-Prayer --- .../gpu/drm/scheduler/gpu_scheduler_trace.h | 41 +++++++++++-------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h index c4ec28540656..3cdd8d8f8021 100644 --- a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h +++ b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h @@ -36,28 +36,29 @@ DECLARE_EVENT_CLASS(drm_sched_job, TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *entity), TP_ARGS(sched_job, entity), TP_STRUCT__entry( - __field(struct drm_sched_entity *, entity) - __field(struct dma_fence *, fence) - __string(name, sched_job->sched->name) __field(uint64_t, id) + __string(name, sched_job->sched->name) __field(u32, job_count) __field(int, hw_job_count) __string(dev, dev_name(sched_job->sched->dev)) + __field(uint64_t, fence_context) + __field(uint64_t, fence_seqno) ), TP_fast_assign( - __entry->entity = entity; __entry->id = sched_job->id; - __entry->fence = &sched_job->s_fence->finished; __assign_str(name); __entry->job_count = spsc_queue_count(&entity->job_queue); __entry->hw_job_count = atomic_read( &sched_job->sched->credit_count); __assign_str(dev); + __entry->fence_context = sched_job->s_fence->finished.context; + __entry->fence_seqno = sched_job->s_fence->finished.seqno; + ), - TP_printk("dev=%s, entity=%p, id=%llu, fence=%p, ring=%s, job count:%u, hw job count:%d", - __get_str(dev), __entry->entity, __entry->id, - __entry->fence, __get_str(name), + TP_printk("dev=%s, id=%llu, fence=%llu:%llu, ring=%s, job count:%u, hw job count:%d", + __get_str(dev), __entry->id, + __entry->fence_context, __entry->fence_seqno, __get_str(name), __entry->job_count, __entry->hw_job_count) ); @@ -75,37 +76,41 @@ TRACE_EVENT(drm_sched_process_job, TP_PROTO(struct drm_sched_fence *fence), TP_ARGS(fence), TP_STRUCT__entry( - __field(struct dma_fence *, fence) + __field(uint64_t, fence_context) + __field(uint64_t, fence_seqno) ), TP_fast_assign( - __entry->fence = &fence->finished; + __entry->fence_context = fence->finished.context; + __entry->fence_seqno = fence->finished.seqno; ), - TP_printk("fence=%p signaled", __entry->fence) + TP_printk("fence=%llu:%llu signaled", + __entry->fence_context, __entry->fence_seqno) ); TRACE_EVENT(drm_sched_job_wait_dep, TP_PROTO(struct drm_sched_job *sched_job, struct dma_fence *fence), TP_ARGS(sched_job, fence), TP_STRUCT__entry( - __string(name, sched_job->sched->name) + __field(uint64_t, fence_context) + __field(uint64_t, fence_seqno) __field(uint64_t, id) __field(struct dma_fence *, fence) __field(uint64_t, ctx) - __field(unsigned, seqno) + __field(uint64_t, seqno) ), TP_fast_assign( - __assign_str(name); + __entry->fence_context = sched_job->s_fence->finished.context; + __entry->fence_seqno = sched_job->s_fence->finished.seqno; __entry->id = sched_job->id; __entry->fence = fence; __entry->ctx = fence->context; __entry->seqno = fence->seqno; ), - TP_printk("job ring=%s, id=%llu, depends fence=%p, context=%llu, seq=%u", - __get_str(name), __entry->id, - __entry->fence, __entry->ctx, - __entry->seqno) + TP_printk("fence=%llu:%llu, id=%llu, dependencies:{fence=%llu:%llu}", + __entry->fence_context, __entry->fence_seqno, __entry->id, + __entry->ctx, __entry->seqno) ); #endif From patchwork Fri Jan 31 11:03:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Eric Pelloux-Prayer X-Patchwork-Id: 13955239 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 E1DD4C0218D for ; Fri, 31 Jan 2025 11:05:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 67A0810EA70; Fri, 31 Jan 2025 11:05:38 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.b="ezyrOhzc"; dkim-atps=neutral Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2058.outbound.protection.outlook.com [40.107.94.58]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7889210EA70 for ; Fri, 31 Jan 2025 11:05:37 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=VmYKj2vCOrW8ZTA82x7CGnOB4CfTkcHxjOwYWLg+DYmQhQzMblTWeUkN3BRV7pSJGNo7AI8FXneyBcs0CAg4kO6LQPDmr8TfpTWtgIy565jqYMkAsiNXzMHqQpM9IqMtHb+6YtEN06bqxyhbnamm7JVDyi38L86nmHg1GfUSZMK9ff/RxOEKr97X3o/lqkxDhKOIryVgTHzsrPxp1w6julSgKBKybZsBRN4CmUM/fEA1azxG0ZodRIy0pQ/Ecmtz3uBdJLLdgt99bHGPCy+A8zzitbuyKr++KaYIubsB8sKYDzfG+HX2rDOBjEvoUadkIwX70oHjbaJbsKyj92sRvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=FfHTVg1Pd86qI8wpawUUc6GXEls7oEWRT6zYYqnQnm0=; b=HlP9vfKhReDMLV495GlhLpD4Inu5ZMelC/xeRCU8e+OkLa5/rilRvKOsBAR6pYq8FZL/gRBTM2aKGYVPU59kEMkzVg30u+xonbn38/li4dlRYHWHxs0CWoAQk4beWa+0L6z+HKLNUopy0LjsKJ2w7nWbXRLqT98oEANzRItsJM4ELx/T52poapRgpFUlbIudrh5OHlLEGxfynGWBz8ij7aY3K03wmx9Q3u7LNjO/IZdOGHGJOGCPMF06R7Rr/jtBdKYauYGofbngxB0YYPSKd/n93qIGEQzrOLWZLE8oH00Vm+gRm6fs9M6Rqxet6VXwCgbCSj8FK45VgdXwn9eZFA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gmail.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FfHTVg1Pd86qI8wpawUUc6GXEls7oEWRT6zYYqnQnm0=; b=ezyrOhzcR22urCzXYC42TbILZ58qN8Ogogu/OfgCe7v0yXTuogv2Hl/YrFz882njQCvt9+GSVHaORWSas/O5pI9HnI3uq8//5SKXMaXhntTHFP4K4CVJc/wxNcdZHmXne9eIs2DpCFKijXlF/4tLfuZAw3YTFg2tAPk3o74CZKk= Received: from BYAPR21CA0011.namprd21.prod.outlook.com (2603:10b6:a03:114::21) by IA0PR12MB7750.namprd12.prod.outlook.com (2603:10b6:208:431::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.20; Fri, 31 Jan 2025 11:05:35 +0000 Received: from CO1PEPF000044EE.namprd05.prod.outlook.com (2603:10b6:a03:114:cafe::85) by BYAPR21CA0011.outlook.office365.com (2603:10b6:a03:114::21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8398.20 via Frontend Transport; Fri, 31 Jan 2025 11:05:34 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1PEPF000044EE.mail.protection.outlook.com (10.167.241.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8398.14 via Frontend Transport; Fri, 31 Jan 2025 11:05:34 +0000 Received: from patedamande.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Fri, 31 Jan 2025 05:05:29 -0600 From: Pierre-Eric Pelloux-Prayer To: Luben Tuikov , Matthew Brost , Danilo Krummrich , "Philipp Stanner" , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Sumit Semwal , =?utf-8?q?Christian_K=C3=B6nig?= CC: Pierre-Eric Pelloux-Prayer , , , , Subject: [PATCH v7 5/7] drm/sched: trace dependencies for gpu jobs Date: Fri, 31 Jan 2025 12:03:03 +0100 Message-ID: <20250131110328.706695-6-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250131110328.706695-1-pierre-eric.pelloux-prayer@amd.com> References: <20250131110328.706695-1-pierre-eric.pelloux-prayer@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044EE:EE_|IA0PR12MB7750:EE_ X-MS-Office365-Filtering-Correlation-Id: e6547815-70e3-4103-0a9b-08dd41e72f4a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|36860700013|82310400026|7416014|1800799024|921020; X-Microsoft-Antispam-Message-Info: PlmQpimWNy6wDrExd1ovpvVV2qWFAld2Jra+/lg9gK8jtTj3MLw6xna6FUB3Re1j6U5JR3IlcUSB9Fl9YVySm+o82qw6Fva1sIMtewZ8NS0RhtYsnE5KQIXm4qtvx5psGw9ib/tlIUy1UyRNe8IgfX4OVOKrOMoAZn9ZqNQNovwZAwQGXCgCu9X3M0zKDRDJBczw4AZJcDVhrD68kF49XYxxDFS+SjFgLkzbA+vg6wPlf85UPmh6jwwRtIARSyXWZhhjqjnMV0n+LBoctcblhJEhErO2B0zFf/vSr5Dq3irVXbZQR9AafgWEmHwOc6Z0wuVaQCoga1917iNQdsIzYPRE4q5+HXm5arq1q54HEqN5+1lxTF4oMY3JGvsMGnq/SxD2nh1gL54i+zRGyTcppDbcuyMXFCknI+fFuGLPswMRjeiRQ75u8N8rist5XOrPi+/y0xCu8VRzUvNkt7MLY4ZmdieD0Wb+3ICjv7svqrb/6liDbiOu2kTiHMDJBNJsquQaqwHH49TAQpBWVRiECt0QqKly4Vwtdi68T6KiYGketapKSHeDwFsRK/xW48CifsEvlxiv223Ll6nLhoCMM5wUxydVh7hx8UUIAmMyFZ+VMrq6gJPS7rpw4TI0u7SKRe4tcX1xar7Pl0Neejuu4dT4tknTSq3mxuHLtDQY7ogOXol4w72hf0fnN1t9q4fQ718sATWrD76I+jyRdiox1ZtHafQUU8q+OVo4pFT1CKAB04HVZGVnEht0CYe6dUWaB8nz88UNlwVms2kcJ+IsspRSyTdVVE2dJoAQchv+n5UOzvWOcJtjEfVT8g3O9ZJKHfcFPvF9LSDILIZZf3GlDnbzr/r0glYvcKJqpFa91bP18dow1qk6RNUcs6tWxi8LEXVDvxyk2CJFgzEFLK7VvjSndA/wGmeBSx/6kDin9DhIw+HCxUz8Aa48WsHMEUYAn6zjnqnq4sOHqtkcDCeKJR3HvFN20UcKIaAIOZzcMxjS1pBdwDOtJGrYR+dtI0HQeD74FBctPVxE+QKOnMcl1yS3EOozRMeWiNK3qZMsWEYLJjE/XLgB3yvuy/uCr3xQIlH4K25yPgv7cKiYHOuaX2I5IVn4wAN6h1nAFcjWMHk6KSDkEtRlmffh0+Wh7mPC9RyHqxLCcTUeaD5hzN7qvSQZ5V97xpbJzE3OGpjPJfv9+8XQ7fnFqULwSw7FahU8+n7YAWBHoTHNUlttaAe5fQQdUfuJIEcv3FqaqTtxKuusGUflIFc5s4/+9JWCH2dO9m7xHhxTrOoAp4JprcKn00W2QxqFzt+WISsU4llTCD4dJB3lLDv1Y/pGtccjEI8/4oDVK/MJY8w7im0jfuOdlIJctiBCtiFl0Jfzmo5YLkzoCR+QrzChPnID6az6F47gMj9qzy6WSnhWOsZlFLZLd5rDPeS90yq9trsqGhhB5oaJYDksNo6tNIv7vsNW/jT62ikotPmJS10AT3/b3jcvwP0HNsWZF0W16AIbEzk80I10/dFbmDUjOA2qE01t1JXm X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(376014)(36860700013)(82310400026)(7416014)(1800799024)(921020); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2025 11:05:34.1392 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e6547815-70e3-4103-0a9b-08dd41e72f4a X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044EE.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB7750 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Trace the fence dependencies similarly to how we print fences: ... , dependencies:{fence=606:38006} This allows tools to analyze the dependencies between the jobs (previously it was only possible for fences traced by drm_sched_job_wait_dep). Since drm_sched_job and drm_run_job use the same base event class, the caller of trace_drm_run_job have to pass a dep_count of 0 (which is ignored because dependencies are only considered at submit time). Signed-off-by: Pierre-Eric Pelloux-Prayer --- .../gpu/drm/scheduler/gpu_scheduler_trace.h | 59 ++++++++++++++++--- drivers/gpu/drm/scheduler/sched_entity.c | 8 ++- drivers/gpu/drm/scheduler/sched_main.c | 2 +- 3 files changed, 58 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h index 3cdd8d8f8021..ca19cd9a146a 100644 --- a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h +++ b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h @@ -26,15 +26,41 @@ #include #include +#include #include #undef TRACE_SYSTEM #define TRACE_SYSTEM gpu_scheduler #define TRACE_INCLUDE_FILE gpu_scheduler_trace +#ifndef __TRACE_EVENT_GPU_SCHEDULER_PRINT_FN +#define __TRACE_EVENT_GPU_SCHEDULER_PRINT_FN +/* Similar to trace_print_array_seq but for fences. */ +static inline const char *__print_dma_fence_array(struct trace_seq *p, const void *buf, int count) +{ + const char *ret = trace_seq_buffer_ptr(p); + u64 *fences = (u64 *) buf; + const char *prefix = ""; + + trace_seq_putc(p, '{'); + for (int i = 0; i < count; i++) { + u64 context = fences[2 * i], seqno = fences[2 * i + 1]; + + trace_seq_printf(p, "%sfence=%llu:%llu", + prefix, context, seqno); + prefix = ","; + } + trace_seq_putc(p, '}'); + trace_seq_putc(p, 0); + + return ret; +} +#endif + DECLARE_EVENT_CLASS(drm_sched_job, - TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *entity), - TP_ARGS(sched_job, entity), + TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *entity, + unsigned int dep_count), + TP_ARGS(sched_job, entity, dep_count), TP_STRUCT__entry( __field(uint64_t, id) __string(name, sched_job->sched->name) @@ -43,9 +69,14 @@ DECLARE_EVENT_CLASS(drm_sched_job, __string(dev, dev_name(sched_job->sched->dev)) __field(uint64_t, fence_context) __field(uint64_t, fence_seqno) + __field(int, n_deps) + __dynamic_array(u64, deps, dep_count * 2) ), TP_fast_assign( + unsigned long idx; + struct dma_fence *fence; + u64 *dyn_arr; __entry->id = sched_job->id; __assign_str(name); __entry->job_count = spsc_queue_count(&entity->job_queue); @@ -54,22 +85,32 @@ DECLARE_EVENT_CLASS(drm_sched_job, __assign_str(dev); __entry->fence_context = sched_job->s_fence->finished.context; __entry->fence_seqno = sched_job->s_fence->finished.seqno; - + __entry->n_deps = dep_count; + if (dep_count) { + dyn_arr = __get_dynamic_array(deps); + xa_for_each(&sched_job->dependencies, idx, fence) { + dyn_arr[2 * idx] = fence->context; + dyn_arr[2 * idx + 1] = fence->seqno; + } + } ), - TP_printk("dev=%s, id=%llu, fence=%llu:%llu, ring=%s, job count:%u, hw job count:%d", + TP_printk("dev=%s, id=%llu, fence=%llu:%llu, ring=%s, job count:%u, hw job count:%d, dependencies:%s", __get_str(dev), __entry->id, __entry->fence_context, __entry->fence_seqno, __get_str(name), - __entry->job_count, __entry->hw_job_count) + __entry->job_count, __entry->hw_job_count, + __print_dma_fence_array(p, __get_dynamic_array(deps), __entry->n_deps)) ); DEFINE_EVENT(drm_sched_job, drm_sched_job, - TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *entity), - TP_ARGS(sched_job, entity) + TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *entity, + unsigned int dep_count), + TP_ARGS(sched_job, entity, dep_count) ); DEFINE_EVENT(drm_sched_job, drm_run_job, - TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *entity), - TP_ARGS(sched_job, entity) + TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *entity, + unsigned int dep_count), + TP_ARGS(sched_job, entity, 0) ); TRACE_EVENT(drm_sched_process_job, diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c index 69bcf0e99d57..0ce3a82fe6fd 100644 --- a/drivers/gpu/drm/scheduler/sched_entity.c +++ b/drivers/gpu/drm/scheduler/sched_entity.c @@ -592,7 +592,13 @@ void drm_sched_entity_push_job(struct drm_sched_job *sched_job) bool first; ktime_t submit_ts; - trace_drm_sched_job(sched_job, entity); + if (trace_drm_sched_job_enabled()) { + unsigned long index, n = 0; + void *f; + + xa_for_each(&sched_job->dependencies, index, f) { n++; } + trace_drm_sched_job(sched_job, entity, n); + } atomic_inc(entity->rq->sched->score); WRITE_ONCE(entity->last_user, current->group_leader); diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c index ad306d3d7282..c645f07ebe26 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -1214,7 +1214,7 @@ static void drm_sched_run_job_work(struct work_struct *w) atomic_add(sched_job->credits, &sched->credit_count); drm_sched_job_begin(sched_job); - trace_drm_run_job(sched_job, entity); + trace_drm_run_job(sched_job, entity, 0); fence = sched->ops->run_job(sched_job); complete_all(&entity->entity_idle); drm_sched_fence_scheduled(s_fence, fence); From patchwork Fri Jan 31 11:03:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Eric Pelloux-Prayer X-Patchwork-Id: 13955240 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 E8101C0218F for ; Fri, 31 Jan 2025 11:05:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6B27410EA72; Fri, 31 Jan 2025 11:05:58 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.b="oOkmWGaQ"; dkim-atps=neutral Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2057.outbound.protection.outlook.com [40.107.100.57]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3B2B110EA72 for ; Fri, 31 Jan 2025 11:05:57 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=fq1eSAv9nhDbLzSP2jZKEvw15Ka/CNXN0E/HtAi18W9C791Fi+ydSbDGJny2wT+PKFfsNkP6KxjKcnQByRSorR5sVjZ2qhhFwEIzO504+s/L1uJ6qTDU+8EhZfSmlaev3LjR20Upk+T5IjrsfODeeKQA5zi1YzR9k9/PsZI8w7ecWfJoi+bITSv3dBU9CKPz7L6V5KwDAGV1v3rO+iwyU5iO5e3YJ1472cComBMtijy2ctUifNmo1kccLJla953OhX5cArU0ZfBKMbXo3vxbc+ztluzMjOjBwVFgIzzYDLJdItz/ifeVwvA9Cuyi7cCewArD4GrwvCKGujVwMuaPhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tNi6owNmaR845DAkF3+Xpgj66GaAOfDzDBpPLrOR6hk=; b=LOcJdmHkt1Pb0R8cb4jl1FuVcwlB0fYjDGVP7+A1tOGREMoi28w974df6sYHCihRDW5RLAX5NZ0x9Ls2gr74RPcyyiocfXPqpw5emiu6tiDoTvDAOMtyIuXH9pHsdK6i/UDGuHRFJl7DVG0tlOekqPi1Ot2naVXEv5M1QiSv67pwagogw7rYsgGtiT0YyWqrFAS2TQX5O0QCevhn7Ejz0ytoO8ADSevLHCs4K997tzCPDBxt4i3uIlq0dKdaxAeoCbnmgYV9JTgRAHOiNExEI7rHM4I1Ayov3N+1m1XLuxhZufLSoYJ1AnkFAq5W0qeazV6ie4dp8aEC563ZllsXtg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gmail.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tNi6owNmaR845DAkF3+Xpgj66GaAOfDzDBpPLrOR6hk=; b=oOkmWGaQ7ucpYpigOp+REkOwE7AuuJ1nFrytep4T1VNfpejI2XZzlg7G8nSaaUC/VXxc9jfqA5NFsiHNaaNMmMYeHUSyEuHGzVOKl6Oyo2hzwUP2cOFZhMPmIp//EuThO5LZ6kLN0Hdsz6swevPP7USfi7hRDUH7+HYxbZpRpW8= Received: from SJ0PR13CA0077.namprd13.prod.outlook.com (2603:10b6:a03:2c4::22) by SN7PR12MB7179.namprd12.prod.outlook.com (2603:10b6:806:2a7::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.20; Fri, 31 Jan 2025 11:05:52 +0000 Received: from CO1PEPF000044EF.namprd05.prod.outlook.com (2603:10b6:a03:2c4:cafe::e6) by SJ0PR13CA0077.outlook.office365.com (2603:10b6:a03:2c4::22) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8398.18 via Frontend Transport; Fri, 31 Jan 2025 11:05:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1PEPF000044EF.mail.protection.outlook.com (10.167.241.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8398.14 via Frontend Transport; Fri, 31 Jan 2025 11:05:51 +0000 Received: from patedamande.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Fri, 31 Jan 2025 05:05:47 -0600 From: Pierre-Eric Pelloux-Prayer To: Luben Tuikov , Matthew Brost , Danilo Krummrich , "Philipp Stanner" , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter CC: Pierre-Eric Pelloux-Prayer , , Subject: [PATCH v7 6/7] drm/sched: add the drm_client_id to the drm_sched_run/exec_job events Date: Fri, 31 Jan 2025 12:03:04 +0100 Message-ID: <20250131110328.706695-7-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250131110328.706695-1-pierre-eric.pelloux-prayer@amd.com> References: <20250131110328.706695-1-pierre-eric.pelloux-prayer@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044EF:EE_|SN7PR12MB7179:EE_ X-MS-Office365-Filtering-Correlation-Id: 218049ff-2af3-4bc7-ecd2-08dd41e739d3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|7416014|82310400026|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: Z9L6pZ3nygCg8Ykn99a1QnrFdzCvM0XYZvtcCIObgfcgIZ4Q5j1T4ApPRexqVbmMRv7D2pjIpi89c1fHChkER4NyJShquLEUJEAl5KWaqky3U/RyYy55CLELVbVt7W9sL6tRDpESQINt+fnKV7J1oVlofX6PsCZe+13ENQnbxRlyZyafNUZb2MmD5hQUW9JVWsHjvx1JLPU9XIvNvvkhIiBl5MBNeUJEMUPW+KxJHzQE4t6Rdbl2iWpA4rZePJ02UGSSQ8N4pAOyHwN14thzI8jbaigkE7QAJ+xRYIUTn5gaz1MtrHJm1lMowWX78UwYLPHYd4MbMVfTX3cM8trRYNIlqtelSw4HDCCbRRJGZ+xuK7tgYfgKXmFDUE3iU+FO9A/j9PKiETKSVYeKdtZBwWQmSf9sFB/LGYNjEfd5F+AAzTxypcQWU34Qnq9LltID9eWqM7or5WSwDzMbQlirINCMw7egafs/kmyvxZ/aGNCNRJ7DMY1Q5W/pMmJ5ymnobua47N8kOW7FrHtkTJ59oBFxbdMCklMw+MFR/8ntCufImyiG0gVU0YSZ3v/aQGEftpkRHAuwe+l5HLJyYNyrvBu5eZmgIJK+pfG8+OWWU+kEySxMzLGldh/mc23C1qe0XWBxu54MxE+VYs0edelsz1nSk5OK3IV2WPfOFqFyhR/EM5zdknpSQIV/BoT6GtRSKgSn+hvZzNvIH5AlPE47cpSOTJx6zpb79RxrzqP16wj6uuzOQU8mxvGcShv8nv0/4uO0dHSobcEsKsAaoAewd1S4rUkeM/wBN0/LxDQzmrHbGLaPNmSHk9bYP6o3UMgMSf8yjpCVknQd24gCJgS7Gg4aZ8C5iWQko5JVnc00SBM0NES0Rxs66Ns0l7dn/B5QuRZAzoQmy3R5p9Re1AALR8jTVhW2OjdvtiUM2BBcG3UNPSkebP8YGeisQYI465c8waUtg3gh4JLIjid8hvm9FY4Br813P9frrYs6Ea2UIge6kDBo16pWOrKb2kVNqaff16X3Haq6bgRipjnVbw8ErqURcJe1DqpQufhRab5dlcoItlG0iXh2buRAwfCysVwoApAbDskQkhyFpWMaKtSM2x+l3+DxSrKzZ4thLYmN3iUxygVNZKZR5bpVVmkjQKWsswKqYaxmEr5u3iT0NhC1SVBJ+kNSbfU1SmDYiYJQQyHlOWxUN6+flwksz3opb90YExnYcmufUkCfh4bUHhTl+KXAzPZ7t9CRJcjs7k+yfGjDX9RLEMkxMZ0qTSL4X03jNBhiVvBaPWTGSEtb0Bl8Q0p5w9Fkf3iU6+lyg5nUsLOcdbGkz3lRgDAzXizdqgCbj1Y+8+o6FVhY1U19JI9dV/W41tOiFRLiyIkORpJkOg5Xx31nYCfaIeYvxZ0i7ltXOFNpah2DARwdQ5t5jekqs+rrt0jsetVLCfklJv7+9Lvpa5MWYUBnIc6ovyoJBGieouYok5K8/AJZFP9aD5nB5CeAugvMECQ5xNu3kDEPDZE= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(376014)(7416014)(82310400026)(36860700013)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2025 11:05:51.8356 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 218049ff-2af3-4bc7-ecd2-08dd41e739d3 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044EF.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7179 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" For processes with multiple drm_file instances, the drm_client_id is the only way to map jobs back to their unique owner. It's even more useful if drm client_name is set, because now a tool can map jobs to the client name instead of only having access to the process name. Signed-off-by: Pierre-Eric Pelloux-Prayer --- drivers/gpu/drm/scheduler/gpu_scheduler_trace.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h index ca19cd9a146a..5c740cb80037 100644 --- a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h +++ b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h @@ -71,6 +71,7 @@ DECLARE_EVENT_CLASS(drm_sched_job, __field(uint64_t, fence_seqno) __field(int, n_deps) __dynamic_array(u64, deps, dep_count * 2) + __field(u64, client_id) ), TP_fast_assign( @@ -93,12 +94,14 @@ DECLARE_EVENT_CLASS(drm_sched_job, dyn_arr[2 * idx + 1] = fence->seqno; } } + __entry->client_id = sched_job->s_fence->drm_client_id; ), - TP_printk("dev=%s, id=%llu, fence=%llu:%llu, ring=%s, job count:%u, hw job count:%d, dependencies:%s", + TP_printk("dev=%s, id=%llu, fence=%llu:%llu, ring=%s, job count:%u, hw job count:%d, dependencies:%s, client_id:%lld", __get_str(dev), __entry->id, __entry->fence_context, __entry->fence_seqno, __get_str(name), __entry->job_count, __entry->hw_job_count, - __print_dma_fence_array(p, __get_dynamic_array(deps), __entry->n_deps)) + __print_dma_fence_array(p, __get_dynamic_array(deps), __entry->n_deps), + __entry->client_id) ); DEFINE_EVENT(drm_sched_job, drm_sched_job, From patchwork Fri Jan 31 11:03:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre-Eric Pelloux-Prayer X-Patchwork-Id: 13955241 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 58AF7C0218D for ; Fri, 31 Jan 2025 11:06:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D537D10EA78; Fri, 31 Jan 2025 11:06:03 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.b="HZf9+cg6"; dkim-atps=neutral Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2076.outbound.protection.outlook.com [40.107.92.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6326010EA78 for ; Fri, 31 Jan 2025 11:06:03 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uDPzhwQky0U62Rl+1Z/wv4LROxQUeBkqutiPKxLy26ZLBI6wMYYssg3xUWTT7NzB1js9OCJUAE6EocNjomskCPWEbPPbq3in+beKvcpFWAnJkbYOAgBOgDxk26RyeSovEl1Oqac4fFfOl9MtDqgWHulGICDHF0b21Rh+40gW1tLhQt71nEn3L/G3j7cSxXUtYcp/fI6pSvBAoqgck118yS2yzAy4YOlPUDVBhMBAisyYXucIFGjiDSEgSYsr+1Sc+cA47Hx1VHQ96v6qBQyzu4rjhx2vVF3l58AQ1Mr9Gs0xPI5a2LrOqtyxtqjuQ8OQoRZTHmeuENjTI8qIYerh8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=n6MDbT8v+gxmhoDMeriaMSYFjzzdTqJvYlcSWdv+Uy8=; b=smeGTNTZHWlr7u7y2hAUDbpojHTdL4RKq7wss20TsifrGHrbZMvoRvjMJw05e79y1IhPd6D8cNbUSZmsE7YBZceeYZEa1/itFERYBrDxWfv/2QZKU4bdewGhRKly0bWwtNfj1LkhFUgNfXMNgFVifZ4spGXJLSX54ICy2O9VT+cdfhiohRYZEoKs2GAE7tNEVHmgAfheN0IIHIj+7f06TxIZCOWAcnYVflrLQLhAbt46XYsUTyB2CLtrVLn8QHSzoIm6vtU/aEQqybqnsj7+GI7S58ehhnm2yFkWCiWWngNVI3UvhZ3GSwIo+sEqeap92oaTBTZ7uhwuBJXkz3/ajA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gmail.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=n6MDbT8v+gxmhoDMeriaMSYFjzzdTqJvYlcSWdv+Uy8=; b=HZf9+cg64wGLpQXzYUNmREaZDjRDUjYrAK7g6pKf5P1GRZgwmAr3Kh5kMigN9LYuSg/tEM9qHQ09kS9cC3fqKDqLvQt2wQ7IXBwSGFKvXx0jc5fjbgkz+tkq5CREyzh8qkTHh3Kog8vW7fomYOIpv9i+rf6+S0H+ubCtVqzzxgY= Received: from MW3PR05CA0013.namprd05.prod.outlook.com (2603:10b6:303:2b::18) by PH7PR12MB9127.namprd12.prod.outlook.com (2603:10b6:510:2f6::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.21; Fri, 31 Jan 2025 11:06:00 +0000 Received: from CO1PEPF000044F1.namprd05.prod.outlook.com (2603:10b6:303:2b:cafe::83) by MW3PR05CA0013.outlook.office365.com (2603:10b6:303:2b::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8398.18 via Frontend Transport; Fri, 31 Jan 2025 11:06:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1PEPF000044F1.mail.protection.outlook.com (10.167.241.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8398.14 via Frontend Transport; Fri, 31 Jan 2025 11:05:59 +0000 Received: from patedamande.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Fri, 31 Jan 2025 05:05:54 -0600 From: Pierre-Eric Pelloux-Prayer To: David Airlie , Simona Vetter , "Maarten Lankhorst" , Maxime Ripard , Thomas Zimmermann , "Jonathan Corbet" , Luben Tuikov , Matthew Brost , Danilo Krummrich , "Philipp Stanner" , Sumit Semwal , =?utf-8?q?Christian_K=C3=B6nig?= CC: Pierre-Eric Pelloux-Prayer , "Lucas Stach" , =?utf-8?q?Ma=C3=ADra_Canal?= , , , , , Subject: [PATCH v7 7/7] drm/doc: document some tracepoints as uAPI Date: Fri, 31 Jan 2025 12:03:05 +0100 Message-ID: <20250131110328.706695-8-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250131110328.706695-1-pierre-eric.pelloux-prayer@amd.com> References: <20250131110328.706695-1-pierre-eric.pelloux-prayer@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044F1:EE_|PH7PR12MB9127:EE_ X-MS-Office365-Filtering-Correlation-Id: 112b4828-5dfa-4ec4-7537-08dd41e73e85 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|7416014|376014|82310400026|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?RLxKdSgi0PNyGfSg6g1C/qqfkP9pD8K?= =?utf-8?q?jaIDnI80MiTmHm4cbYBXtIKyvlZJCdLise5068d7pSG5UY4DhYbG1I7VEF5HxF7ou?= =?utf-8?q?Bc2a0Cyvrc7X5NmiilIMePB+77MQfxd65/XdXfwTEAcIG09UScIuTLNNuzWl2SRIe?= =?utf-8?q?hzm1J5zuEBgQlDUIkrDcB64Lh8l5bKOVeZM0kTk43XcgM1yZNI5vdNiUdgzEVz77X?= =?utf-8?q?miZKUj4tN/ZZB651FHTcRGBVNWgH8xnDH+81yAohZVzm+HJLevqThvccAoQ9Ak2Tv?= =?utf-8?q?kvWzPeBgR/xkRJZ3joPUtW1VPKsnsOOkbLuciwpFjMJuP26xVVoQ9GAfWAxMMUi85?= =?utf-8?q?MY/QdQg+cO8hKhl6/sKxfNlef6BcuAb7XJXv4K/fNcqzUyFWctT2mQtRpbST6grEG?= =?utf-8?q?amHUJNF0k0B2jA2nA3Ax3wYvNjoBJxLqxYfIOuNoDPLDSUDVriho6Hr59tUGZ+5xX?= =?utf-8?q?ZYUiy5hz98BrIQv/jsX9EE0sSdHTG0OUt9gDTRfjru3Xt91JTMRCuZ8Q0GM3vNgZG?= =?utf-8?q?OhD9IdHfNVFCt0O672afFcj0cA6RuRq/jEz9xyRLfEkjecyLEfYXltFQ12Zey/R2g?= =?utf-8?q?MpOeZUQoc3so/fiRLUrF+3AQRO8CFsnZN0cCVsax3+h9mCsB2XSagGsu/attleIQe?= =?utf-8?q?F1lVookLHyhzkVbDejGH5dpPGYOE7kOpDd0Ble4FSZnZjhPAIAt6lnM7dy/pEcVce?= =?utf-8?q?4cwkTDkuHZ8U41tnxmLYuem6skJtNve7FpjB5qhKW6Bp/Bsd/0Q0pdnfXOgEHkVjM?= =?utf-8?q?A0FOsp7nkv2QDtVMe1tQuxnWeeZ+G5wUAqLtx5xjyEGZ4HKbElxJUwGLblIvx9May?= =?utf-8?q?r9rMEEGXQUmtzacn37NRgUfjm58c9NiKoaAHVkugqDunn1Wp/f+uEFsEznRbOijc0?= =?utf-8?q?HZFhr04TGd6cZ7LgZXsAu56JVtSyi57LyxIPkc8kFfUaW9pE/s56HsNwr/FdX3Foa?= =?utf-8?q?U+uIyIiDhI6Pp3cESzY1C2Lf7qOQAdqSouyiLZpJKpnKDdPLOJO/XBSnr+Q8fMoxJ?= =?utf-8?q?6iwqokXQx9KNommBD++Q2VgIJUya1XZAcwoZniSxrSgaC1JEKAQVjYzHncL6P2nIT?= =?utf-8?q?sXORVxUfevyDnQFgRAOdiYFcmW+cXYrdqLyxH5t2wA9XDgS16PCpQoljhqR+0t3PC?= =?utf-8?q?IYMxofQlg4Q3ueaCf982NGqftGGPo14EGLjSqeyCmhDmpH5PCfl2zWO61PK2qqsaW?= =?utf-8?q?rIV8/0tCKvSIkfgglCsaVJB4JIS5EDqCufZyiJQI7gzsbeI0irI4VeyKWx8LmYpoO?= =?utf-8?q?BBmJB3r1PfV0yVGh8msRFjVZBCRJylYa/BYPv6HDAHFKPUgNZeQNSWm6An8dRXSGn?= =?utf-8?q?zPPcQ+RQGdMPsH3h/X1q9exR9J4TxkQyg2N8eFGj8iF/BIZlQQvGIGy1oW1yuz6WQ?= =?utf-8?q?LdxgBwA1xU4xAMqfLk3IE/KrycLZSNMq3Gl27K5D0V32s2cTNRauAoMPi/NVNIjlB?= =?utf-8?q?bR4UyS/AVK?= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(1800799024)(36860700013)(7416014)(376014)(82310400026)(921020); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2025 11:05:59.7100 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 112b4828-5dfa-4ec4-7537-08dd41e73e85 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044F1.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9127 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This commit adds a document section in drm-uapi.rst about tracepoints, and mark the events gpu_scheduler_trace.h as stable uAPI. The goal is to explicitly state that tools can rely on the fields, formats and semantics of these events. Acked-by: Lucas Stach Acked-by: Maíra Canal Signed-off-by: Pierre-Eric Pelloux-Prayer --- Documentation/gpu/drm-uapi.rst | 19 ++++++++++++++++ .../gpu/drm/scheduler/gpu_scheduler_trace.h | 22 +++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/Documentation/gpu/drm-uapi.rst b/Documentation/gpu/drm-uapi.rst index b75cc9a70d1f..9603ac0f4c09 100644 --- a/Documentation/gpu/drm-uapi.rst +++ b/Documentation/gpu/drm-uapi.rst @@ -583,3 +583,22 @@ dma-buf interoperability Please see Documentation/userspace-api/dma-buf-alloc-exchange.rst for information on how dma-buf is integrated and exposed within DRM. + + +Trace events +============ + +See Documentation/trace/tracepoints.rst for information about using +Linux Kernel Tracepoints. +In the DRM subsystem, some events are considered stable uAPI to avoid +breaking tools (e.g.: GPUVis, umr) relying on them. Stable means that fields +cannot be removed, nor their formatting updated. Adding new fields is +possible, under the normal uAPI requirements. + +Stable uAPI events +------------------ + +From ``drivers/gpu/drm/scheduler/gpu_scheduler_trace.h`` + +.. kernel-doc:: drivers/gpu/drm/scheduler/gpu_scheduler_trace.h + :doc: uAPI trace events \ No newline at end of file diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h index 5c740cb80037..85d547f3fadd 100644 --- a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h +++ b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h @@ -33,6 +33,28 @@ #define TRACE_SYSTEM gpu_scheduler #define TRACE_INCLUDE_FILE gpu_scheduler_trace + +/** + * DOC: uAPI trace events + * + * ``drm_sched_job``, ``drm_run_job``, ``drm_sched_process_job``, + * and ``drm_sched_job_wait_dep`` are considered stable uAPI. + * + * Common trace events attributes: + * + * * ``id`` - this is &drm_sched_job->id. It uniquely idenfies a job + * inside a &struct drm_gpu_scheduler. + * + * * ``dev`` - the dev_name() of the device running the job. + * + * * ``ring`` - the hardware ring running the job. Together with ``dev`` it + * uniquely identifies where the job is going to be executed. + * + * * ``fence`` - the &dma_fence.context and the &dma_fence.seqno of + * &drm_sched_fence.finished + * + */ + #ifndef __TRACE_EVENT_GPU_SCHEDULER_PRINT_FN #define __TRACE_EVENT_GPU_SCHEDULER_PRINT_FN /* Similar to trace_print_array_seq but for fences. */