From nobody Sun Dec 14 19:35:45 2025 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2047.outbound.protection.outlook.com [40.107.237.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D0DC22063F0 for ; Mon, 26 May 2025 12:55:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.47 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748264143; cv=fail; b=OA9BBpU77TxToWcuuDj5nlb6tsTmlKNqnFX62pvg6FG2Ybxdum4IOeEFUhJTjUDByzcq/K80nHAd3A86v0OWne3kUZpJ1W9W9OzTqBAr1it6Px77pf2VReUJ4eeGmtipYsfpCAiPQYccIRKyY3e4ce31nJkidq9aRnRo6Hf9acI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748264143; c=relaxed/simple; bh=vjmDnSkdlZt/DhCTho+/Avo1f7AVJwHzyIdzmT9zBKs=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ShkJbF9TVzWfJU6u/ikmLdFQ/V9PRFenWBD97m4uXbm84Lg7Bv2Hg1Pij2YbClUB2kWx1mSLB88/fnIPqs/WxyQezt0HMdRg1RAVyNWpBV+IOxT3HZqSf0BhuV4AGfNZFaxWTfIrCpiT/loZvmSbBX9QuUUroXslbjqy1/i5A0g= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=AFvufF2s; arc=fail smtp.client-ip=40.107.237.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="AFvufF2s" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=K3S6jmnI2JUzDq2tnSSrxF2L5sPR8O2dwBFkawSCFvUYEhvyUkQJC7Uku8KL7jtyZVQMdLCjSP79gDyY8KQfEn+q9FkBaL4ZcAzGP83QJY4G8enkRWr6B+RCsBGe7plMKwum4WL10FHAJp5Yo0+INVzzzSdW5zPXIKw6BnTzjIFbv22DABIxxu37s/kn/QY80YQv2uIIc//LEyMIr0xb9Ms3Xy132HV0tA1q0AFCgdFAut1Aue6rEKqtx8/j/rEV6jotC5F1ZCoDXiht1iDKcGCIdW/A+vyELrrl9mdf1kQi+LDTgys9EN1QS4qyaWQsuyPBearN6ybR89mR2ronXw== 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=YExrLBNmjk0Jky++4o/V4jEROgJRqTpVnrXzJ5VrY0A=; b=CREdCOizGhJ2ijE8F+rVWfEczxcLxZFVU/wTBMm0BYxrUkWtQqFdDfnbEKuo0L64csS7HhRfO5dCt84KoIIs05UgWRkyAMYSjmXsAkyEgYHDAdskPbQGHalV1leglTq+WLdurMS09MLmEMZFBByrFUX5SrQTwL7/fvlPzsJL2YiaD8jh8hDaB0EqRIdWNA8/NGx7PKyK4e/NqZZEof1eSfEcXOPg1Ibhe1sYxAWsk+vfXRJvjlx8kLw6AO27JvL32pNXhsGwJdC5TgvXvIUULcCVwI+/NS6IYPSrcWLPuWPrNp6iBlgMIqlKkzvqiWCuE6fsNzNwMe7ITiAT6allTg== 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=YExrLBNmjk0Jky++4o/V4jEROgJRqTpVnrXzJ5VrY0A=; b=AFvufF2saGJeq8Dg32vb/8LN2OOWJ3lJbx7bRfifje8oC8YsVEZ7GIKoFW8z2DFMVLzm82pCpFspDsZrDln0Mf3ZvsbiL8UQJCHiaw0NA0xWkdwrcP5Polj/z1QGfVKZi9/ccmp695PX5TLGRQ6c/APmCVN3suf4Hzl4Hhpmo/I= Received: from SJ0PR13CA0002.namprd13.prod.outlook.com (2603:10b6:a03:2c0::7) by DM4PR12MB9071.namprd12.prod.outlook.com (2603:10b6:8:bd::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.21; Mon, 26 May 2025 12:55:36 +0000 Received: from SJ1PEPF00001CEB.namprd03.prod.outlook.com (2603:10b6:a03:2c0:cafe::8) by SJ0PR13CA0002.outlook.office365.com (2603:10b6:a03:2c0::7) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8769.18 via Frontend Transport; Mon, 26 May 2025 12:55:35 +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 SJ1PEPF00001CEB.mail.protection.outlook.com (10.167.242.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Mon, 26 May 2025 12:55:35 +0000 Received: from FRAPPELLOUX01.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; Mon, 26 May 2025 07:55:33 -0500 From: Pierre-Eric Pelloux-Prayer To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter CC: Pierre-Eric Pelloux-Prayer , =?UTF-8?q?Christian=20K=C3=B6nig?= , , Subject: [PATCH v11 01/10] drm/debugfs: Output client_id in in drm_clients_info Date: Mon, 26 May 2025 14:54:43 +0200 Message-ID: <20250526125505.2360-2-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250526125505.2360-1-pierre-eric.pelloux-prayer@amd.com> References: <20250526125505.2360-1-pierre-eric.pelloux-prayer@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00001CEB:EE_|DM4PR12MB9071:EE_ X-MS-Office365-Filtering-Correlation-Id: 2e0d6a01-f305-4309-ed03-08dd9c549b6d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700013|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?UDgzeWRRSlk4RXVGUVZEZEIxc2Q2SkVBMTJNNjBFSVlqM0NlamlpWnIxQjd4?= =?utf-8?B?NWhzbTdsd0tCUnpQNU9ab2FJME1oTHBNbVZ3bCtRZWxBazlCYksvMDlWQWhj?= =?utf-8?B?dEJ4RS9QQU05NlZ5dVIzQ3JodmRHcTQybmhXeVdGc3B2ZzR3YWpxZWZ0UUpv?= =?utf-8?B?UzgweE5uVGtmeDRUbzlYV1FQSFB4SkRqcEVzQzlvbkUyMGNuNW02blZUNXRv?= =?utf-8?B?Y0tBWXRNQk5DaTFqVkE1MzBhUE5PNlFsbjdrWG9Ec1gxQWlWMkxCd25VaHhn?= =?utf-8?B?NDNWYWRwVGQxMFZEdUszZ0JXUWt0Y2ZXRWxoZitLL2lKdHRPb1U1d1Nyd2U4?= =?utf-8?B?Q1liZTk2bnJXODNEZUpuaXZHOFovNmpsVTNOUVdGMjlTQmFqZnRlQVJHRjBv?= =?utf-8?B?L1ZsMjFxQ3k3YjVHbk1CUmpVK1pFT2xuWjV0NXJiWU1Ibk1BU3FyY25JeGxq?= =?utf-8?B?NnE1dHBjQTdkYjlHWTRtekUvNzNmaG51UERGWmVUQzJZQXVkYUlWYloxRXdD?= =?utf-8?B?NVQ1c0FuWnRTNzlEUHUzc0h6VjM0ZnIrcnZBM3FnT2Q1aS9jakEwQ2FwVTlo?= =?utf-8?B?SGRoM29UU0J1TWJFQUQ1M3Z4SFV3UmRFZHpDbkVLYVRnMmR2MU9wZjZvd3I3?= =?utf-8?B?bHZNT1VyRkhOMmdpUGxCNXdUK1pJQWlVQkMwVEQyQXBiaVdPWC9MMGtLNkZv?= =?utf-8?B?Z1ZkK3N0bjRseWNjYisrU084N3ErS2lXWEFXZkF0c045OXRrcE1DMzhacmZI?= =?utf-8?B?V1ZHcnp4NWxHaS9lQmo2VFhjMm94R1Bja295c08ycERWdGpFK0ZnWTUwV2R0?= =?utf-8?B?UWx5Wm42L3pZdzNKU2tMcEFQZjRFT1dWNlU5cVI0OFZqT3dJVEtSVk92ei81?= =?utf-8?B?VUxmb0RwVnRpNmt6ODN2cFNpSjd6aG8zajM1cVF2WnF3Yk9sU05xbnJIWmNX?= =?utf-8?B?bnVKWW1vcXlyVTdRckMzV3lQdFlZTHp2SnlJQlh2UU1KVkFaeUQ0QitEOWJG?= =?utf-8?B?WDlSaXlTMU9FcXp0KzlDMUtyTkIxMVVkTjRwbncwTStZOE8xMytyK0I1R3lH?= =?utf-8?B?K1oxRUI5S0lza2w2WlVRYzF4OXBWOTlHUVBJR0pnTElGcTI2UWJQOWtxNyt3?= =?utf-8?B?RUV0ZkI5YnNNeGtMZzEvRnVzekNSa3d6WWxLV1F2RGdnTm84Q0JNZkExTG94?= =?utf-8?B?MVFpTDRqOFFWQkE2cjNXdjJ4bkhLdmZhMGtnNmlacTgxRzhDcldpUU8xZFZF?= =?utf-8?B?NkNtOUU2d21HWURTTitNbUdicER5TFNPNzU1eS9HWkN0OWNYWlpLZ09rOXBK?= =?utf-8?B?YW9peEZRSlRSaW8vSUk2eVl4bWkwNk5kaGZtTFpKNzkvTGVBQ1YrZWFlQjdo?= =?utf-8?B?MjNBQ2RtUEczZ3kvR3g3d1c4TnA3MXR0cmZEejJyeVZ4Mnc1TXcybGNnUWJB?= =?utf-8?B?RXNycWgrQ1dPT2twWWVVNUtrNVFBTFBFY3BILzZuMjFHUG1SazB1OVV5anJ2?= =?utf-8?B?MHlhVDA1OGtSczBoMUMraXFhY1VpSzN2ZVVKM0N2YW5JYjJCdjkvZ1gvVWxR?= =?utf-8?B?RGZnRFN3ZUNFMkVDVDV3K3h6Z2xsNS9vVjdqM21NVXFTU2RTZStlY1NhSmdY?= =?utf-8?B?TTN4VHBNQW1KQ1NudTNocUd4bmZHTUdhb0JsaDhFMHZTUWFNQmRHaTJwU3BT?= =?utf-8?B?b3VvNEw4aWRHUmkxN3laT1hMN3BqaHFsYkVyM3MrTXF3cmowQXZlWE1TNnUy?= =?utf-8?B?V2ZBeWp5cFZlTU42bGl3cDZpOThpckZKK1lRemNCS0pLbXNWU2wvb3JqQnRB?= =?utf-8?B?RngzNGhlSTJKM3BySU5jN3pIUHR6ZUx5NzdDaWJ1MytFanVJdHU4TUxYbWpu?= =?utf-8?B?NnRjRTE5Z3dSU2QrNnpEUnMwUTg3Z0t5TnY2QW5BK28wdVRXOHJJTHVzVnl4?= =?utf-8?B?YjdwdkZKRWpmZHYvU3YwSFVIeVNjcVhlRThOcDh2WHdRc1BDR0F5NWtRS2My?= =?utf-8?B?MWpOVXZkUUZ5ZXRTd1VLRjRtQk56dDZhMzZPZUpGVVlVVVlydkpOaHlpZ0hR?= =?utf-8?Q?DKrxTr?= 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)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2025 12:55:35.4070 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2e0d6a01-f305-4309-ed03-08dd9c549b6d 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: SJ1PEPF00001CEB.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB9071 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 =3D digit count of the biggest uint64_t). Reviewed-by: Christian K=C3=B6nig 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 3dfd8b34dceb..abceb28b23fc 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 *d= ata) kuid_t uid; =20 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"); =20 /* 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 *d= ata) pid =3D rcu_dereference(priv->pid); task =3D pid_task(pid, PIDTYPE_TGID); uid =3D 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 *d= ata) 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); } --=20 2.43.0 From nobody Sun Dec 14 19:35:45 2025 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2076.outbound.protection.outlook.com [40.107.95.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 546E02566; Mon, 26 May 2025 12:55:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.95.76 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748264157; cv=fail; b=MeXWm9c7xVHVRf4i+B9+7yQhWLP1lRiXWjzQxQ4JBw6eXuibXiYUYMlVVwAL4sWk7PlBcCZF3Ml/vhN5AoTgp/+6UfszsR4niO/NFPxyECRCBG3RkY44ZleJey4z0wBDq2/Jgbj3ryijYNEL/sEzCX+7TE7JEEe1tJ34NyV3W6w= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748264157; c=relaxed/simple; bh=bhMtSgmOJeop3VfvEEum4OF4/vHghlXQaCECLfs/A98=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ZiFCxEub8ActYHyWBs+sV2uOADAixqbae9YPnfTRsAZA2LaePPyfkv87QwYO3hr8n8Fjx4Zi3ms6iiBG70+5UGjYAnl0RrzYZOnyQQlD2R7uTCbUFg05nSHSjzViZdlcQUR7pZB3O5CKRQUCGSgYZLcgJNXKtmzzyF8uXqpWBc8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=BGh5sjXD; arc=fail smtp.client-ip=40.107.95.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="BGh5sjXD" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=KuVUQ0tf7ZRCcBY9UDrIVdV0XnRoR6MCmTcjEWXhnYmOsasdNghJIs00fcGVdYnmDCmcJgCeSf0W8aSWEgN4rXESQ0m8Yp7ND6O96q5yOaLMxBsR5f65T/ir5jiF40xvHKmUrtsNajpTaDW4D6ylBL0ByAfy6UWL6JzQkZwFTm5jphoYZjy6CBMwBCVldpUARs/yyXHQDkFmFSiBDNXafo/ZX9KPLGtD0cV4W5+dnmdapkp77TUf2RCtzh+//HEuBZckRspXTH1/2ALt+svXaEfat5XWZw3si17DqqoMlqQQsbaA4a5ug+DxMtFfXZ4pE0fpsYCWx5syg0gqaFA0gQ== 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=/+d2AgzstIZ3b5RLbY0TXbn/+KWnyvaZu1IZT4ws0Gg=; b=vHte5NkwBqD2HQuo+oLRP0IAJp/b0pb4ujAGdT6pZ9l7LmEHkmpdZWiFwPCtcc543VtZzRHaUvRq2LGOVIS0rE0sedGXevpLiO7rAzS3lNx8QryJ3Pbl9lO2xlyJafTktVro6TMm5EIOauI3bzA/lbwpOg+sGo0bG+9+mi6tay8NO92rlTB1bc+/LoIbSxcbT2W3ZROfD1hI37MUcVx9zeJ43KpWHRKFKsGzxlWQUU0c1vtdAJwb/1AYKai0Ofu9xuawsDFtJQMkFGEjlyd+o2zJlHRsfzn/NawWJCcJtat9C7qKyxoVfqb2eS3k2HGNPHXDiuPVpgRhbjpMD6wHyg== 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=/+d2AgzstIZ3b5RLbY0TXbn/+KWnyvaZu1IZT4ws0Gg=; b=BGh5sjXDDLDgnQjfC03NjsVJiTGTN0Md4PTbgMYA9XIAOnIhFDY/hVzt4XAC7t2DVtGC/KI1YWtD/g+f+zsn4s4KQ7sCc4g7DaZ72IoMtJU1MBXmbCxK+gb0D8Gg5ZWlFM42og+bVUL69XKGalXK4PZyCG8aTlDuK+vqdJDfcYg= Received: from BY1P220CA0020.NAMP220.PROD.OUTLOOK.COM (2603:10b6:a03:5c3::7) by SJ5PPF09E5F035B.namprd12.prod.outlook.com (2603:10b6:a0f:fc02::988) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.33; Mon, 26 May 2025 12:55:49 +0000 Received: from SJ1PEPF00001CE8.namprd03.prod.outlook.com (2603:10b6:a03:5c3:cafe::59) by BY1P220CA0020.outlook.office365.com (2603:10b6:a03:5c3::7) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8769.27 via Frontend Transport; Mon, 26 May 2025 12:55:48 +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 SJ1PEPF00001CE8.mail.protection.outlook.com (10.167.242.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Mon, 26 May 2025 12:55:48 +0000 Received: from FRAPPELLOUX01.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; Mon, 26 May 2025 07:55:40 -0500 From: Pierre-Eric Pelloux-Prayer To: Min Ma , Lizhi Hou , Oded Gabbay , Felix Kuehling , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , 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" , Lyude Paul , Danilo Krummrich , Boris Brezillon , Rob Herring , Steven Price , Liviu Dudau , Matthew Brost , Philipp Stanner , Melissa Wen , =?UTF-8?q?Ma=C3=ADra=20Canal?= , "Lucas De Marchi" , =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , Rodrigo Vivi CC: Pierre-Eric Pelloux-Prayer , =?UTF-8?q?Christian=20K=C3=B6nig?= , , , , , , , , , Subject: [PATCH v11 02/10] drm/sched: Store the drm client_id in drm_sched_fence Date: Mon, 26 May 2025 14:54:44 +0200 Message-ID: <20250526125505.2360-3-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250526125505.2360-1-pierre-eric.pelloux-prayer@amd.com> References: <20250526125505.2360-1-pierre-eric.pelloux-prayer@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00001CE8:EE_|SJ5PPF09E5F035B:EE_ X-MS-Office365-Filtering-Correlation-Id: 7adbce40-c622-4f91-4d42-08dd9c54a310 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|7416014|36860700013|1800799024|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?OE93Wm9ZNmU4cmZqSlo4MGw5Ym1zUGxjUFVZNGlEd1AyN0FzUzhDMHdndGQx?= =?utf-8?B?a2RSZHZMQ24zVC8venhZaVRFTEprUC9zM3Q5azhrNDFoKzVNazFMdFMrSVJ1?= =?utf-8?B?TldDQ2ZhODBuQnRUb0lDbVJtQ1l4SjVkdTkyZm5EUDdpbEt0d3pyOWRTVWxl?= =?utf-8?B?QUlOam01WGlmUmo2Mm1meGdULzNJMzFjK0Q2SDNOamdsNEVibi9aVjJZMFcy?= =?utf-8?B?RFZHUDdrNFBZMGE3K0VLblJJTUU2UVdSTkVGUGxVcmhZSjQrOFozMzVPY0JX?= =?utf-8?B?bVJJQ2VYd2hoTFBoQWFZTFVmQlMzNVdCSWRmVnMzNXNJVCtHa2ZrZ2ZIZ1hs?= =?utf-8?B?T3FaaGNzbldlZGlwY2luVWhmcUxad2RsQVFNem13VDlLZ0F3RThwVTMzd1h2?= =?utf-8?B?VDhEN3g1NENJUytjeDBCME9KNnFkbTlySlVKNXQxZEt2QmZ6MTV6RFN6Z3c5?= =?utf-8?B?dFlIRTFOU1pYN1Q3N3ZNQW10bzNSRGdBbWJCa0xTbWJDWCtMbzBaOTZvU0VW?= =?utf-8?B?Rkx5V0MxeEtrU0o4ZXV1cjZ3bWxWRVBEOTFhZi9yNzlVcE5rbjc1OVlxbjVE?= =?utf-8?B?aGdnU2Q0cTdLOVhYVXFqVVVkWCszdnczRUJqeUVmYUNvanpucEowNXdBV3JC?= =?utf-8?B?c2tzK2xVMEFjVTE0ZnV2SldweWJWQUx3bURPTkZBcjdjNWsrZkdKVWRGV09D?= =?utf-8?B?RnpnNHBJSWtoME9iZFF6ZHV0eGw2ZUgwRkRmT0oxU0llalZSc3orck93S0Ir?= =?utf-8?B?bFdPWCtTRXB5OWVxRlFNUDUrd0oxejdObWU0MzFyMFY2eEhaSS9KY1ZUSkpG?= =?utf-8?B?N0VFS1FCb3dhaDdKMTM5b3laYmFUVzVTVlF0MU1RS0dwR2laOTNXZDc5dUFX?= =?utf-8?B?ZXR2ZnRjZFhxSFhNNHhjanh1eHR3QWdJQ0JSK3RYUDJDSmIzOThtR2d4YWJG?= =?utf-8?B?Zmt2NG01cXN2bzRoVGVqOVhNQWtlS3k0bmk0ZzhKcUxpcFA0MWVISXNxRVJj?= =?utf-8?B?TnNpM1NoVFZMQmdPalJtajNycDl0REhsbDBQZjJ0akMwL3cxMkdQM1ZQSjg0?= =?utf-8?B?YnRQKzFXRUkxTmcxdUhyVy9pYlV2UVpiSTFmSjk4clU5WDJyMCtzMTRJN2x4?= =?utf-8?B?M0NETHFQQng5VnA3N2dZbW4vTE5rQlBpYnhOQTdRclF0QmtYZFgyd2h4MFZj?= =?utf-8?B?dk1mdjhhS0RRU0pGa0lYY2dYemtRRy9OR21yZ014ZGhyQnA2VzVWZUFYdlhp?= =?utf-8?B?RE1HVjJQcFhxbFNxZFNwOHBRLzJ1T1VTUzVaVURNOUpWdCtlN2IwUUtGRWdh?= =?utf-8?B?ZnBjU01uR0tYNEk3K2NWRmxCRXliNjYvczJKblIySnZLTks5dUpUWGpQR1RU?= =?utf-8?B?aUpnbVFkb29Ha29yU01UVDk0VGJJK2RJMDl1SHlIL0grUnVYWHByL1hnUWJE?= =?utf-8?B?QmpEc2luYlNDcjlxUGJWSnRhVVorNE96MmhPNCtxc0hRVkZvaHZXSzMrUzg4?= =?utf-8?B?ZFNmTHdFYTdFOU01MmZDUjdSUy9vOU8zMUVzUkRVUGZvOWcra1lTMDVhWkJz?= =?utf-8?B?KzlKcWNjdHVlc04wakY4M3p3Sm53bkI0K0JIWnhYV2FVb3R3enpxNnhGQlUx?= =?utf-8?B?Z2kwMmxyQmp4SEtMbStHd3RQTGVuRTlkZDU0azZZQUUxanE1YmVFVnpJQ2ha?= =?utf-8?B?YUQ1c1VETWxVUFVqdGxxSDEzY253QjIzWE45Rm1XMXZkNlF3ajRCbG9EV3RR?= =?utf-8?B?UDI5L0x0WXNPWHltdzdEb2VZZ3c5dm1ocGxmSVhZaGxVcVNuTmRFUnRKdG9t?= =?utf-8?B?b25BMHl4TzhPQ0szb1ByWVp2dWxJaTdoNkVIdDh0STVkUTFJT2RxYkhMenNR?= =?utf-8?B?QmNMcThTTjhjWTZDbzRoNzd2OHZ5eFhFcmF1Z3FiMHZrSUVRZ3BtL3FFOEIv?= =?utf-8?B?WXl0aXREekx3dHI4Rld1M2VRYWFLekwwNTlKblFoaGRJVmp1YUtIUmswN2xB?= =?utf-8?B?RjQ0a1RUQ2JyNHM3YUFIMk4rRUh4TTU1dzhSb3NPTjhndVhXWnBqdzBrU1dI?= =?utf-8?B?bGc3MHk2WWlMUUFGUGU3QzY0SkpnQk1UUUR4UT09?= 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)(376014)(7416014)(36860700013)(1800799024)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2025 12:55:48.2158 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7adbce40-c622-4f91-4d42-08dd9c54a310 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: SJ1PEPF00001CE8.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ5PPF09E5F035B 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. Reviewed-by: Christian K=C3=B6nig 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_internal.h | 2 +- drivers/gpu/drm/scheduler/sched_main.c | 7 +++++-- drivers/gpu/drm/scheduler/tests/mock_scheduler.c | 3 ++- drivers/gpu/drm/v3d/v3d_submit.c | 2 +- drivers/gpu/drm/xe/xe_sched_job.c | 3 ++- include/drm/gpu_scheduler.h | 10 +++++++++- 26 files changed, 64 insertions(+), 34 deletions(-) diff --git a/drivers/accel/amdxdna/aie2_ctx.c b/drivers/accel/amdxdna/aie2_= ctx.c index e04549f64d69..3e38a5f637ea 100644 --- a/drivers/accel/amdxdna/aie2_ctx.c +++ b/drivers/accel/amdxdna/aie2_ctx.c @@ -848,7 +848,8 @@ int aie2_cmd_submit(struct amdxdna_hwctx *hwctx, struct= amdxdna_sched_job *job, goto up_sem; } =20 - ret =3D drm_sched_job_init(&job->base, &hwctx->priv->entity, 1, hwctx); + ret =3D 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/a= md/amdgpu/amdgpu_amdkfd.c index 4cec3a873995..1a77ba7036c9 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c @@ -639,7 +639,7 @@ int amdgpu_amdkfd_submit_ib(struct amdgpu_device *adev, goto err; } =20 - ret =3D amdgpu_job_alloc(adev, NULL, NULL, NULL, 1, &job); + ret =3D amdgpu_job_alloc(adev, NULL, NULL, NULL, 1, &job, 0); if (ret) goto err; =20 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/a= mdgpu/amdgpu_cs.c index 82df06a72ee0..5a231b997d65 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, =20 for (i =3D 0; i < p->gang_size; ++i) { ret =3D 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 =3D 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 acb21fc8b3ce..75262ce8db27 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c @@ -204,7 +204,8 @@ static enum drm_gpu_sched_stat amdgpu_job_timedout(stru= ct drm_sched_job *s_job) =20 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 =3D=3D 0) return -EINVAL; @@ -222,7 +223,8 @@ int amdgpu_job_alloc(struct amdgpu_device *adev, struct= amdgpu_vm *vm, if (!entity) return 0; =20 - return drm_sched_job_init(&(*job)->base, entity, 1, owner); + return drm_sched_job_init(&(*job)->base, entity, 1, owner, + drm_client_id); } =20 int amdgpu_job_alloc_with_ib(struct amdgpu_device *adev, @@ -232,7 +234,7 @@ int amdgpu_job_alloc_with_ib(struct amdgpu_device *adev, { int r; =20 - r =3D amdgpu_job_alloc(adev, NULL, entity, owner, 1, job); + r =3D amdgpu_job_alloc(adev, NULL, entity, owner, 1, job, 0); if (r) return r; =20 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) =20 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, vo= id *data, =20 ret =3D 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; =20 diff --git a/drivers/gpu/drm/imagination/pvr_job.c b/drivers/gpu/drm/imagin= ation/pvr_job.c index 59b334d094fa..7564b0f21b42 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; =20 - err =3D pvr_queue_job_init(job); + err =3D pvr_queue_job_init(job, pvr_file->file->client_id); if (err) goto err_put_job; =20 diff --git a/drivers/gpu/drm/imagination/pvr_queue.c b/drivers/gpu/drm/imag= ination/pvr_queue.c index 5e9bc0992824..5a41ee79fed6 100644 --- a/drivers/gpu/drm/imagination/pvr_queue.c +++ b/drivers/gpu/drm/imagination/pvr_queue.c @@ -1073,6 +1073,7 @@ static int pvr_queue_cleanup_fw_context(struct pvr_qu= eue *queue) /** * pvr_queue_job_init() - Initialize queue related fields in a pvr_job obj= ect. * @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 @@ -1082,7 +1083,7 @@ static int pvr_queue_cleanup_fw_context(struct pvr_qu= eue *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 =3D job->type =3D=3D DRM_PVR_JOB_TYPE_FRAGMENT ?= 1 : 0; @@ -1099,7 +1100,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; =20 - err =3D drm_sched_job_init(&job->base, &queue->entity, 1, THIS_MODULE); + err =3D drm_sched_job_init(&job->base, &queue->entity, 1, THIS_MODULE, dr= m_client_id); if (err) return err; =20 diff --git a/drivers/gpu/drm/imagination/pvr_queue.h b/drivers/gpu/drm/imag= ination/pvr_queue.h index 93fe9ac9f58c..fc1986d73fc8 100644 --- a/drivers/gpu/drm/imagination/pvr_queue.h +++ b/drivers/gpu/drm/imagination/pvr_queue.h @@ -143,7 +143,7 @@ struct pvr_queue { =20 bool pvr_queue_fence_is_ufo_backed(struct dma_fence *f); =20 -int pvr_queue_job_init(struct pvr_job *job); +int pvr_queue_job_init(struct pvr_job *job, u64 drm_client_id); =20 void pvr_queue_job_cleanup(struct pvr_job *job); =20 diff --git a/drivers/gpu/drm/lima/lima_gem.c b/drivers/gpu/drm/lima/lima_ge= m.c index 5deec673c11e..9722b847a539 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) =20 err =3D 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; =20 diff --git a/drivers/gpu/drm/lima/lima_sched.c b/drivers/gpu/drm/lima/lima_= sched.c index 7934098e651b..954f4325b859 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(stru= ct 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; =20 @@ -124,7 +125,8 @@ int lima_sched_task_init(struct lima_sched_task *task, for (i =3D 0; i < num_bos; i++) drm_gem_object_get(&bos[i]->base.base); =20 - err =3D drm_sched_job_init(&task->base, &context->base, 1, vm); + err =3D 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); =20 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 3e9aa2cc38ef..d9be0fe3d674 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 =3D ATOMIC_INIT(0); struct msm_gem_submit *submit; @@ -54,7 +54,8 @@ static struct msm_gem_submit *submit_create(struct drm_de= vice *dev, return ERR_PTR(ret); } =20 - ret =3D drm_sched_job_init(&submit->base, queue->entity, 1, queue); + ret =3D 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, } } =20 - submit =3D submit_create(dev, gpu, queue, args->nr_bos, args->nr_cmds); + submit =3D submit_create(dev, gpu, queue, args->nr_bos, args->nr_cmds, + file->client_id); if (IS_ERR(submit)) { ret =3D PTR_ERR(submit); goto out_post_unlock; diff --git a/drivers/gpu/drm/nouveau/nouveau_sched.c b/drivers/gpu/drm/nouv= eau/nouveau_sched.c index d326e55d2d24..460a5fb02412 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, } =20 ret =3D 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; =20 diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panf= rost/panfrost_drv.c index f1ec3b02f15a..50d8d16eace0 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, =20 ret =3D drm_sched_job_init(&job->base, &file_priv->sched_entity[slot], - 1, NULL); + 1, NULL, file->client_id); if (ret) goto out_put_job; =20 diff --git a/drivers/gpu/drm/panthor/panthor_drv.c b/drivers/gpu/drm/pantho= r/panthor_drv.c index 6200cad22563..229b9190f152 100644 --- a/drivers/gpu/drm/panthor/panthor_drv.c +++ b/drivers/gpu/drm/panthor/panthor_drv.c @@ -996,7 +996,8 @@ static int panthor_ioctl_group_submit(struct drm_device= *ddev, void *data, const struct drm_panthor_queue_submit *qsubmit =3D &jobs_args[i]; struct drm_sched_job *job; =20 - job =3D panthor_job_create(pfile, args->group_handle, qsubmit); + job =3D panthor_job_create(pfile, args->group_handle, qsubmit, + file->client_id); if (IS_ERR(job)) { ret =3D PTR_ERR(job); goto out_cleanup_submit_ctx; diff --git a/drivers/gpu/drm/panthor/panthor_mmu.c b/drivers/gpu/drm/pantho= r/panthor_mmu.c index 6ca9a2642a4e..4ae72b211793 100644 --- a/drivers/gpu/drm/panthor/panthor_mmu.c +++ b/drivers/gpu/drm/panthor/panthor_mmu.c @@ -2523,7 +2523,7 @@ panthor_vm_bind_job_create(struct drm_file *file, kref_init(&job->refcount); job->vm =3D panthor_vm_get(vm); =20 - ret =3D drm_sched_job_init(&job->base, &vm->entity, 1, vm); + ret =3D drm_sched_job_init(&job->base, &vm->entity, 1, vm, file->client_i= d); if (ret) goto err_put_job; =20 diff --git a/drivers/gpu/drm/panthor/panthor_sched.c b/drivers/gpu/drm/pant= hor/panthor_sched.c index 43ee57728de5..a2248f692a03 100644 --- a/drivers/gpu/drm/panthor/panthor_sched.c +++ b/drivers/gpu/drm/panthor/panthor_sched.c @@ -3732,7 +3732,8 @@ struct panthor_vm *panthor_job_vm(struct drm_sched_jo= b *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 =3D pfile->groups; struct panthor_job *job; @@ -3804,7 +3805,7 @@ panthor_job_create(struct panthor_file *pfile, =20 ret =3D 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; =20 diff --git a/drivers/gpu/drm/panthor/panthor_sched.h b/drivers/gpu/drm/pant= hor/panthor_sched.h index e650a445cf50..742b0b4ff3a3 100644 --- a/drivers/gpu/drm/panthor/panthor_sched.h +++ b/drivers/gpu/drm/panthor/panthor_sched.h @@ -29,7 +29,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/sche= duler/sched_fence.c index d6239e015b66..725de257d60d 100644 --- a/drivers/gpu/drm/scheduler/sched_fence.c +++ b/drivers/gpu/drm/scheduler/sched_fence.c @@ -205,7 +205,8 @@ struct drm_sched_fence *to_drm_sched_fence(struct dma_f= ence *f) EXPORT_SYMBOL(to_drm_sched_fence); =20 struct drm_sched_fence *drm_sched_fence_alloc(struct drm_sched_entity *ent= ity, - void *owner) + void *owner, + u64 drm_client_id) { struct drm_sched_fence *fence =3D NULL; =20 @@ -214,6 +215,7 @@ struct drm_sched_fence *drm_sched_fence_alloc(struct dr= m_sched_entity *entity, return NULL; =20 fence->owner =3D owner; + fence->drm_client_id =3D drm_client_id; spin_lock_init(&fence->lock); =20 return fence; diff --git a/drivers/gpu/drm/scheduler/sched_internal.h b/drivers/gpu/drm/s= cheduler/sched_internal.h index 599cf6e1bb74..7ea5a6736f98 100644 --- a/drivers/gpu/drm/scheduler/sched_internal.h +++ b/drivers/gpu/drm/scheduler/sched_internal.h @@ -24,7 +24,7 @@ void drm_sched_entity_select_rq(struct drm_sched_entity *= entity); struct drm_sched_job *drm_sched_entity_pop_job(struct drm_sched_entity *en= tity); =20 struct drm_sched_fence *drm_sched_fence_alloc(struct drm_sched_entity *s_e= ntity, - void *owner); + 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); diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/sched= uler/sched_main.c index f7118497e47a..34252bac83b9 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -766,6 +766,8 @@ 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: &struct drm_file.client_id of the owner (used by trace + * events) * * Refer to drm_sched_entity_push_job() documentation * for locking considerations. @@ -786,7 +788,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 @@ -812,7 +815,7 @@ int drm_sched_job_init(struct drm_sched_job *job, =20 job->entity =3D entity; job->credits =3D credits; - job->s_fence =3D drm_sched_fence_alloc(entity, owner); + job->s_fence =3D drm_sched_fence_alloc(entity, owner, drm_client_id); if (!job->s_fence) return -ENOMEM; =20 diff --git a/drivers/gpu/drm/scheduler/tests/mock_scheduler.c b/drivers/gpu= /drm/scheduler/tests/mock_scheduler.c index f999c8859cf7..fcddaeaa9217 100644 --- a/drivers/gpu/drm/scheduler/tests/mock_scheduler.c +++ b/drivers/gpu/drm/scheduler/tests/mock_scheduler.c @@ -117,7 +117,8 @@ drm_mock_sched_job_new(struct kunit *test, ret =3D drm_sched_job_init(&job->base, &entity->base, 1, - NULL); + NULL, + 1); KUNIT_ASSERT_EQ(test, ret, 0); =20 job->test =3D test; diff --git a/drivers/gpu/drm/v3d/v3d_submit.c b/drivers/gpu/drm/v3d/v3d_sub= mit.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 =3D file_priv; =20 ret =3D 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; =20 diff --git a/drivers/gpu/drm/xe/xe_sched_job.c b/drivers/gpu/drm/xe/xe_sche= d_job.c index f0a6ce610948..5921293b25db 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); =20 - err =3D drm_sched_job_init(&job->drm, q->entity, 1, NULL); + err =3D drm_sched_job_init(&job->drm, q->entity, 1, NULL, + q->xef->drm->client_id); if (err) goto err_free; =20 diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h index d860db087ea5..1270cd82ff3e 100644 --- a/include/drm/gpu_scheduler.h +++ b/include/drm/gpu_scheduler.h @@ -305,6 +305,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; }; =20 struct drm_sched_fence *to_drm_sched_fence(struct dma_fence *f); @@ -629,7 +636,8 @@ drm_sched_pick_best(struct drm_gpu_scheduler **sched_li= st, =20 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); void drm_sched_entity_push_job(struct drm_sched_job *sched_job); int drm_sched_job_add_dependency(struct drm_sched_job *job, --=20 2.43.0 From nobody Sun Dec 14 19:35:45 2025 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2048.outbound.protection.outlook.com [40.107.94.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A2CE2040B2 for ; Mon, 26 May 2025 12:56:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.48 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748264161; cv=fail; b=kLFJAwZV1/PuOOoQGfw3o2uXK+HhdHdcP1D8MXqzFQbDYVODZ/wb+QTVI7f0lDqB3dJLv8HRDUNI+jgGzFe+vJeTZdZdhAdjgIJ+MdIRKVXd0wjTK7vZEQ4zBmHoZDNKqTC0fFDuom2OjMfgweqWo+6xmcHe3QIFI7Sw12/26Xk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748264161; c=relaxed/simple; bh=lCCXy60KwtKZ+v4z0Jj+v1jX++nUlG7Cr4/rJdJQkn8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=RvF4+07LE9AStkwcMiEm0CESEvlyextfZE7UsP0NH0vB/pr6RZVIIPlD2BYi8+HTKPm+RZGvN40R9y4Rq/FAVGjQF4NjYQCdOFDOu53np1pPAJjmD7Rr4LLGbY7ILhVY3GcUWk9qx6RG1CcTxyJ3QyxpGZc+h4vUS7xbXo0UsaU= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=LSOlF70S; arc=fail smtp.client-ip=40.107.94.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="LSOlF70S" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nGWmXQPZKGcwGwM5b7YCqaItW0PybG/EA3nZtPA2tnS6lFpXG4G2Z536h3eEFF/gKU5DWI1IuYGpI1DCw25so69E4HBvm/Vt5MD/ZlrnF1F0yFX2BHgxJ5lmKsoYEw5a40DDvIX2WoTEbPtAm3m+n3HoxAQ5QMRJUD9iVo8vzuZPUBJU9U09Sn8K3Oqthy+KU4vUk5bsmMEmuETCEX4+VLu2nDb7zGkGqk1Ir4BTK1ffU02jb8k+a5Wgh+WFGpZFOcvoO6Cuavd/68huiW8QWz6j26XorqY7FilgzmYzcDJIINfXnXUkRAPUM6m96ol6Z1WsorcVuJIb+gT127AUOw== 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=BRHfJWdBNDdbJgIotWKTW+P1jKDophQih4cbrUQesh4=; b=gWkyaZ1oAI1rffjf7yQOU2YD7hMDNotUZYPhGioY/FDrSRLSPa1lEu6cCiL4LLVQPBO5xZ9rtoVlzD+VTKiXwy0aa/Al+9J7u1Xie3SGphjs2fosQLJn3zWhIwsT99DiXCLHpFipRHamT+gYt08/+5d9GNKxyHwI86DiZg2MTzeLWPhtpxmLkhPbcZgIDVvlv8XuTHinPR08iytGHpsfLBY4LfQsEc//j6nTjrmQpilRZSbjnfMM0rRomD650z2rS/XIZhsKwWl6ISTIAb4Yi5nb6+zJxs8krVJIPHypMJ8CtgKVEIi0eNz7zragZM4icpwOk7TpTl4BPr/8o3++wQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=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=BRHfJWdBNDdbJgIotWKTW+P1jKDophQih4cbrUQesh4=; b=LSOlF70SQP4SDbn6xOGQfUd725HtxdAqBFw84vsMwIRIbccl+PjXXufwjmD/wig13xe+y0hDC/3xX/8BK6TROw7mlN+rYKRiIj4JpvkTnrNSs/Mt6gwcbCcd45bKSLw2lZaScdvlDs/CXU0NP8XwL5w2zJuI02okqLgEUxuQvcY= Received: from BYAPR01CA0058.prod.exchangelabs.com (2603:10b6:a03:94::35) by CH3PR12MB7713.namprd12.prod.outlook.com (2603:10b6:610:14d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.25; Mon, 26 May 2025 12:55:52 +0000 Received: from SJ1PEPF00001CE6.namprd03.prod.outlook.com (2603:10b6:a03:94:cafe::f8) by BYAPR01CA0058.outlook.office365.com (2603:10b6:a03:94::35) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8769.18 via Frontend Transport; Mon, 26 May 2025 12:56:05 +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 SJ1PEPF00001CE6.mail.protection.outlook.com (10.167.242.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Mon, 26 May 2025 12:55:52 +0000 Received: from FRAPPELLOUX01.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; Mon, 26 May 2025 07:55:49 -0500 From: Pierre-Eric Pelloux-Prayer To: Matthew Brost , Danilo Krummrich , Philipp Stanner , =?UTF-8?q?Christian=20K=C3=B6nig?= , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter CC: Pierre-Eric Pelloux-Prayer , =?UTF-8?q?Christian=20K=C3=B6nig?= , , Subject: [PATCH v11 03/10] drm/sched: Add device name to the drm_sched_process_job event Date: Mon, 26 May 2025 14:54:45 +0200 Message-ID: <20250526125505.2360-4-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250526125505.2360-1-pierre-eric.pelloux-prayer@amd.com> References: <20250526125505.2360-1-pierre-eric.pelloux-prayer@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00001CE6:EE_|CH3PR12MB7713:EE_ X-MS-Office365-Filtering-Correlation-Id: 76cc60e5-b84d-400d-7846-08dd9c54a58d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700013|376014|7416014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?Q2Q3WG9kaitjRFZQZVZrUmxPMVgyckFSSEFrejJ6S245U2ZjclpNTEF4WTdX?= =?utf-8?B?L0FpQThhSStDS1d1a3kvaE9rbitHNjdxSEJ1MVhrU3p6clE2dldVdTg0SGhh?= =?utf-8?B?bEh2bEZyaWFIYmc0REJLdnpRNVdOVE5GcHVNRzR4MHU0RGUxazlJdDBjTXJO?= =?utf-8?B?aHhaM2YxR0ZoUlRvdTZuYlNzTCttdmE3U3NvdWMvRmFxVWp3RUp2d2gvQ0ww?= =?utf-8?B?cXJJa2ZaQjZUeDB5cWRrVkhNb3Y1SUgwaVNiRGtndE56Tjc3bUt2c05kL1lZ?= =?utf-8?B?Tmp0bVFWenEvMU5SUDh2cTIyYzZzc2ZNc3B2dE1ZVXZmeEhtYW84ZXpHYUVX?= =?utf-8?B?UUtMU0pCZFRkcmdSZXI2Q1BtUUFMSlU5dUI3UUMvcllMM3pISVc1VnVUTGxs?= =?utf-8?B?WU43NTVlV1Y4dlZCWm42ZCsrdVBETkh2VEl3UDdpS1ZWSWVBcTFVU0hKL2Zr?= =?utf-8?B?ZGhaRkIwakdMcFRDZnlYYW95K2J4Vi9uc05ucjkwbEtMZFpnME5zangvSFgw?= =?utf-8?B?aXdoZ0JnNktLZndoODBXbEV1Vk1zVTN3YjJoYXl6VDRQS3BFYmVnNnkzWHdD?= =?utf-8?B?UUh0T3AycWhHWGhTcDZkRkxzbldqaC9VbXpFYXdLY29qb0J3b3ZOWDZrVlBy?= =?utf-8?B?QkhqY013TENBRzJrQ3ZadG1iUzNXZzZzNVZMc2U1bmwvQ05OY2Mrc2hSOUht?= =?utf-8?B?TWhpa3Y3eFpodVZoY2w0aU0rZEFCc2tRQklQcEo2MkwyekdIS1dQSW1DNzVJ?= =?utf-8?B?cG11bU5TaHo4Q2oybVYzRG13ZTFxVHRnVGNGTzJrMjNFTHl1Y1lSeEx3UWNl?= =?utf-8?B?YVdHbHRHV2pGcGpZcytxYWF2dmxjTzBub3BpcExtbDdvT2tZVVErc2RyYUg2?= =?utf-8?B?ejhBQWJFd2pZNUtEOTlzYVNJVnZDbm42RmxhS3M4a01iZ0o0REpLUkxsWEhk?= =?utf-8?B?Y0F3UGpVNFBld2J3dm5XZ0NEU3diOXBacTZOUTFCUEFlQXhQeXkwL0VGNkJR?= =?utf-8?B?dG9rd1owdTRmUm5VM1p3anRONTRSYXFVTUh6dTlCeHQyQlJ4UkhQUHgvZnpZ?= =?utf-8?B?UnJlRyswN3M2Mm1sd1c4T3NlQTAwaXpyaXRtVnlIN0EyNGtubmNzRmJyZk1s?= =?utf-8?B?ZDlMYkxiVTV3amFuYlE3TWhVSFV2NnBDQ3hyOTl4MmFOcFN4VjFaMlM1WUhX?= =?utf-8?B?Z2ZnK1NQdUxxU3l6MXJidmIxdWVNdFdhWnF2Szh2ZVFyNFhIUnpYMXovaG1z?= =?utf-8?B?bUswcnVmSTJKYkZpRVh0OThZdFBCcFpUbWY5NWJqUjdOUldMZUZBT3ozeHB2?= =?utf-8?B?a2JBMmRXSUFkLzUzdjd4Y2k0aWlMcjB0KzVsZUs4emZ1dFdDdEdaOStsUTBI?= =?utf-8?B?NDAveFByeVNYcVlOUkJDRnBKNHJtOUZRczVVUDUyZERtcldrOXlZbmJTZ3V5?= =?utf-8?B?VWlSbGRxcUdrQTlGTEpiR0pnL3VaZWJjZS9GMThGL1JnbGtJUTVwWjlGVnI3?= =?utf-8?B?dWRDYXlFMXZ4TTdydWdHMkUrRUtKNHh2cWc3ek04OHFkeHplcTJ1RlBSdUww?= =?utf-8?B?cm5aS3BjSVVMN0NMVkhNZ3gwN01BVnJ5WWxJREdlbjRVclh1SUE3cVNXSE42?= =?utf-8?B?RjQzQ3BITUZrcXFDYmhyMXVBMHB0S0o4cXBCNW5JMVcwQjNGSGFuU2dzUUhs?= =?utf-8?B?T05xY2dhTWRuVHBTMjd1cHB5Tzg0cVJNUldaMnlrL1czN2JUNzE2TFpJRGkv?= =?utf-8?B?aFVsdGJmRWdEV2pNeG1iZ2g0dmNTVEN5QjFLZnVPY0EzZUUrbUl1TUNmVzNV?= =?utf-8?B?Nzg1cEFxems5dnl1N3k1UThzNExESHQ2bHE5dHhGUG9WMTVLSVhwTUloTi9s?= =?utf-8?B?eHBMSmxKYXZXK2gycjNQd2tOaGJjWXlwSEhVVHlsWFFDMnFnVWFNWWNqRnpX?= =?utf-8?B?b3kwYTc3ZHZ5dVhGMEpQL3kveEtEZTRmYUpRazA2UlNsQjQwMkFtdXZyS2xy?= =?utf-8?B?T29Pck1rcTdsVURHdnpBV3M2OWwzdWMvTFJ4UHFxVUhMcEhYRW1CMm1YVG1O?= =?utf-8?Q?2+p05N?= 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)(376014)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2025 12:55:52.3905 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 76cc60e5-b84d-400d-7846-08dd9c54a58d 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: SJ1PEPF00001CE6.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB7713 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. Reviewed-by: Christian K=C3=B6nig 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 f56e77e7f6d0..713df3516a17 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)) ), =20 TP_fast_assign( @@ -52,9 +53,10 @@ DECLARE_EVENT_CLASS(drm_sched_job, __entry->job_count =3D spsc_queue_count(&entity->job_queue); __entry->hw_job_count =3D atomic_read( &sched_job->sched->credit_count); + __assign_str(dev); ), - TP_printk("entity=3D%p, id=3D%llu, fence=3D%p, ring=3D%s, job count:%= u, hw job count:%d", - __entry->entity, __entry->id, + TP_printk("dev=3D%s, entity=3D%p, id=3D%llu, fence=3D%p, ring=3D%s, j= ob 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) ); --=20 2.43.0 From nobody Sun Dec 14 19:35:45 2025 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2052.outbound.protection.outlook.com [40.107.236.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 837DC204592; Mon, 26 May 2025 12:56:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.52 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748264163; cv=fail; b=Opb3uZZsd7yCG+dgRtVl6YOa6KppPvyrrYK2EzgjuZkLLHAKmEss5/7vXT0SuMlCFcwzamzYAV+8FXLf7wPfK/4F6UjO13AUWc2F9D9ZMmPzxqzGchAKoLqLw+2U43O4NwUg7B39zKbPdX49opkfJds4qZCsl66M/dH9Ad2RQ/w= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748264163; c=relaxed/simple; bh=BOJiSPR9gVl84am5Ce4/Wlx6acYj5DFl55XO6P2VLZY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=OoqfDmfTrhXkoG+SIfLcUAQn2r/IdtQJgrom0ECS9zw/6efjX1ZY2cgQSVpMgZ9MSJlTrI/hzv/jPj4R4JREoOThMAgxgoQgGeiM4I8vFoDiXc/BHL9dUTK4w3nXJ4UYMHb/Y9kjGXXVztyz1nnWop/39/C+cBnOlguBaR9KDN4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=jiJ25jFB; arc=fail smtp.client-ip=40.107.236.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="jiJ25jFB" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=eL3fBwoykV8UKg2BpZ5BDeQAS17+yp2GgW8I3swpbLX5CnqZ9os+DpAKX1A9Nbi7mrhXv0agoWnqAaZDX6f35j3MbshMlwn/MisoPsjkOcASxizmhWFP54TbCf3FuqDyF9oVk++ChNtLv9CbLa25SZqDuUbokSNK+fGOBNS6xCP/3/dw3UPdeJXAENigOIbdW1dEn0m09EbhykNKYsNncggG/aOf7HzOPMtz/RyaJ4Dhfx6abOjEqnEeyUt87SIfIX091orFwn8w08IUwejX2LJffNIlXS9+l8BXNgq57kspPQ9UXxkfqGAifJiU4x+rxX+Fho9SfRRtIZ/9ylxOtw== 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=b7VuIb1G7UqMbLW/iM7ebBG0Y8fEKiuWshqnMvhc8GI=; b=DOc6RUrxEiBYNnkSCTwyKHXXDdEwJSAzYeRM/y/2YN6t4NnvGHvmJQcn5ewMIkClDgYbVBb46K0j6gqSafrjhaEvg0+XHLcTZbJaXvwkZOieIja6BIpgHjhVCUuDNfNXTPQCWFvUaZGE1nKx163x7M35/vueGDLdOG2GRWSdVxHD2sBjHyMKWIAEkOsKDUbpu/pvL/POlVGpDn1+eXY+kEZ2UnSMe6VOaNVYUhfGxhgMP0ZUa629dOFb5yWKStF/u9DlBwAFBWAOsoppa/V8SFi/fHqoooIxJKs/fuFliSUfsThR73lwzWLN+l+v3TvFtAxHDWROpFRqyli8RWIFgw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=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=b7VuIb1G7UqMbLW/iM7ebBG0Y8fEKiuWshqnMvhc8GI=; b=jiJ25jFB2RpICWa90ZKuLahgYkotXMrbd3CmgqCvct4VS/my/8m7CMdZaBR2mHc70VWHO5DT3sb8T1rdV56Un1Q7JHuk1uD7ziQ7vAsaOQuGfPPaggREGao9oS0CVclestkisXf0to9AHcn9r2s8o6dKfu5SmTgd+pPmvfU4BNI= Received: from BYAPR01CA0070.prod.exchangelabs.com (2603:10b6:a03:94::47) by SN7PR12MB7911.namprd12.prod.outlook.com (2603:10b6:806:32a::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.22; Mon, 26 May 2025 12:55:57 +0000 Received: from SJ1PEPF00001CE6.namprd03.prod.outlook.com (2603:10b6:a03:94:cafe::d0) by BYAPR01CA0070.outlook.office365.com (2603:10b6:a03:94::47) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8769.18 via Frontend Transport; Mon, 26 May 2025 12:55:57 +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 SJ1PEPF00001CE6.mail.protection.outlook.com (10.167.242.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Mon, 26 May 2025 12:55:57 +0000 Received: from FRAPPELLOUX01.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; Mon, 26 May 2025 07:55:54 -0500 From: Pierre-Eric Pelloux-Prayer To: Matthew Brost , Danilo Krummrich , Philipp Stanner , =?UTF-8?q?Christian=20K=C3=B6nig?= , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Sumit Semwal CC: Pierre-Eric Pelloux-Prayer , "Tvrtko Ursulin" , , , , Subject: [PATCH v11 04/10] drm/sched: Cleanup gpu_scheduler trace events Date: Mon, 26 May 2025 14:54:46 +0200 Message-ID: <20250526125505.2360-5-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250526125505.2360-1-pierre-eric.pelloux-prayer@amd.com> References: <20250526125505.2360-1-pierre-eric.pelloux-prayer@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00001CE6:EE_|SN7PR12MB7911:EE_ X-MS-Office365-Filtering-Correlation-Id: ae6622d2-4cec-4fd0-b137-08dd9c54a88a 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: =?us-ascii?Q?+u07TpkMPycBC8MOE4K+rQWaKiIXesoyWtXF8SJKqt3nlZHSy1oEOwvpiMZg?= =?us-ascii?Q?XqaSuC628d96HMiPIONjxwlK8aozj8ebCva8qKAokkPR3qOQUc/lVs+kW3Xv?= =?us-ascii?Q?YOi47/YSZEXcgRTerKMwAlVsF0MbydhutACSAaF1kW1y0swWYGTmA5hY6QAc?= =?us-ascii?Q?NiBSBRsswbTOcv5ZK2atkBPD7ancWPTd+9nx/UJgsvtih7bJi59t6Kv0314m?= =?us-ascii?Q?vQwtLruPPGVOiWdIGeoZsrd5x8hwrDepQJvPzxEJGDM8ZmYA4FwKjmX4ZPqT?= =?us-ascii?Q?upgWQf3oyWPQiaFtgxuWR9fb9uqUj7m9KcO9j9b/yfLqo9XUpZWnJkwt0twF?= =?us-ascii?Q?3v9icY2KcLgICKDYveOmQtbPceCHrz3x1JTipFE0fWzW/YEcUOrQcI3XZF6s?= =?us-ascii?Q?vVDlDYbGkrOucfieiZ6sAO8XbgJlbOYkFlRu+WvAXrv5iN5FVdaHmBmOWte5?= =?us-ascii?Q?g1NECOFG6sbrw8TxM/v+P/N13GkSfQF2lYXynDtea7AXXuyjP2QAM8UD21zR?= =?us-ascii?Q?k3AWJO+U9Sdqtx+PcLJi5fn4rzD4jqVHKuspX6sMplGTNCapv9ygz4gpy7Ns?= =?us-ascii?Q?TURSvrEtW/3/cS6Txet3LA/Wnz2TuNJZdMGqY8cAzCySqGFJ9UboA/EFQs4L?= =?us-ascii?Q?UGtAYbcQxAEZqD5QhT4Iljme5l0lhhSrMuIYy2rFCZ7UQSwu44eyZyJ0QsDo?= =?us-ascii?Q?TjE5lz9UhNrSI+wioR9UijAGlCu/ECpYeCdrn35ZV+PIWBX/xL8RWDdDTVxf?= =?us-ascii?Q?rf+T+tY3IXSlQMM+3zip7MRQ98KeGCVzJJIDvoh2qeX5GOCWmY8t3a98JTCu?= =?us-ascii?Q?BdfUDLsFPeu8C/9Db78huYPoVqIn1lLeG5MTYhPgZ6OBYWku/flx+fVRcnt5?= =?us-ascii?Q?YDPGWU9AagwneXSt1KucQzqRi2sU68WVWKEgr6DUejJNxq60FP/BcB5IGKlq?= =?us-ascii?Q?5C68OmxoOITzdL7/kTL8qoSotGp0gUHTwHkaRMaxqlFe8XwmBE5Zg6FNlU7A?= =?us-ascii?Q?XSVhHkrvujo5nN8Y7ye+jnF6p/I010r3NoNgaR27xq06TRkD/WZFYNdqgV6T?= =?us-ascii?Q?29sihI5qyS4GiXmmLN6C9kKL11qX6ecJYE3w7aW+jzLjuISlrkI36StYWMsR?= =?us-ascii?Q?q0PVeGgYahIpQIbCk5PvgRFTyrjzlKBQsCCClyoL1dFqrp+DLwMPqCKTXOSR?= =?us-ascii?Q?VuDTwh50rUMhPMISG0k1/2YCydZtgGWyL9UQB2bH91RcAihm9klCvzvjzOv1?= =?us-ascii?Q?Tasu1koeWA3zHM4DLMTSFvcN94yVt73Ga/zOFUsqgz48fMwQa5cPj63WnBRa?= =?us-ascii?Q?c69CsIemYuc0zyINDUDaF5azUSCmtotfFFllUO4xhZKD79LQ4q9OzLdQZeN5?= =?us-ascii?Q?x4pIKV5VED3i8FuE6aXaG/Uc0wNyGUccr4XDQcg8LGN0PLrOihiB/r2XNdbZ?= =?us-ascii?Q?hFuy+nS1OgZSgGivCKduHxi+ZTlKY1/779aCKbpTzraDqerZtuMWi0P8v+75?= =?us-ascii?Q?bKjJxBhPrsuQaOa8QLmvtmxYDeyvdCuj4d+tReKE8EyBeJsu7mad6PWqjg?= =?us-ascii?Q?=3D=3D?= 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: 26 May 2025 12:55:57.4060 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ae6622d2-4cec-4fd0-b137-08dd9c54a88a 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: SJ1PEPF00001CE6.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7911 Content-Type: text/plain; charset="utf-8" A fence uniquely identify a job, so this commits updates the places where a kernel pointer was used as an identifier by: "fence=3D%llu:%llu" Signed-off-by: Pierre-Eric Pelloux-Prayer Reviewed-by: Tvrtko Ursulin --- .../gpu/drm/scheduler/gpu_scheduler_trace.h | 44 ++++++++++--------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h b/drivers/gpu/= drm/scheduler/gpu_scheduler_trace.h index 713df3516a17..6f5bd05131aa 100644 --- a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h +++ b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h @@ -36,28 +36,28 @@ DECLARE_EVENT_CLASS(drm_sched_job, TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *en= tity), 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(u64, fence_context) + __field(u64, fence_seqno) ), =20 TP_fast_assign( - __entry->entity =3D entity; __entry->id =3D sched_job->id; - __entry->fence =3D &sched_job->s_fence->finished; __assign_str(name); __entry->job_count =3D spsc_queue_count(&entity->job_queue); __entry->hw_job_count =3D atomic_read( &sched_job->sched->credit_count); __assign_str(dev); + __entry->fence_context =3D sched_job->s_fence->finished.context; + __entry->fence_seqno =3D sched_job->s_fence->finished.seqno; ), - TP_printk("dev=3D%s, entity=3D%p, id=3D%llu, fence=3D%p, ring=3D%s, j= ob count:%u, hw job count:%d", - __get_str(dev), __entry->entity, __entry->id, - __entry->fence, __get_str(name), + TP_printk("dev=3D%s, id=3D%llu, fence=3D%llu:%llu, ring=3D%s, job cou= nt:%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) ); =20 @@ -75,37 +75,39 @@ 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(u64, fence_context) + __field(u64, fence_seqno) ), =20 TP_fast_assign( - __entry->fence =3D &fence->finished; + __entry->fence_context =3D fence->finished.context; + __entry->fence_seqno =3D fence->finished.seqno; ), - TP_printk("fence=3D%p signaled", __entry->fence) + TP_printk("fence=3D%llu:%llu signaled", + __entry->fence_context, __entry->fence_seqno) ); =20 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(u64, fence_context) + __field(u64, fence_seqno) __field(uint64_t, id) - __field(struct dma_fence *, fence) - __field(uint64_t, ctx) - __field(unsigned, seqno) + __field(u64, ctx) + __field(u64, seqno) ), =20 TP_fast_assign( - __assign_str(name); + __entry->fence_context =3D sched_job->s_fence->finished.context; + __entry->fence_seqno =3D sched_job->s_fence->finished.seqno; __entry->id =3D sched_job->id; - __entry->fence =3D fence; __entry->ctx =3D fence->context; __entry->seqno =3D fence->seqno; ), - TP_printk("job ring=3D%s, id=3D%llu, depends fence=3D%p, context=3D%l= lu, seq=3D%u", - __get_str(name), __entry->id, - __entry->fence, __entry->ctx, - __entry->seqno) + TP_printk("fence=3D%llu:%llu, id=3D%llu depends on unsignalled fence= =3D%llu:%llu", + __entry->fence_context, __entry->fence_seqno, __entry->id, + __entry->ctx, __entry->seqno) ); =20 #endif /* _GPU_SCHED_TRACE_H_ */ --=20 2.43.0 From nobody Sun Dec 14 19:35:45 2025 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2051.outbound.protection.outlook.com [40.107.243.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0861F204592; Mon, 26 May 2025 12:56:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.243.51 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748264169; cv=fail; b=eTI/jw3qQFHqZZsuoQJ4iqJ0mTVDG7Wn6syERnvL8iT2fUOxfKrKLgcZupZ89AU/q8LFT3b3d1MANn0SlrOVN+UFn7sNsouv+ERfx5TtHhHhWygezr8qfsnWtxC+KDp7ljJ/h+YmQK+i0XzBNfubEKo7lZITstDKz36gPi2GzAc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748264169; c=relaxed/simple; bh=cbTuhlXspVpL/2Pp4StR6b4HAqnKUySfetvDbeGmBjw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=KT7FYgPaSX2HBifXEeCbA0yGHHGeqamfCB2eKK2/rX815p5U2xsXCcSWEGLN2DHPYwmA9WQIzXtCqVaLhFfPL075u7zZzWvJ+r+dOci8/ncHt2OJaNO3wamvJEEbO1JBJBtArH+KfB+8IOwNrfmO+It6RD8npJhEFjI5B5KT8Tw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=279k4V55; arc=fail smtp.client-ip=40.107.243.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="279k4V55" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kYLyz9AxR5v38OQY9DUmWFk15Y35RkaaYpeMEkWaTEtt/qR3g525rTiR0JmOWFG+zMZXlxlUmWzkxQhxYcr7vdy99ceO1Ju6NY1D7JO+jjSzWfwcw8N9xQ8f/ygxVJB1rAK3Yxx8SN8wYDIT9TzNVNpt87B2mZkc3HFJiMVxPzHp4ZFdGe1ZgJthm9MCG+Io7gW5k0r38ViDyhCJpYn0O0T4IMPVm/HMiiLZp1zpjH4oxCB2XAB9K7+pxT3wp2xCdN3dx0OdQpnblL3C8jvlSh+1CSUOMOGJ/NzR/ZDmKrTdJRHvBi3IwrdO/Sb4tGLS+a9OWaD4heOBdgalmG6c8g== 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=8vGanW5G+cl4+BNxxLumLfFtblzwjadMzyNYW0AStKk=; b=RGIHXGHzAkYAgY+llDahW9aSiEKBTiWyHeuOMIZxj+G5ugVxIkhpQIIZbVltclTmwIPi3NGBebBnW7qXzlUxfuWoXkudLn+LNLu3lVpaMTHL3GsN1daDn2apNMulSTpzpXEpgmO8C/Qud2NL/Su3ZQG+CTz+5WbxvZafhaXs/1G1Lr17I1/nzoO0spjZWbJcXKbwNK0K1x/0I6WKhMEjutv/mcL5OxpFvI3u7CmmPmlpMNv5BhKsxOjrnXOCGdvW4vF8tZCGWd6BaV3l8ScM5ZWGB6+PUpq692Vlc4EBuR706pew8fN9qXi5+cR1CH64nSjpXow/9J+xEboURl0Kdg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=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=8vGanW5G+cl4+BNxxLumLfFtblzwjadMzyNYW0AStKk=; b=279k4V55xdfdmrD2neBf6oqyTSYI/IRqPER9WBnNaJFg/Vj2l/dj5hgqgkzLNs4QqVEZmtpTZwbTVDjSpxEMwGsqSoojpXtCaBgW2DdMl8yZHRqIUagrUvXWTpYMH8BrqAsFlCc/g2nLl+o7PBDwhHnWPbfqp/6/wjpm9X1Ib9w= Received: from BYAPR07CA0033.namprd07.prod.outlook.com (2603:10b6:a02:bc::46) by DS0PR12MB8270.namprd12.prod.outlook.com (2603:10b6:8:fe::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.22; Mon, 26 May 2025 12:56:04 +0000 Received: from SJ1PEPF00001CE4.namprd03.prod.outlook.com (2603:10b6:a02:bc:cafe::9d) by BYAPR07CA0033.outlook.office365.com (2603:10b6:a02:bc::46) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8769.21 via Frontend Transport; Mon, 26 May 2025 12:56: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 SJ1PEPF00001CE4.mail.protection.outlook.com (10.167.242.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Mon, 26 May 2025 12:56:04 +0000 Received: from FRAPPELLOUX01.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; Mon, 26 May 2025 07:55:59 -0500 From: Pierre-Eric Pelloux-Prayer To: Matthew Brost , Danilo Krummrich , Philipp Stanner , =?UTF-8?q?Christian=20K=C3=B6nig?= , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Sumit Semwal CC: Pierre-Eric Pelloux-Prayer , "Tvrtko Ursulin" , , , , Subject: [PATCH v11 05/10] drm/sched: Trace dependencies for GPU jobs Date: Mon, 26 May 2025 14:54:47 +0200 Message-ID: <20250526125505.2360-6-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250526125505.2360-1-pierre-eric.pelloux-prayer@amd.com> References: <20250526125505.2360-1-pierre-eric.pelloux-prayer@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00001CE4:EE_|DS0PR12MB8270:EE_ X-MS-Office365-Filtering-Correlation-Id: e7676363-2c0c-47b9-5b01-08dd9c54ac9f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|36860700013|82310400026|1800799024|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?BUWvp7nA2NnNnNd2AP+lHd/6yaLa/zfZS89xQbN562MvFhC8HzGQbmdlfdd+?= =?us-ascii?Q?B5WTLScRUjtnwM/mDmpDTi9cOilvHyIxsO6VeR6WxogLz65Tjo4eqyZkD+w7?= =?us-ascii?Q?zvjlTKPoEIIdXKKRNGSSsPw43oUdOukfVHs7VhfvysZysbcY3Rvi08m+mJ0P?= =?us-ascii?Q?n8jwwB9sqQSdITxVgtjKPGkbNqu1mvA0yEKXMGadaZ1QLg8W2SH3MemTIOkr?= =?us-ascii?Q?3CewepcHVjFws3skE2LOhfRScYzkiwlkotKK3q08iNEitQ8Eq7PNSOVPnQ5d?= =?us-ascii?Q?QUq36VA6SbAQK13rCg+RLejydr62uYbAShBhSzaUvYm955yBijze6ErGkbwa?= =?us-ascii?Q?AOGKm04hFpAthjb1iWUPdEI+L17ttjvI3yTTGga60RilImBqVf6ASdqx2Ob/?= =?us-ascii?Q?F3OJGbIVMz6Xtqn7MT3+5cqympIXM5YjKQ5wuEiLyqXxX2QfT2mrCKBGN3JB?= =?us-ascii?Q?RLRCyJQGL+VJVGtbQfHZvZ3t/GXqCY/yfQTRHnXbBuPKQihftf2nzHS7DicR?= =?us-ascii?Q?6uSHohkHFNAn2zHjNEwuAx1HdeEkeyf6utsBbKXDqjaUfS9VHNgXBrqFlNLt?= =?us-ascii?Q?qNE45GN3Bn67JvEfo26h6kEwxa/wQJEtl80YHeAJ691RTNOQjT6Smblo3qY0?= =?us-ascii?Q?Zc4H9rt1T89+izbsHYOuNFQSbsWOgUmCz8JEaMX+nxUw2WtTIfuDlj05mLCo?= =?us-ascii?Q?l6P03xKQCklQtBycRBvZp5u4QEFOG6I18Imf5UKLrwuEmX+DlCAGrGrGj234?= =?us-ascii?Q?at+UUFA25bvYVlhHqv0G1/nlcJ86Bk9Xaal4smE5V2tR/GLrhoiLQVa8eL0c?= =?us-ascii?Q?wtkE4JCvR3e7BPVH67bprIyONEL34dAIGApMP+Id+qTzyQZUpiMk4AOboIlw?= =?us-ascii?Q?GaLpSmfrrYyv25DzVlA0+8Swo1ws8Ns/OPKRSkSVco58gF+qr6ho9ILhCP27?= =?us-ascii?Q?EwF66jNKwHGlIOzhcj59jofSMXXm4bam8LKpypGnp5xyzttwIRubae0O18nC?= =?us-ascii?Q?+KjeKk+WfGeGRaBTCM20EqH5SCKWsJt5pIBzCzBlnNCOKHofGueY+jl8S++l?= =?us-ascii?Q?iVNLbqjpnI50Hqj/n1z9XVkRF1DN305KR1GccQyIMct9cKXtBULsuiPAiXec?= =?us-ascii?Q?4NHh9/7/gsvkHQzuO1r40p/LCHSAepAXYQ7cUU30tPvdC3TuC2WVY/UO+o1p?= =?us-ascii?Q?udNrRwVRTY9VCyFMk//2i2vIBsBTDE0EHOAf2fUAmux4adEvgZvvX4M5AU8C?= =?us-ascii?Q?isglTasCYXoT/Rd5yj/Sc9/apK/Qx8y+aSeIrp7dCftl97O87h/WGiUj6lUo?= =?us-ascii?Q?vsiJe3mNHRP/sdcfsWyiyzk6U0eOQzNnOgT2KJfk8EGaMML8MQlxOPLEYl4v?= =?us-ascii?Q?YTN9JYm5afbkdGHHDv0wOFaPj68Wh6c0Ga5+s48NpN6rmRjMgF1sqXXlWRqe?= =?us-ascii?Q?L4Ky0drfbtZ20DxLMUZKUOmLZ9VkvciAf33IeYvGVD7//3f1sSyiojU+hTPX?= =?us-ascii?Q?9NxjMASdDvKTIUQ0xJvvOJkTJ8zXMOWnSlchFHfzAmTUVmkOlHAd5426sw?= =?us-ascii?Q?=3D=3D?= 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)(36860700013)(82310400026)(1800799024)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2025 12:56:04.2530 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e7676363-2c0c-47b9-5b01-08dd9c54ac9f 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: SJ1PEPF00001CE4.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8270 Content-Type: text/plain; charset="utf-8" We can't trace dependencies from drm_sched_job_add_dependency because when it's called the job's fence is not available yet. So instead each dependency is traced individually when drm_sched_entity_push_job is used. Tracing the dependencies allows tools to analyze the dependencies between the jobs (previously it was only possible for fences traced by drm_sched_job_wait_dep). Signed-off-by: Pierre-Eric Pelloux-Prayer Reviewed-by: Tvrtko Ursulin --- .../gpu/drm/scheduler/gpu_scheduler_trace.h | 23 +++++++++++++++++++ drivers/gpu/drm/scheduler/sched_entity.c | 8 +++++++ 2 files changed, 31 insertions(+) diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h b/drivers/gpu/= drm/scheduler/gpu_scheduler_trace.h index 6f5bd05131aa..5d9992ad47d3 100644 --- a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h +++ b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h @@ -87,6 +87,29 @@ TRACE_EVENT(drm_sched_process_job, __entry->fence_context, __entry->fence_seqno) ); =20 +TRACE_EVENT(drm_sched_job_add_dep, + TP_PROTO(struct drm_sched_job *sched_job, struct dma_fence *fence), + TP_ARGS(sched_job, fence), + TP_STRUCT__entry( + __field(u64, fence_context) + __field(u64, fence_seqno) + __field(u64, id) + __field(u64, ctx) + __field(u64, seqno) + ), + + TP_fast_assign( + __entry->fence_context =3D sched_job->s_fence->finished.context; + __entry->fence_seqno =3D sched_job->s_fence->finished.seqno; + __entry->id =3D sched_job->id; + __entry->ctx =3D fence->context; + __entry->seqno =3D fence->seqno; + ), + TP_printk("fence=3D%llu:%llu, id=3D%llu depends on fence=3D%llu:%llu", + __entry->fence_context, __entry->fence_seqno, __entry->id, + __entry->ctx, __entry->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), diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/sch= eduler/sched_entity.c index ff553d8dc5f4..8c1589f476ae 100644 --- a/drivers/gpu/drm/scheduler/sched_entity.c +++ b/drivers/gpu/drm/scheduler/sched_entity.c @@ -586,6 +586,14 @@ void drm_sched_entity_push_job(struct drm_sched_job *s= ched_job) ktime_t submit_ts; =20 trace_drm_sched_job(sched_job, entity); + + if (trace_drm_sched_job_add_dep_enabled()) { + struct dma_fence *entry; + unsigned long index; + + xa_for_each(&sched_job->dependencies, index, entry) + trace_drm_sched_job_add_dep(sched_job, entry); + } atomic_inc(entity->rq->sched->score); WRITE_ONCE(entity->last_user, current->group_leader); =20 --=20 2.43.0 From nobody Sun Dec 14 19:35:45 2025 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2084.outbound.protection.outlook.com [40.107.237.84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7DF801F8AD3 for ; Mon, 26 May 2025 12:56:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.84 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748264173; cv=fail; b=g2t3Brkt4446knrZ90SNPvfgZvnZDsNuhhD+r7M8XWHxn3HlG3WPuVMsMynCp1nkFKkYrUNBOmGsbHxEVnDArORHNvBNeJZSFJ6so4eOJMiIfEs6QX+DKpIWZ22YQrF4YPIltORcuVPrEY9ZPx4snyo8umcddMRtlujnISD3BiY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748264173; c=relaxed/simple; bh=sPU6I5qFZSIYB1HFIIkGmyq/fnr4Borz3jLMN7SOVBY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Jr9oJCgHyd92HP+phSzHkf2UoEDxFOZRwGf+xTzQ5NJkKGL4nwlpg8HRKC37HB9tz4RX+r0zgUvjkQjkdEWMBCaTU+mrLv6iLw9GxV8TiOsAQDRBAUiaKUx+fMG3aYGmVd3+9gpwXsth3IusTbfKSF/u/oYkJ+XprciVAF/gif4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=jIXcFWCb; arc=fail smtp.client-ip=40.107.237.84 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="jIXcFWCb" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=lz79GpyPAgNwWb6SFLs73L9RjE9JWtnkw6EKq3JYeEoPWBgKdu+4dYvFIOB52lXzM3BtMTmwNYazGY/4sP8FgSLIsnnkgzQWK/R/CUcukZUYK7tfVJnZsSbqTiMLMliyL1XGAoTWo3kpaqCsScEk7Be2H45y9e9oQKg6IOWZZs2sWhehrTXvYdl9oKueJyKGcNP2p61O6sv9Rwyyz+QmPvGbEOCQuUd2y/Vqvo9zMddYOE3mgSdPz7Pa/T6DBcXWXslbNLvCgenkTaXS/ljdXSf+kt3LtUIAAkWsLCujEB1LFSnGS7RSBmSbc6OE/bw2jgLbbyWLEFMlAvWjkqOV3A== 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=lFXFoCODN4SBN7bXLAC2jHegIZHMz/4Vz8lWODQmisY=; b=aCN8s0Xot23dq7l8SBQb5pdROGI5Lf6EzdKwYL1D2NO/NHDXz+o8wWLg+QuXUi9LG/lNPYP8le4a8L1IuRA0A2cK24tG/Nq8lqYIlqouCu9FqytZHS86aLgp3uOozTgCsB+O/3BurfHfMxqpz3+b+xZbD33hK2qfah2lEFn/rOJTUmM7cOM/1ZAUjVMJ1bOPdWXyMN7OTLYgM3pKdFpb3YpWyxOU7y88dJG/UeKvZK9+TbNKOOhZh3/8Fcp/rxBfW1t/PiIYMrL9NvPI3OZ2KTXBccdHMVANHGTgmR1sO9SQwmDEl6fKe/fMYCv7juvCUnWmhSGqn2+4kwkP380FUQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=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=lFXFoCODN4SBN7bXLAC2jHegIZHMz/4Vz8lWODQmisY=; b=jIXcFWCbwHBaiZOL5Qx898txx1JRudXUAgJmCzUe+c9QzpbahlcOpvt5uNup+2pjTsrDbJi+wMxUPvFB3tzztZ4XlU9coAO92ucgM+VUtDF/IM2iz/2ttvgSAbcC0ChiySsROsIykrNVq1r9zuKwG0Rea6RU0lKWbr2QBrHVrHY= Received: from BYAPR07CA0036.namprd07.prod.outlook.com (2603:10b6:a02:bc::49) by CY8PR12MB7587.namprd12.prod.outlook.com (2603:10b6:930:9a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.24; Mon, 26 May 2025 12:56:06 +0000 Received: from SJ1PEPF00001CE4.namprd03.prod.outlook.com (2603:10b6:a02:bc:cafe::52) by BYAPR07CA0036.outlook.office365.com (2603:10b6:a02:bc::49) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8769.19 via Frontend Transport; Mon, 26 May 2025 12:56:06 +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 SJ1PEPF00001CE4.mail.protection.outlook.com (10.167.242.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Mon, 26 May 2025 12:56:06 +0000 Received: from FRAPPELLOUX01.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; Mon, 26 May 2025 07:56:03 -0500 From: Pierre-Eric Pelloux-Prayer To: Matthew Brost , Danilo Krummrich , Philipp Stanner , =?UTF-8?q?Christian=20K=C3=B6nig?= , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter CC: Pierre-Eric Pelloux-Prayer , =?UTF-8?q?Christian=20K=C3=B6nig?= , , Subject: [PATCH v11 06/10] drm/sched: Add the drm_client_id to the drm_sched_run/exec_job events Date: Mon, 26 May 2025 14:54:48 +0200 Message-ID: <20250526125505.2360-7-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250526125505.2360-1-pierre-eric.pelloux-prayer@amd.com> References: <20250526125505.2360-1-pierre-eric.pelloux-prayer@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00001CE4:EE_|CY8PR12MB7587:EE_ X-MS-Office365-Filtering-Correlation-Id: 0c19b668-a0ae-450b-fd20-08dd9c54adce X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700013|376014|7416014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?dFBtSGs3MjZBUHI2MzAyZGFsRm5DcU42THJzK0FYRERJV0lGaUl5YzJua3BN?= =?utf-8?B?Vk9qdzM4Yk1hSERQTlRhdzdrVlpSZlRyamtQY0hPcDA3MzRmUDNsWW1DZGQv?= =?utf-8?B?OWp2K2oxZ3NManExU1hyQmUyM21VSW9aWC8xTFhKaW8xQWhVWFpScWVQdWJI?= =?utf-8?B?ckxhak12bFBML0ZKemNlbXBiMVkzRjZrTkxzMUgrOXUwV3BCQk1SMlBDRDlO?= =?utf-8?B?Y0trMXlZVU5xdGtDeHFrTWVucmxhOUphUy9oU2VNYW1RYlpNNTRDR3RFRUQy?= =?utf-8?B?L0FVSDNJcVU5MDJhOG5pMEEva0ZqL29vUDdyR3Q5UEVIWWE1U3N3dzhHRHZ1?= =?utf-8?B?R29PSlNLWFRSVmRDK3hGQndPNFpiaWJIb1UrTjVDTi9TZnV2c3J4WmRaOTRt?= =?utf-8?B?eTRocU1kSnVNUlJnZGJEZUZMa3ZxM2pJb01FTGZrL3BHWEZ6Q3VESm9VN0k5?= =?utf-8?B?TkpvKzZ3RkxmdWhMTU85MnJkQlkwcTB3NndkSDlFc2dJVmNPZWhBYmY4T2kw?= =?utf-8?B?ektDVDBBL0llU1ptMGw0d1F5bzVya0hQODc2YjZubWdBcENkUVV5T3FadmFK?= =?utf-8?B?NlZVSmN3QnpLMjhRVGJGaFhSOEMzd1VleUVOTHc1bHFtdWl4bEE1eDZlcHdp?= =?utf-8?B?Z3FyTlM1MEdUay9ZVVdTaFpOdjVsNTcrWERscDEvTDdsMit4enFpa0hobzNt?= =?utf-8?B?WlBXaW9zc2MwOUN5d3RpVnpnZnU5bVV4MDd4cjkvejcrYzRlOVFTMndEVFhF?= =?utf-8?B?ejVnY1EyVVNLeTA3c1NtQk1SVTF3Y2lCbkJnZ29ucDRGUXRmaEJpdWd2UFdx?= =?utf-8?B?VCt0RHpMWnJmS21zQTBhUXhlSUF2RTBCRWFDK3lYK3FYbHVsUm1UZnNPWTlD?= =?utf-8?B?aE9wM1FpSVBIa1JzaHplS0JEckQ3cnhmekdrK3hEMldpMUEvR0YzekFRMVFl?= =?utf-8?B?WWl1VnNZTTVXZHNmUjR0cDdDM3ZXUWN2b0xKR2QrNm91L2VLQ1JzLzZuWjBy?= =?utf-8?B?em42Wk9IZ1plNk55emYyYlIvVFlUWkJMMmtRZmswR2x0STBCSmJFT2JhK0ty?= =?utf-8?B?ODZiejZmY0RRU3NUWXZLWnlUdHhXR2NLT0lEdnhwVVEzZlJUSzRnYWlFbllP?= =?utf-8?B?MFNmekQ5NDUrZnhJQUppdDRNbzduQy9TV09zSWd3QXpaeE5LODFqa3M4cjV1?= =?utf-8?B?d1g4bEo4dGgzcnlkNktORG1wSXFDUi8yeGdUeFREbmRQM3Q3RFJCNmdCRVFq?= =?utf-8?B?b3VINFdIdGFKd0xJV0NRNkNlQzUxQ3dweWVOckhrZGo1Z3lQYUs3TGFieXY1?= =?utf-8?B?eGdyNndBV1pXV2dUc290OFFtZDU1YmdYT1ZTZ1N4ZlZZaENmdTBGNnNITTVs?= =?utf-8?B?ZEZkQTdWaXc1bmJtS1lQN1dabUY0M1lhS0pnb1I2ZUtPQkpkLzJEcXBEbWxK?= =?utf-8?B?MjNzaERLanA4VmxLN2NEVXpvYjJzQTAyMVBNdVZwRzBoUFY1MGRwcTZkNkJH?= =?utf-8?B?K1pvcHNjQlk2OCt4L3ptSVJNUXRFdHovcGZxc0xmdGNkd1dCT2JNL1NmUE5t?= =?utf-8?B?UmRubkNJckdETkVGaExvcHF5a0didjhlakV4QnlYUzA4K2lUc3YvSzV3VldS?= =?utf-8?B?QzJLRCszTkJkOVZoTUNmb1ovZWVNeEljOHlXdUQ0MUxyL0FuZHFYT21qSXJW?= =?utf-8?B?Uk53eGZTNjRKbGdqZFd3QVQ2bUN6M212eXZDVTVVWmtlaEovSVNSZlVVeHVk?= =?utf-8?B?cVB0VFZKUEU5UUFVWmtWenpJSDZJeDNLcVQ3cUdseCtmemFYbitoU1FLQmhh?= =?utf-8?B?K3hZcnVPV2dxQ0hmMS9BZG9DY3RPVTNTVCtVZ2diSmxaSFBib3BqSUJIZkxD?= =?utf-8?B?WFFIakVOVVdza21oNmNiOU1FODBIZGxmZTZtSEpjcFpIajAyMy84YThsUlh6?= =?utf-8?B?ei80SnNjQkIxOHB3NzFteTExZU1NMUZLUHBoL09BNVoyL0JpSHZTY0M3ZnBt?= =?utf-8?B?ak4xQlRjQVNrUzVIVGlxZVMrZ1JKQ244Tm9WSW5naS9TUkNseitLOXl3THRD?= =?utf-8?Q?j1Agqh?= 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)(376014)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2025 12:56:06.2424 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0c19b668-a0ae-450b-fd20-08dd9c54adce 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: SJ1PEPF00001CE4.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7587 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. Reviewed-by: Christian K=C3=B6nig Acked-by: Philipp Stanner 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 5d9992ad47d3..38cdd659a286 100644 --- a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h +++ b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h @@ -43,6 +43,7 @@ DECLARE_EVENT_CLASS(drm_sched_job, __string(dev, dev_name(sched_job->sched->dev)) __field(u64, fence_context) __field(u64, fence_seqno) + __field(u64, client_id) ), =20 TP_fast_assign( @@ -54,11 +55,12 @@ DECLARE_EVENT_CLASS(drm_sched_job, __assign_str(dev); __entry->fence_context =3D sched_job->s_fence->finished.context; __entry->fence_seqno =3D sched_job->s_fence->finished.seqno; + __entry->client_id =3D sched_job->s_fence->drm_client_id; ), - TP_printk("dev=3D%s, id=3D%llu, fence=3D%llu:%llu, ring=3D%s, job cou= nt:%u, hw job count:%d", + TP_printk("dev=3D%s, id=3D%llu, fence=3D%llu:%llu, ring=3D%s, job cou= nt:%u, hw job count:%d, client_id:%llu", __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, __entry->client_id) ); =20 DEFINE_EVENT(drm_sched_job, drm_sched_job, --=20 2.43.0 From nobody Sun Dec 14 19:35:45 2025 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2050.outbound.protection.outlook.com [40.107.244.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2072A207DEF for ; Mon, 26 May 2025 12:56:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.50 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748264180; cv=fail; b=ai6oOjfjcS76Ekg1wiiP/HlVBExAWl9iThtrz8U56qxvERrKBC6HKnxLg4UFtZlUxuWeqUCTzO7R9EYQDgDIIrNjnsDpK1RVv1RSs+TQ5XdtLixWmF7wUogtrWqWGCmsgASyWwhbyOd5LK0pKNkCK67DZ/WWmjZp72EuYm9SakQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748264180; c=relaxed/simple; bh=ts++vl63b0jy1Ha/0YYtsmoYJj7/18zb6XqKeGZ3TOI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Q9jc1CRpcvCUYLGXkYNKkutlH35Y2yAzIIi7PKEsi+YlAlWFQbBpGdcJxMmyOfq3Wj84pFDfM5wXEQkxnLVGVhsgHLFtKsoS69OlnemOpDRCIgR2D0pY5Im9obcqGm2pfb4Q5HhRyzsvhYSyDeL3RdC7B5YgDjtxDVHyc1Qxn9g= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=tIzkMcT6; arc=fail smtp.client-ip=40.107.244.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="tIzkMcT6" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=koFmDx7MHHwGQy6Zg/KU45MslPfzuQV9qEn5CS7maKDRbigcJ9iRfZC6b5JV9Znk9sX6EcWXp3BTrklhIz3Cicrxl+HZHhmB/WIBHwMNmLHnRZft3tZsXZpGFaq8u+aVEBK2tmpUOkZKhkmU/mdA6nB6r2Sb1ba/L1Jzm6xcl/dJXxA8rndsTlaS8AJh91iOqyGWw/2aRHc0yRcO732IuSRCEsddegpo/JRMrqTeJ44cjUlX7cWWtczwuBsAFxIWdwqnxdGL0FktQpmFEhAA9ClBbKXw6C0m1ivEi+u/KTU7D4NBeWh3+TLR0mBCxzx3nShfrcCLLPrey4M6AfLtSw== 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=KMD0bI0xdrGrvW7XnH89D6p4EE2EPeZChFkD28qnu4M=; b=GlMsgy8y85crbOExqd4iArN+dPQxaKiDHAYAOn2z9i1y6TVFy7gaPPapS6+ZiLAaCikRPZwKhEKwdI6GM2XboXSGMipBNKZ2U2cmztbDMmb9BCMURCVqUX31BAExouO/VU/GqOnLVmv9OYkCZ7ZPOjP8Qm5oHQluO6UdCcPE7WbCZkZMCuD3z2JvzfbeGoV81PpmDsV+iXeuD6YRfedYL7gycJ1FVxkuVG6I8YqsJhdZqFcfIQvmJ9Li41h0vQESF2+9W67mg5hC/tWQ5ovcXSViQzKy8Jk/HZ/cN9hJqocJgY3yvtJ91OI4aIcrb0Yk4X9+yTNZyu80oWkIXSi+ZQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=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=KMD0bI0xdrGrvW7XnH89D6p4EE2EPeZChFkD28qnu4M=; b=tIzkMcT6yrMI0BdtPRB0cF76E/dhhpNijN2uGGX19yjODlS+IzrYZxmeKfXNoci9glz11L0Nu9NdaemRqGhhZ/ZnVziWr/AuWY548gGEEEG8wAnl0eTzo6q0F7DQfZD+GJKriI+/4bQyJbysluHps4J77RXt5XefG5OuAI8z0kA= Received: from BYAPR11CA0096.namprd11.prod.outlook.com (2603:10b6:a03:f4::37) by DM4PR12MB5938.namprd12.prod.outlook.com (2603:10b6:8:69::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.21; Mon, 26 May 2025 12:56:10 +0000 Received: from SJ1PEPF00001CE7.namprd03.prod.outlook.com (2603:10b6:a03:f4:cafe::fb) by BYAPR11CA0096.outlook.office365.com (2603:10b6:a03:f4::37) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8746.30 via Frontend Transport; Mon, 26 May 2025 12:56:10 +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 SJ1PEPF00001CE7.mail.protection.outlook.com (10.167.242.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Mon, 26 May 2025 12:56:10 +0000 Received: from FRAPPELLOUX01.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; Mon, 26 May 2025 07:56:07 -0500 From: Pierre-Eric Pelloux-Prayer To: Matthew Brost , Danilo Krummrich , Philipp Stanner , =?UTF-8?q?Christian=20K=C3=B6nig?= , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter CC: Pierre-Eric Pelloux-Prayer , "Tvrtko Ursulin" , , Subject: [PATCH v11 07/10] drm/sched: Cleanup event names Date: Mon, 26 May 2025 14:54:49 +0200 Message-ID: <20250526125505.2360-8-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250526125505.2360-1-pierre-eric.pelloux-prayer@amd.com> References: <20250526125505.2360-1-pierre-eric.pelloux-prayer@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00001CE7:EE_|DM4PR12MB5938:EE_ X-MS-Office365-Filtering-Correlation-Id: a1067589-e7b7-45e9-228a-08dd9c54b069 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|36860700013|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ZhocWBTCn5uzxug0Fn7kcrrQuflwSSFFTsSH9/HBU/dtEhCssonjktTQZQlH?= =?us-ascii?Q?ns+oSZNUaN23yS0Ev+PqfgjUH3trBkjBm0QCjTp66VCYmZqsBVoBnUcFGnpi?= =?us-ascii?Q?zTjg/21unNWcucvRv1y5mV4l4KrYOy/vdlCERChHmFOlLYsHZbVNx6/Wd8Df?= =?us-ascii?Q?V0xTgTfSSrIVtZ7dE+tcLI2VvkPXFS/oQQt0gSEOMbqYruKxtqpDWT9bsCWQ?= =?us-ascii?Q?7reF/8M2qcy6jN6Mmwq8U4szn37Nrvy9ty4V03ZxwrDCStTkLPU3U3oGR9Rl?= =?us-ascii?Q?6YsNq5MgI0R5+vFTRAN0Jq8D5uAxt/Ovs4T7U++Sf080dpUslu9+rJhWHP8v?= =?us-ascii?Q?vvm1fkpsKaQXt2hOqifzKEae4t2wBr570Bx/wVJj1gmAuPK8+rtavdO/p92z?= =?us-ascii?Q?r33u9QVRDtYWyvnB0CfXjHXUc+A9k0CgzZ/0ntURRXacoFn4lT2G9Cx6fREz?= =?us-ascii?Q?D3FAmadwtYSv5gvwZ2SpZgawVrNa7h4J5+KHEOyUd8yu3WSFndTtrwJFSJSv?= =?us-ascii?Q?sejl7kZhgphhAKLqIjPqNYVzSlyWdgcinq7+wuDy9ml2Rnj2fI7ahS4nM5oy?= =?us-ascii?Q?A1+gq4GcSnFmx/PwU0M6V81xhEOkvTIAAnzpfptYWoxQk36gbcN58FoJLR8q?= =?us-ascii?Q?bxUKC4e8zDTwChO1KTxQeo195D8ohzJdsrkZ95wxJLGHHgpSu2PcZBi4HyPy?= =?us-ascii?Q?642T0gZKnIgx+b9XY9JCXjz+q9SwViOfrs+n62K9WI2QaE4van6IdaXWG2Y6?= =?us-ascii?Q?MADTWr1L1VHYbdn3E6bVRaIFXsRa/0f3DzsJ+25jsJPpBC3VxRu30tRP9DxG?= =?us-ascii?Q?IRjqPQhBUh4JzlPgiO+KrwJwYWZFvwyjX2vRVqUrPIjePeZdesZht7SAB2w8?= =?us-ascii?Q?KthNn950Zzqddz4VUDFBuIldibNUm+Sfs4nYOo6re5lopjUIRABK+7HPWKY3?= =?us-ascii?Q?9U5mAAdLUR8rtQ60d5QM2JtlCXjaFTQkN2+yZOf4a97krEE4nFh3wFv7U8/D?= =?us-ascii?Q?HQSTm/4uJET4yNXqG7Bc/3HOOrWUGGWjkUkP27/iwidoNCl3l1L/S6eA6PCa?= =?us-ascii?Q?QarlOsx/XKNZbzwySFjF6lmxB2/QhQX3ToM0DrjdzUnvEV8AuLU8GmtDYaP6?= =?us-ascii?Q?blt4nC9+/A8B2k7j1E7gY7VHmK7RWzXSPd4764m1a2RvOOtYZqFTsLlsGBoV?= =?us-ascii?Q?v9d26vmVxJjtbKl4RfdyNwTLk7AAXUDzLzMSEWABOxq06hTnMRxVKVV+znEa?= =?us-ascii?Q?8eAk4TJaJHpk2BO1b+MnBpn55a9Yxjpc+iKsao5L0We/RAe8ujA265KCAsI9?= =?us-ascii?Q?xTwGOAZ3vOGESfGGk4NZ07YZMEtpxrlX6bkeTYg6lHLxYweFXlrca2x8EmMp?= =?us-ascii?Q?gEZ/SVQWEc+rUjRKh82N+RyjFqlzU0rPZ+bk9iMi782u46ltckBkwdXt8gqw?= =?us-ascii?Q?5cqIz7Le1UVN/w8h90xd43SxgKOjN4IGj/cTxas623fCPtftUBP54/o5eII5?= =?us-ascii?Q?E6itP2lMdW5xkZwkCfjCzExWKLhHFuBLbMqC?= 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)(36860700013)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2025 12:56:10.6087 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a1067589-e7b7-45e9-228a-08dd9c54b069 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: SJ1PEPF00001CE7.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5938 Content-Type: text/plain; charset="utf-8" All events now start with the same prefix (drm_sched_job_). drm_sched_job_wait_dep was misleading because it wasn't waiting at all. It's now replaced by trace_drm_sched_job_unschedulable, which is only traced if the job cannot be scheduled. For moot dependencies, nothing is traced. Signed-off-by: Pierre-Eric Pelloux-Prayer Reviewed-by: Tvrtko Ursulin --- drivers/gpu/drm/scheduler/gpu_scheduler_trace.h | 8 ++++---- drivers/gpu/drm/scheduler/sched_entity.c | 8 ++++---- drivers/gpu/drm/scheduler/sched_main.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h b/drivers/gpu/= drm/scheduler/gpu_scheduler_trace.h index 38cdd659a286..4ce53e493fef 100644 --- a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h +++ b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h @@ -63,17 +63,17 @@ DECLARE_EVENT_CLASS(drm_sched_job, __entry->job_count, __entry->hw_job_count, __entry->client_id) ); =20 -DEFINE_EVENT(drm_sched_job, drm_sched_job, +DEFINE_EVENT(drm_sched_job, drm_sched_job_queue, TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *en= tity), TP_ARGS(sched_job, entity) ); =20 -DEFINE_EVENT(drm_sched_job, drm_run_job, +DEFINE_EVENT(drm_sched_job, drm_sched_job_run, TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *en= tity), TP_ARGS(sched_job, entity) ); =20 -TRACE_EVENT(drm_sched_process_job, +TRACE_EVENT(drm_sched_job_done, TP_PROTO(struct drm_sched_fence *fence), TP_ARGS(fence), TP_STRUCT__entry( @@ -112,7 +112,7 @@ TRACE_EVENT(drm_sched_job_add_dep, __entry->ctx, __entry->seqno) ); =20 -TRACE_EVENT(drm_sched_job_wait_dep, +TRACE_EVENT(drm_sched_job_unschedulable, TP_PROTO(struct drm_sched_job *sched_job, struct dma_fence *fence), TP_ARGS(sched_job, fence), TP_STRUCT__entry( diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/sch= eduler/sched_entity.c index 8c1589f476ae..0b42e1aa7039 100644 --- a/drivers/gpu/drm/scheduler/sched_entity.c +++ b/drivers/gpu/drm/scheduler/sched_entity.c @@ -476,10 +476,10 @@ struct drm_sched_job *drm_sched_entity_pop_job(struct= drm_sched_entity *entity) =20 while ((entity->dependency =3D drm_sched_job_dependency(sched_job, entity))) { - trace_drm_sched_job_wait_dep(sched_job, entity->dependency); - - if (drm_sched_entity_add_dependency_cb(entity)) + if (drm_sched_entity_add_dependency_cb(entity)) { + trace_drm_sched_job_unschedulable(sched_job, entity->dependency); return NULL; + } } =20 /* skip jobs from entity that marked guilty */ @@ -585,7 +585,7 @@ void drm_sched_entity_push_job(struct drm_sched_job *sc= hed_job) bool first; ktime_t submit_ts; =20 - trace_drm_sched_job(sched_job, entity); + trace_drm_sched_job_queue(sched_job, entity); =20 if (trace_drm_sched_job_add_dep_enabled()) { struct dma_fence *entry; diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/sched= uler/sched_main.c index 34252bac83b9..e3679f26f724 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -401,7 +401,7 @@ static void drm_sched_job_done(struct drm_sched_job *s_= job, int result) atomic_sub(s_job->credits, &sched->credit_count); atomic_dec(sched->score); =20 - trace_drm_sched_process_job(s_fence); + trace_drm_sched_job_done(s_fence); =20 dma_fence_get(&s_fence->finished); drm_sched_fence_finished(s_fence, result); @@ -1234,7 +1234,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); =20 - trace_drm_run_job(sched_job, entity); + trace_drm_sched_job_run(sched_job, entity); /* * The run_job() callback must by definition return a fence whose * refcount has been incremented for the scheduler already. --=20 2.43.0 From nobody Sun Dec 14 19:35:45 2025 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2071.outbound.protection.outlook.com [40.107.223.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CE60320A5EB for ; Mon, 26 May 2025 12:56:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.71 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748264183; cv=fail; b=R9r8bGyUsr8VSXhp/BZH/D7riy+YxTUzvRfpsvd/4s6hu/ALsZ+SLrm+QmPAANF6iJz9CCha7Abm23YARUExMubLVe/Na1r4r3ELfjPOoqgNFvK8MITXszXWhPfnWSWoJA8wn/JEgeYDkiYW7GfUpKsUhu/zBN29XLSv6YsDHUo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748264183; c=relaxed/simple; bh=JLoszNB8SLuk0oSd4+fmDwtYrXk7rRuTT49vxGqZeLI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=PbtJQHTw1nu2nQD88xMNid+c01mYTlSGQp5f03T6pCCAAR7XVX3Hs5NU5/kgrOoWkXY7Q1LMg6/5u95vj055heMomlrDekVpeLU7GzfR9EEqFNQFg2CsC9iOG1Xpo1+1YKHLy11D/t0t/FZxplSrZDDTp5V0n6C4/bLbgwjPxmo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=iQYkZ8UB; arc=fail smtp.client-ip=40.107.223.71 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="iQYkZ8UB" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FE/hTSXJn1MAobSiGbWwvt1ffAPnBLAj1qOrkd1PLaGWJ8Zp+6PHhPWwDTfo9B1xZ2fbftxVvATZsqx4E8DuAne2+TSccdjwztPBInhIeFOpDE7WfNaRaQVH/3+mc3dVN8iPtfLRGBsMLCftHApdlSDmQDSCheJ8GOGn0h3g6iJvbSzuuKWEpwYEKJAIC9R+ssUQwj3Hbql60tdGCkY0xNKgIF31TJVF8Yuef9sQ2GTOF+ZaptpyF5NR4IO0d/HFMVmPJUIP7nwz0aFMBN+YuptDXEQofO74wugsEeiVhHWpxny21bG9rElgH6wDtv3tz3w4OrL50l6x9tVxKmcljA== 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=EPnXzD0KJxJJQYtwJjPmIBHC6oxkoYOlNi+gipIakdk=; b=gTzgmb/y5jRM6GwU2FFLvsA/0IKmoPiiELkU2JFS0YIe0ebkGISyl9DBOE9ZhxY9PZm8Q9xFTDH9C/LSjbUnrxUTAAjLzkLrBl2jjrGhGtiRvZmOgjlNKrwxGT6rIk/H5P7RaHgs4L+Dpl2szte/bcAxMTD3jdtbfVl0V8WRTG+aBdKDDgWEIAs2lrwOqql/dO2DVAk7gA/lz3qh6eWkkb6qc+4ZDhIjCISHGlSxHHx90UMukObq2QdB/GlMKfm5yoVGDOyyQ//3/zr4pIvseZY6qMVGLf4jrLyw27mnQn/VZ4e0RDOCHOiMS8iFowomsyDY3FdvHjDGJBKWLYcMfQ== 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=EPnXzD0KJxJJQYtwJjPmIBHC6oxkoYOlNi+gipIakdk=; b=iQYkZ8UBInxvpSgB2/VCJNmXSrQV9/FOUP5P9vdPQU/MXdtMAm1A6jlHoT4ZYf1a4Aetfa/FlNkmFAExpOH/1Leuh7kii+rrpXCdcK7ZjbmHrzwzI7aVdJK9Aly71ulp/qI5cVODb8G8X55EaCrmBp+tYnZZFJXKJm1Gh3xktIg= Received: from SJ0PR13CA0130.namprd13.prod.outlook.com (2603:10b6:a03:2c6::15) by CH1PPF7A6EE32B1.namprd12.prod.outlook.com (2603:10b6:61f:fc00::616) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.31; Mon, 26 May 2025 12:56:16 +0000 Received: from SJ1PEPF00001CEA.namprd03.prod.outlook.com (2603:10b6:a03:2c6:cafe::7e) by SJ0PR13CA0130.outlook.office365.com (2603:10b6:a03:2c6::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8769.16 via Frontend Transport; Mon, 26 May 2025 12:56:16 +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 SJ1PEPF00001CEA.mail.protection.outlook.com (10.167.242.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Mon, 26 May 2025 12:56:15 +0000 Received: from FRAPPELLOUX01.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; Mon, 26 May 2025 07:56:12 -0500 From: Pierre-Eric Pelloux-Prayer To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter , Qiang Yu , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Matthew Brost , Danilo Krummrich , Philipp Stanner CC: Pierre-Eric Pelloux-Prayer , "Tvrtko Ursulin" , Arvind Yadav , =?UTF-8?q?Christian=20K=C3=B6nig?= , , , , Subject: [PATCH v11 08/10] drm: Get rid of drm_sched_job.id Date: Mon, 26 May 2025 14:54:50 +0200 Message-ID: <20250526125505.2360-9-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250526125505.2360-1-pierre-eric.pelloux-prayer@amd.com> References: <20250526125505.2360-1-pierre-eric.pelloux-prayer@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00001CEA:EE_|CH1PPF7A6EE32B1:EE_ X-MS-Office365-Filtering-Correlation-Id: 2b8e889e-93d8-4110-adfe-08dd9c54b38a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|7416014|36860700013|1800799024|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?cHo3YjNBeHpXNDgwdEpKaXltd2Y1a2lWaTVCcE1vYmk2WVVHbjNKL1QxcEVG?= =?utf-8?B?TmxqZDd1RVprV0lra3k5VGhXcy9qQ2pWZTdqeFQzT1hJR3c1YUx1N25wQVEz?= =?utf-8?B?dHFQanQzSkZtcWtlM2NzVktUMnd6Y3hONmFvdXhTOURFU0ZTeUoxcnBBek9H?= =?utf-8?B?ZCtQTGN3aDBjT3MvT3g4em92TGk0QllDQ1phSVQrWHIzQWpHbmRGb09POHcz?= =?utf-8?B?T1gzVVhaWi8xV01ZRFdnQlBMZWxEajMrd2lPQVAxYWlFUzJJZHhsS2NieU11?= =?utf-8?B?NEgwN2NsWmJqdzRSMzVKcXlWWUdnTzhBS3BVeXFWdElUMXJaTHhJdWN4QWZC?= =?utf-8?B?dFVRRUZlTVUvakpFRW5kWjd3ZXRlM0o4aHc5UzNOTkV3c1FlN3BTNm5TUkk0?= =?utf-8?B?MlVyaVZxZHg1TFBIdmtmVzQ2RCtvSWVyODNTWkZGaEdjbG1iNTdJVnRBZ20v?= =?utf-8?B?SzBoN0plSzB0OVcyemZ0RzBZQzRQbGRNSFZENFJTRGdHYnBMcHhZODVpTjB3?= =?utf-8?B?enNVeDFRQ1RUZHNWMVgxY3JrRlRvRWNYZ0lxcmFQbnBQenlWR0cxeDBheXFY?= =?utf-8?B?ZUs3QmpkTC9FWjZRY2N4RDJQazIxYTkxM3YrNWNnNFhuR0RIRzR1SDM5TUcv?= =?utf-8?B?ZTFKUU0vdnlJUzJNNi9ESHc1d1FvaCt5N2F0Skh3d3Zra29FMkwzZStjYVBQ?= =?utf-8?B?U0k2OC91bGtrVGFiL1NNYk91K1l2VXk4eVlYdEkxZFR2eVNGR2NLdE43eHlz?= =?utf-8?B?Q2NpampFYTFRL1BESDFhYWUzUi8vTlo0R1RCQTRndE9aVmZ2Zkc1WnV3RnpV?= =?utf-8?B?MmNZWUlmeGFiaThWMForN3pHT1FERXRodCtobW9iN2ZnZnFjcVJWZ1YyNEZB?= =?utf-8?B?c2RSRlZzVU9zU3pXODBUdUdQQlNuVzQzWGhic2QrOU5tWVZKS1lvcC9kd3lh?= =?utf-8?B?OFJHck1hSWFiemloZnQxSGVqdW1qbGdKcktDem80ZmpUOTFzUnJCRnc0a0tz?= =?utf-8?B?bU5oM241S3lDeng4OVAvRnZtNWZGTWpSZXh2WVBpNzlteWNJR01RU3F6SENT?= =?utf-8?B?VUxVZFBOWXg4SEdQWENTMVpyaHJRWm9nSGZCVlMwYWh0OElmTnVSb1lDbkZP?= =?utf-8?B?M2NvaTlCUHRoeTVyNjhOMmwzWVJTMmZVbkxKMHkwY0lkQ2U5L0tuSGNwL2Jh?= =?utf-8?B?NXNPVStXbERWOTFxYTdUTnRKOTk2RHFUdkQrWHcxeENwNjJKRG1wbitrOFVo?= =?utf-8?B?UkRUUERIMmRlSTlxL2ZlbytiRGhYV3hTWGxTSFFZL0ZRMU9GWXdJaStFYUFG?= =?utf-8?B?QWVBRGZMMzJ3cytiVlFJMi84eEdzMkxBeEdnTmN5R1lxQTNZaHRJNXN2THNM?= =?utf-8?B?Y2RRbnp4MXpxWHF2ZnRNMXFEbzdiQ3FjeVNOdEpSRnE5aGNjb2pHUjR4Z1kr?= =?utf-8?B?QzBhUUNpNVdPVmRVK1ZNNUcwZ2hDTjZSNnVPWUdhQkFWQkhlNU1na2tzQXg4?= =?utf-8?B?aDVxUmRFVFpqNWUwb0NielRLNWJXQ2ljbXMveUk5eUVZcTA3a2lIT1ZzNXAv?= =?utf-8?B?bFFvNDVxejh5L29xaThUbTVjMlBDZDhZTWovRzk3bnNPakk4cEpkaXI3QTlN?= =?utf-8?B?WGZxM24rTDhUNlMrRkNOejFqbU91QThsdWU3dXd6bzJRVnZpVVdhZnhhbU11?= =?utf-8?B?emV5NGkxS2RiL3pvdEY0aGQwaVlRYnJOZkVCWUFPQzdha05UanZ2RXdPODZ5?= =?utf-8?B?MERyYjlFOUw2U0pTWDMzNWNtQmxzYlB2RFRYTFp4Z0lvSFp2Wjl3U2YyOTF2?= =?utf-8?B?REoydG5CUnlDWjBUaUVVbXM5eUtzT3JLVmpETUI4eVVWbHpsNk83RmNjZXNh?= =?utf-8?B?RHJiN1lxdTJvekNkaUwyNDBuL2FBd0NOd1lTZ3dlcUZ4My9jdkF5aG1pWnk0?= =?utf-8?B?TDlrNFNXZ2R3czZGSWk0REtvNzdhYWhaK1NjUDlQbnRnckwyQlgxdTE4ajEz?= =?utf-8?B?ejRNME9ndTZ2WWdEQVNZSVptK2lBdllqNzFKREE0SmVpSmI1NlJlVFhVK1FX?= =?utf-8?B?Z0R2VmMza1dxY2ZIMFdIS2lWcmpyeDltTWp0QT09?= 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)(7416014)(36860700013)(1800799024)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2025 12:56:15.8605 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2b8e889e-93d8-4110-adfe-08dd9c54b38a 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: SJ1PEPF00001CEA.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH1PPF7A6EE32B1 Its only purpose was for trace events, but jobs can already be uniquely identified using their fence. The downside of using the fence is that it's only available after 'drm_sched_job_arm' was called which is true for all trace events that used job.id so they can safely switch to using it. Suggested-by: Tvrtko Ursulin Signed-off-by: Pierre-Eric Pelloux-Prayer Reviewed-by: Christian K=C3=B6nig Reviewed-by: Arvind Yadav --- drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 18 ++++++------------ drivers/gpu/drm/lima/lima_trace.h | 6 ++---- .../gpu/drm/scheduler/gpu_scheduler_trace.h | 18 ++++++------------ drivers/gpu/drm/scheduler/sched_main.c | 1 - include/drm/gpu_scheduler.h | 3 --- 5 files changed, 14 insertions(+), 32 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h b/drivers/gpu/drm/am= d/amdgpu/amdgpu_trace.h index 11dd2e0f7979..4fd810cb5387 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h @@ -167,7 +167,6 @@ TRACE_EVENT(amdgpu_cs_ioctl, TP_PROTO(struct amdgpu_job *job), TP_ARGS(job), TP_STRUCT__entry( - __field(uint64_t, sched_job_id) __string(timeline, AMDGPU_JOB_GET_TIMELINE_NAME(job)) __field(unsigned int, context) __field(unsigned int, seqno) @@ -177,15 +176,14 @@ TRACE_EVENT(amdgpu_cs_ioctl, ), =20 TP_fast_assign( - __entry->sched_job_id =3D job->base.id; __assign_str(timeline); __entry->context =3D job->base.s_fence->finished.context; __entry->seqno =3D job->base.s_fence->finished.seqno; __assign_str(ring); __entry->num_ibs =3D job->num_ibs; ), - TP_printk("sched_job=3D%llu, timeline=3D%s, context=3D%u, seqno=3D%u,= ring_name=3D%s, num_ibs=3D%u", - __entry->sched_job_id, __get_str(timeline), __entry->context, + TP_printk("timeline=3D%s, context=3D%u, seqno=3D%u, ring_name=3D%s, n= um_ibs=3D%u", + __get_str(timeline), __entry->context, __entry->seqno, __get_str(ring), __entry->num_ibs) ); =20 @@ -193,7 +191,6 @@ TRACE_EVENT(amdgpu_sched_run_job, TP_PROTO(struct amdgpu_job *job), TP_ARGS(job), TP_STRUCT__entry( - __field(uint64_t, sched_job_id) __string(timeline, AMDGPU_JOB_GET_TIMELINE_NAME(job)) __field(unsigned int, context) __field(unsigned int, seqno) @@ -202,15 +199,14 @@ TRACE_EVENT(amdgpu_sched_run_job, ), =20 TP_fast_assign( - __entry->sched_job_id =3D job->base.id; __assign_str(timeline); __entry->context =3D job->base.s_fence->finished.context; __entry->seqno =3D job->base.s_fence->finished.seqno; __assign_str(ring); __entry->num_ibs =3D job->num_ibs; ), - TP_printk("sched_job=3D%llu, timeline=3D%s, context=3D%u, seqno=3D%u,= ring_name=3D%s, num_ibs=3D%u", - __entry->sched_job_id, __get_str(timeline), __entry->context, + TP_printk("timeline=3D%s, context=3D%u, seqno=3D%u, ring_name=3D%s, n= um_ibs=3D%u", + __get_str(timeline), __entry->context, __entry->seqno, __get_str(ring), __entry->num_ibs) ); =20 @@ -551,7 +547,6 @@ TRACE_EVENT(amdgpu_ib_pipe_sync, TP_ARGS(sched_job, fence), TP_STRUCT__entry( __string(ring, sched_job->base.sched->name) - __field(uint64_t, id) __field(struct dma_fence *, fence) __field(uint64_t, ctx) __field(unsigned, seqno) @@ -559,13 +554,12 @@ TRACE_EVENT(amdgpu_ib_pipe_sync, =20 TP_fast_assign( __assign_str(ring); - __entry->id =3D sched_job->base.id; __entry->fence =3D fence; __entry->ctx =3D fence->context; __entry->seqno =3D fence->seqno; ), - TP_printk("job ring=3D%s, id=3D%llu, need pipe sync to fence=3D%p, co= ntext=3D%llu, seq=3D%u", - __get_str(ring), __entry->id, + TP_printk("job ring=3D%s need pipe sync to fence=3D%p, context=3D%llu= , seq=3D%u", + __get_str(ring), __entry->fence, __entry->ctx, __entry->seqno) ); diff --git a/drivers/gpu/drm/lima/lima_trace.h b/drivers/gpu/drm/lima/lima_= trace.h index 3a349d10304e..98a7fb2fa00e 100644 --- a/drivers/gpu/drm/lima/lima_trace.h +++ b/drivers/gpu/drm/lima/lima_trace.h @@ -14,21 +14,19 @@ DECLARE_EVENT_CLASS(lima_task, TP_PROTO(struct lima_sched_task *task), TP_ARGS(task), TP_STRUCT__entry( - __field(uint64_t, task_id) __field(unsigned int, context) __field(unsigned int, seqno) __string(pipe, task->base.sched->name) ), =20 TP_fast_assign( - __entry->task_id =3D task->base.id; __entry->context =3D task->base.s_fence->finished.context; __entry->seqno =3D task->base.s_fence->finished.seqno; __assign_str(pipe); ), =20 - TP_printk("task=3D%llu, context=3D%u seqno=3D%u pipe=3D%s", - __entry->task_id, __entry->context, __entry->seqno, + TP_printk("context=3D%u seqno=3D%u pipe=3D%s", + __entry->context, __entry->seqno, __get_str(pipe)) ); =20 diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h b/drivers/gpu/= drm/scheduler/gpu_scheduler_trace.h index 4ce53e493fef..781b20349389 100644 --- a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h +++ b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h @@ -36,7 +36,6 @@ DECLARE_EVENT_CLASS(drm_sched_job, TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *en= tity), TP_ARGS(sched_job, entity), TP_STRUCT__entry( - __field(uint64_t, id) __string(name, sched_job->sched->name) __field(u32, job_count) __field(int, hw_job_count) @@ -47,7 +46,6 @@ DECLARE_EVENT_CLASS(drm_sched_job, ), =20 TP_fast_assign( - __entry->id =3D sched_job->id; __assign_str(name); __entry->job_count =3D spsc_queue_count(&entity->job_queue); __entry->hw_job_count =3D atomic_read( @@ -57,8 +55,8 @@ DECLARE_EVENT_CLASS(drm_sched_job, __entry->fence_seqno =3D sched_job->s_fence->finished.seqno; __entry->client_id =3D sched_job->s_fence->drm_client_id; ), - TP_printk("dev=3D%s, id=3D%llu, fence=3D%llu:%llu, ring=3D%s, job cou= nt:%u, hw job count:%d, client_id:%llu", - __get_str(dev), __entry->id, + TP_printk("dev=3D%s, fence=3D%llu:%llu, ring=3D%s, job count:%u, hw j= ob count:%d, client_id:%llu", + __get_str(dev), __entry->fence_context, __entry->fence_seqno, __get_str(name), __entry->job_count, __entry->hw_job_count, __entry->client_id) ); @@ -95,7 +93,6 @@ TRACE_EVENT(drm_sched_job_add_dep, TP_STRUCT__entry( __field(u64, fence_context) __field(u64, fence_seqno) - __field(u64, id) __field(u64, ctx) __field(u64, seqno) ), @@ -103,12 +100,11 @@ TRACE_EVENT(drm_sched_job_add_dep, TP_fast_assign( __entry->fence_context =3D sched_job->s_fence->finished.context; __entry->fence_seqno =3D sched_job->s_fence->finished.seqno; - __entry->id =3D sched_job->id; __entry->ctx =3D fence->context; __entry->seqno =3D fence->seqno; ), - TP_printk("fence=3D%llu:%llu, id=3D%llu depends on fence=3D%llu:%llu", - __entry->fence_context, __entry->fence_seqno, __entry->id, + TP_printk("fence=3D%llu:%llu depends on fence=3D%llu:%llu", + __entry->fence_context, __entry->fence_seqno, __entry->ctx, __entry->seqno) ); =20 @@ -118,7 +114,6 @@ TRACE_EVENT(drm_sched_job_unschedulable, TP_STRUCT__entry( __field(u64, fence_context) __field(u64, fence_seqno) - __field(uint64_t, id) __field(u64, ctx) __field(u64, seqno) ), @@ -126,12 +121,11 @@ TRACE_EVENT(drm_sched_job_unschedulable, TP_fast_assign( __entry->fence_context =3D sched_job->s_fence->finished.context; __entry->fence_seqno =3D sched_job->s_fence->finished.seqno; - __entry->id =3D sched_job->id; __entry->ctx =3D fence->context; __entry->seqno =3D fence->seqno; ), - TP_printk("fence=3D%llu:%llu, id=3D%llu depends on unsignalled fence= =3D%llu:%llu", - __entry->fence_context, __entry->fence_seqno, __entry->id, + TP_printk("fence=3D%llu:%llu depends on unsignalled fence=3D%llu:%llu= ", + __entry->fence_context, __entry->fence_seqno, __entry->ctx, __entry->seqno) ); =20 diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/sched= uler/sched_main.c index e3679f26f724..d20726d7adf0 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -855,7 +855,6 @@ void drm_sched_job_arm(struct drm_sched_job *job) =20 job->sched =3D sched; job->s_priority =3D entity->priority; - job->id =3D atomic64_inc_return(&sched->job_id_count); =20 drm_sched_fence_init(job->s_fence, job->entity); } diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h index 1270cd82ff3e..e62a7214e052 100644 --- a/include/drm/gpu_scheduler.h +++ b/include/drm/gpu_scheduler.h @@ -326,7 +326,6 @@ struct drm_sched_fence *to_drm_sched_fence(struct dma_f= ence *f); * @finish_cb: the callback for the finished fence. * @credits: the number of credits this job contributes to the scheduler * @work: Helper to reschedule job kill to different context. - * @id: a unique id assigned to each job scheduled on the scheduler. * @karma: increment on every hang caused by this job. If this exceeds the= hang * limit of the scheduler then the job is marked guilty and will n= ot * be scheduled further. @@ -339,8 +338,6 @@ struct drm_sched_fence *to_drm_sched_fence(struct dma_f= ence *f); * to schedule the job. */ struct drm_sched_job { - u64 id; - /** * @submit_ts: * --=20 2.43.0 From nobody Sun Dec 14 19:35:45 2025 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2064.outbound.protection.outlook.com [40.107.244.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 41EF02101BD; Mon, 26 May 2025 12:56:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.64 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748264187; cv=fail; b=GfMjDqyNBuelulp18Bw2bdeC0p63p6wxvERJRqyWlJ78qqrdNekq9U/vqJUl+MUR1Jf+/bLj/OPwK/PLUXqMUdN7Cgwu9ttrvWxua0/bUbCnpAnDQhuP91jPO+1D/oXigKelr33ijRbI0PRO4BZ3e7Gk0SB3CFJRrjvWQL8mylo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748264187; c=relaxed/simple; bh=jhpGfvv6CWUzPoQCHO3Atk0OtyqOuJlyW3j0S+K3L1o=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=PbTKkerbg+2aqvND6X6K13BN6YLCa4MiPNcYxlOCpyz6kSLppp91oa4sEa0jDOibfentYsIqof1JWM0rrY5s8Qno1drfiuk9S9uASHVEn4aoW7alQNLRUkt5rEdZ2DIu2Gv+MB5563KIIo2msH78GNr3BedznzyECqer+hVLq2o= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=LBYjKjgo; arc=fail smtp.client-ip=40.107.244.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="LBYjKjgo" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Clb7ykSBid4sQQsY2ifx7GstAIzsuMnC4MjEx1xvylR4KLKJ6AvOlmarIaSKS28UKTj7q6oiaWPyWoxwup64zX/uTd3G1GukcheW0MH4+YupEyecIOdulsCTjdLYMdpe32t/joIEn5DT/e7l5Tc06ZixyHKsPpeIwg/njwEDRG2JfenBKy+vaax+j6HvxRJ26YKU+yQw0PiKl26gWdpdms6xzog6LL5uqM3i67FPxOHZWqw3IqqOO43ZFwRyXdBR56pFhdmSGPt/In0GPU+N2et2n5YP2aVaLGi1pexcFYN8xbQwtbC4dwK4JAu5KiYD3WLuObP99b0NqTLeQE7Zyg== 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=zw2huqsza4q5J5wpoyqjqOyZRA3CmN84hy7iWKy+kRo=; b=ilxMDph2jqKAQQbA+ps9GNqjNcTDXXxu2SSljW9/r8kBPEYG15xdEJYedjqO4YJ49oaq0CQ8oQNiFq3qkpz4s1ACWqmUIHc8HGzzyaRhiHFisytO3wjC81pOoSu4+ujJwTJy4MOqCQQKKPO9k5vVde2zGHHgRS7mn0t4zVWKHc/8z9gZqTccNA0wO1arTHXFckjf1sCSfNLOS1umgJJRZ7wpDIm3NHxf3+totAqCEosgTd8tTUHeRQW7ulqSBHIJWLPP4wO05qDIOOaZygdkv1hcym9uZvdw1KhkAuuX7npsaSefHe56ZLftujydxz1dTH4pu54NwzBdIX8HgCDUtQ== 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=zw2huqsza4q5J5wpoyqjqOyZRA3CmN84hy7iWKy+kRo=; b=LBYjKjgoDeXApNYl6PDVywXke+ZXvDt/f2zXkoDh1c4OofooOHyVj9Ecqfhj6nFz8ZrM0myHjik2Xeo4Lp1Rfi+ECJmv8JHiJiTuNK4zAu72Og2cU4TaEj6ms9xJ6CGdJVEKaKKmtHelG5AQS617o3tGX+8eiNf4Ogxb99CBNrA= Received: from BYAPR01CA0039.prod.exchangelabs.com (2603:10b6:a03:94::16) by PH0PR12MB7862.namprd12.prod.outlook.com (2603:10b6:510:26d::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.20; Mon, 26 May 2025 12:56:21 +0000 Received: from SJ1PEPF00001CE6.namprd03.prod.outlook.com (2603:10b6:a03:94:cafe::2b) by BYAPR01CA0039.outlook.office365.com (2603:10b6:a03:94::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8769.18 via Frontend Transport; Mon, 26 May 2025 12:56:08 +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 SJ1PEPF00001CE6.mail.protection.outlook.com (10.167.242.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Mon, 26 May 2025 12:56:21 +0000 Received: from FRAPPELLOUX01.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; Mon, 26 May 2025 07:56:17 -0500 From: Pierre-Eric Pelloux-Prayer To: David Airlie , Simona Vetter , "Maarten Lankhorst" , Maxime Ripard , Thomas Zimmermann , "Jonathan Corbet" , Matthew Brost , "Danilo Krummrich" , Philipp Stanner , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Sumit Semwal" CC: Pierre-Eric Pelloux-Prayer , "Lucas Stach" , =?UTF-8?q?Ma=C3=ADra=20Canal?= , =?UTF-8?q?Christian=20K=C3=B6nig?= , , , , , Subject: [PATCH v11 09/10] drm/doc: Document some tracepoints as uAPI Date: Mon, 26 May 2025 14:54:51 +0200 Message-ID: <20250526125505.2360-10-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250526125505.2360-1-pierre-eric.pelloux-prayer@amd.com> References: <20250526125505.2360-1-pierre-eric.pelloux-prayer@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00001CE6:EE_|PH0PR12MB7862:EE_ X-MS-Office365-Filtering-Correlation-Id: d43c0d50-3325-4015-7361-08dd9c54b714 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|82310400026|1800799024|36860700013|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?YXdvSXdDSVpLUitud0EzZ0ZQMks0NUFqYmxqTlFsME42azJ5MUtlKzc4aFps?= =?utf-8?B?N200eVhQcHM2d1hvYWYwZHZyZjlZRmRreHNlMzEzTHZHTnRodlh3QjRIMXFn?= =?utf-8?B?RkVyc2IwcUNKYkd2T2wrQVlQWCthWkFsVkNyL01DdTVDNU1ZYll4cll2NWVu?= =?utf-8?B?N3lTRE1GK3hoVW91bG9BRVhtcFVwOXlsU3NNVmVHeHZ6V2s5aEl0MDgvSHN0?= =?utf-8?B?dlFQQmVsY2RLcWxCc3c2RWN5UnpNbVh2TytaalBGT2RMQ1V2Rjhpa0loYUMv?= =?utf-8?B?M1lYTTV1ckFmRjlqZGpiKzVNN2kwOGF0djlzOUFWZEl0VG9oeTJwazBicjZV?= =?utf-8?B?d29YazRMRlgxTHVZUHFkajNIUnFmU0J2MUY5YU54Y041bHdTcWY0aG5HaDVs?= =?utf-8?B?M2ZMdkhvNTRlODdMQkdJWHYvdHU4NHZmbVlQNnJrWHNMaTFvdVExYWJONlpF?= =?utf-8?B?K2QyVzhsWTFnSjhLZEVpbzl5UDdVUXZLSFhMZzFQM2g0WXhKR3dKbG1VNlVN?= =?utf-8?B?Z2g5aGloV3RoL3doN09IenBqb2FIaXVtc0ZQNnQxNmNuNU1xdjZGNjFwUE5h?= =?utf-8?B?c2NUZXNEN1VKV2N4eCtMRTJVT2VqOTJjSW9XektuZlRJT21XY1ZyRmdXQnI4?= =?utf-8?B?MUpWZEhCQ1ZhajlVa3VVTXJ0OGFDanZjamJKdFVwOUp4NGFWdzFhS3k0QjB2?= =?utf-8?B?YVJsWWlHT3BHYzhWeFA3eWp1Nnd6V2xXeGtuWnFHM2RsZkYxMENDeGhqa2c0?= =?utf-8?B?cjR3eWRIYVFIbXRXckZmaHEzWGsyd2phcWNqRExTWkRSU0xOVHNRMnVrZTQx?= =?utf-8?B?UHpCQnZOSVpPNHcvVE5zalJqWHJ0QzlLNENuY3BvZ1lMWndZSVBuT29Id3BC?= =?utf-8?B?Mktma3RmY1VFRW12SitidnZabDlTSlNtQjdMREpRdksrWFpxKzZ4MEkzN1BI?= =?utf-8?B?MjF0Y1M3Ui95a0orTStsS1kzUWlwMGRRblJTS3BYaU5zbUJDMHFzcXdzdUxC?= =?utf-8?B?aFdzbVEzeTc4WlFnYmR5bDY2bFhIamh6SmM2QTdWcVRSTktJZTNxaEVmTnZV?= =?utf-8?B?d1p1SkVUMzNnM3dvNjN6RFVvVVJQNVhqeXZob0ZhVVp5dDFGN0wwRnRiTVIw?= =?utf-8?B?MDBmVSs4RlJKZ0p1eEhXdnRFc2xZK1IrL3B6d2xkMmd3K0JwODYzUDNRZ0o0?= =?utf-8?B?NWp4OXN6MENDVDI2MkZmbDB6TWZvRnRQbUVMS2o2NFg1RlJBeVpSSXpyMTYw?= =?utf-8?B?dFZKNUNXdzFJUkpFUCszSC8zOThPZHBycFRsQ3hLekRyQldmelowemRCTmNn?= =?utf-8?B?aUtBRmxlWnVncGtZNVEvTTQvVUdyQzIvWklseS9uTUVGdkNZYUI4RXlReE5s?= =?utf-8?B?TmJ0enB5ckxpZGU1OEZZa3UxMzE1UHBCbXZWSjNRbDFndzFzNnpzWGR3TjFu?= =?utf-8?B?RHF2R3ZkVTdJTkswL3pCR21rcDJZd1d4VGllSEozbUg4MjV1TE54cWJPT1kw?= =?utf-8?B?N3Nqa3hXaFYwTGZiTWhyT21vU21FNlZPU1dFdng2Z1NvbFNqUmp6cDgranda?= =?utf-8?B?RHFOQW9xT2hOUnJQTjdMWWg2U00wNFBjOUxERkJnYlc2czB3dzkwZjVpRklj?= =?utf-8?B?ZlFwUkRIdWJubHZDZEVtYkowanF3MHlBMHFZejVYQkQ3cnpTWlFWVm9qanFN?= =?utf-8?B?WGFNVHBRcXZUQVphK0JrTmpOaktkdGJOUndOTzdJOVF5ajUzR29JbnF2RVR1?= =?utf-8?B?clYrK1R6KzR2dk9ZTFRaa0tlZzdFVWlibWV6NVRrVGNzQmQxeDRFLzAzTkpq?= =?utf-8?B?cG9Wc0RjTzF3QUhHQjkxU2l0TzB4a2VJOGx1TjZ0QWhFZDFsRllhTzVZWldE?= =?utf-8?B?Z2J0SWoyczlYcFBOYlBEN1R6dE9valZlYnRoSEZBUVZzR3Y5Uit2OXdSNkY5?= =?utf-8?B?NTI5NVMyaWp3dTdidDI5Y1ZBSmd4ZitFQU1SRmxIRWxhSjlycUIyeUpmK25p?= =?utf-8?B?aEpidlJDUG41QjBobDJBRGNSS1BuaFRZSmU4VWJjbFlFeWVRaG5LbnJsb3VR?= =?utf-8?B?SUhyYmZ0aTJnTGYvMmxxUmRHcUF4ME1NZUpXZz09?= 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)(7416014)(376014)(82310400026)(1800799024)(36860700013)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2025 12:56:21.7969 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d43c0d50-3325-4015-7361-08dd9c54b714 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: SJ1PEPF00001CE6.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB7862 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=C3=ADra Canal Reviewed-by: Christian K=C3=B6nig 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 69f72e71a96e..4863a4deb0ee 100644 --- a/Documentation/gpu/drm-uapi.rst +++ b/Documentation/gpu/drm-uapi.rst @@ -693,3 +693,22 @@ dma-buf interoperability =20 Please see Documentation/userspace-api/dma-buf-alloc-exchange.rst for information on how dma-buf is integrated and exposed within DRM. + + +Trace events +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +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 fiel= ds +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 781b20349389..261713dd7d5a 100644 --- a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h +++ b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h @@ -32,6 +32,28 @@ #define TRACE_SYSTEM gpu_scheduler #define TRACE_INCLUDE_FILE gpu_scheduler_trace =20 +/** + * DOC: uAPI trace events + * + * ``drm_sched_job_queue``, ``drm_sched_job_run``, ``drm_sched_job_add_dep= ``, + * ``drm_sched_job_done`` and ``drm_sched_job_unschedulable`` are consider= ed + * stable uAPI. + * + * Common trace events attributes: + * + * * ``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 &struct dma_fence.context and the &struct dma_fence.s= eqno of + * &struct drm_sched_fence.finished + * + * All the events depends on drm_sched_job_arm() having been called alread= y for + * the job because they use &struct drm_sched_job.sched or + * &struct drm_sched_job.s_fence. + */ + DECLARE_EVENT_CLASS(drm_sched_job, TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *en= tity), TP_ARGS(sched_job, entity), --=20 2.43.0 From nobody Sun Dec 14 19:35:45 2025 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2084.outbound.protection.outlook.com [40.107.244.84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 32E5B202C58 for ; Mon, 26 May 2025 12:56:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.84 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748264195; cv=fail; b=Q22z7rMVVnpzOEJOfR2divU3O3dmEdlH3xnCB9AM7ekcaCtgdorbCq88lh3P4t26bSQsoRfvN9wZB++gNTnqhqUUPaXKCA5khZOxDiNLnm4pdMz3SuP+Uc9MryWg5+mDnbrZ1KHZHkNorzQyN3P706w2hWnmMhv2XFFyAmSMw8c= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748264195; c=relaxed/simple; bh=S4exrgp6nCCnjpU75pvGfnP76/5r83VUA6Fzx6/riZQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=js7O6iKGUZxX97AUPzxayxDfOPiBeOVBSoepTKJv3zGtGBozHbKoDtULXZOSu4V/9JWlnF8O15LAbYA07AZryga0zurGej2EXcB/wkfFySkGPJSsZNh+aS8mY7+n/ShgiNWc/8dl+efTQActHHTdocc2AbwY92ewHJPrYBHfK0E= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=WQYo+poF; arc=fail smtp.client-ip=40.107.244.84 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="WQYo+poF" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hijGf5IPpbuMfoNaPJyDUVmU1WDFQLL4/8RMV7nICxgfaWpF3WHeOAVRZEvLFiD2gySOd597EU2gbDAlH97bbjpF0m4ig+XH9CSLrGp63BQPBc38QVbxP+BTdvaDtXE+qKmzMd8S1tX/GG8nrmV82v7YQlNJEwysK2IO//RT3Kti0FA6WqYnJQdwhEylpqp98//Ao/rSKQK3/Ew7lkAix04avsnmFAK5CeXGlHZaJGaKUdGnj4cXOBtY0R2OoLziROzZ/18jSBospt9AEoB/jSW+0suMBAFL1vvov70dYUxFKGGF3dO12cWhaE4BIvOcShw7+WHcgFsUX1T+SW8v4w== 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=9+D/MixmJoxbu9aKCUjkmWdqscb9PVWuTnt6HvTbnqQ=; b=PdzjTYBkBmuHuifiR1cRpsCYkGfV87wpgBqqtWuoNb6MoHsvcwOkuhSnDQm5+Y9HHhSx+hDIT96hfe3qbXw9CEOx7UcpClOGKGHf+OZycwFnpmBBXeGx55fXYXagoSk7texvgz4ZsKzfyIPEWyo1wobz1DCn9dBP3SHj5ORLg0jV5zn67RCiQV6v4Jnt0TrXh4Ksca2GkOlwjY/FvedcZZHWocRAqkbPDEE9mT0gU1ad7F8R7IiIqeQ+g5E1gCOb9XxID8CHEdYfVrmGMy53YxPkiXqz2nsFhrcEDQe9Gz35KQsK09dx547IQzcJ2kacMlpxDVNxIpCITu1zeZyZ2g== 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=9+D/MixmJoxbu9aKCUjkmWdqscb9PVWuTnt6HvTbnqQ=; b=WQYo+poFqMbdzaTHc7S+jsk7sXsGFqV9V0akdatmeC0yx7BtRTUhVQL0sIg1TVuSH2LqGtjCuXOWcWyjBRHWrqtAI5qvj5Jd9Sqij++d8redCzItRHaeu994gHqxV2+u2t3HFQEFRrNWD4oB33+6ll+lRDaEey7bCnaAXZIwUuk= Received: from BY1P220CA0021.NAMP220.PROD.OUTLOOK.COM (2603:10b6:a03:5c3::16) by DM4PR12MB6496.namprd12.prod.outlook.com (2603:10b6:8:bd::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8746.30; Mon, 26 May 2025 12:56:26 +0000 Received: from SJ1PEPF00001CE8.namprd03.prod.outlook.com (2603:10b6:a03:5c3:cafe::8f) by BY1P220CA0021.outlook.office365.com (2603:10b6:a03:5c3::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8769.27 via Frontend Transport; Mon, 26 May 2025 12:56:26 +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 SJ1PEPF00001CE8.mail.protection.outlook.com (10.167.242.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Mon, 26 May 2025 12:56:26 +0000 Received: from FRAPPELLOUX01.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; Mon, 26 May 2025 07:56:24 -0500 From: Pierre-Eric Pelloux-Prayer To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter CC: Pierre-Eric Pelloux-Prayer , "Arvind Yadav" , , , Subject: [PATCH v11 10/10] drm/amdgpu: update trace format to match gpu_scheduler_trace Date: Mon, 26 May 2025 14:54:52 +0200 Message-ID: <20250526125505.2360-11-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250526125505.2360-1-pierre-eric.pelloux-prayer@amd.com> References: <20250526125505.2360-1-pierre-eric.pelloux-prayer@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00001CE8:EE_|DM4PR12MB6496:EE_ X-MS-Office365-Filtering-Correlation-Id: 41f782d9-4a65-4a57-7b3f-08dd9c54b9ce X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|36860700013|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?utf-8?B?OXBKWlMvbTlNalhNR3hnczdtbDZuN3BPYzI0YTFPL3cyUjlZekNmVzU4MU1Y?= =?utf-8?B?Vk5GbytPVDdCQ3VnUmRhVllzaFNPV0pBQU5GZVcvUFI0SXBjT0Zqa3M1azY2?= =?utf-8?B?aXA3bEFzdkJtL0t0Y0g5THJTSC9aeUpudVpWTm5GU3VYQWdpeTliVzdOdWMy?= =?utf-8?B?Qi9rN2MrS3lESVRpbStqRUJlQWpSRkFRVE1UVFZ2cFVHM3p2aGxydFJKc25Z?= =?utf-8?B?MGpFdi9jTll3ZmxHT2dqcmdUSTdnMGE5RTY5aWVmdTEyZzVLL3h4ZmtmcHJo?= =?utf-8?B?L3RpZllaQmVkSGpPOWh5S0VuZlkzRFlNSXIxRmRhR0hJQWNCU2hLUkFnSi9C?= =?utf-8?B?YTMvVldkbEExVkpCR1JDVkg5VGtoa053a29zNGJIMTY2c3VIc2IrMDFweExN?= =?utf-8?B?TTBRb2d0QjFUb0JPNlNnMUhHWm5rbDR4UVA0VmVmV1JLSHNmbWFoOWZnQkRF?= =?utf-8?B?VDhzVWZjM01XYUViMnl4SkdmcXdWVll4S1JrQmZ0T0t3djZidzBZMU1ORzln?= =?utf-8?B?Ky9UMU9qRkF0WVA5c1lrb2hmR1Y0TkxBVzdMaXllU2FKMGlRRFpJUmNVWXRN?= =?utf-8?B?dW1TSkdsd2I5WXk2ZUtGMWxyNmd3QzcvMXhiaTdXaXFOOWg4VXowMUV5bHlC?= =?utf-8?B?TEduMm1hQ3B2RVlML3lEQ1daSVlJUzJHMVFKbHBVWk5MMkJZMTJlbEJQWG5C?= =?utf-8?B?bzJJSFBJMjBBOG1NWlovdzZmR1BSc2JWK2cwdHZHbC9VV3FmTU9Wb25NSjZq?= =?utf-8?B?Q3lPVHVwYzBsR0FGREs4S0RvR1NsT252MUxsQVU0TDUvdTB2N2pQL1JaS0J3?= =?utf-8?B?RVM0MWNUVEhVNDBmamQ1QlRBREJCM2RMTTM4RFhhUWlOT1VRL0tyODNhSEdq?= =?utf-8?B?TXZPY0lzb0I1L3M4MmhwRzdBUnphZGFKdXlHeHllSE5PZlJlbWdBQTZOaWV3?= =?utf-8?B?MFNWdWhYbkJCQ3NndklyOUgvOGpQQkRqcCtyekp2QVdpTFdwQjJNRUNyUGp2?= =?utf-8?B?TDRJSUJDN3VVRm5VQ2ZQb0FQTlFpVlYwMmo5Z25jU2liOFFMQ05qVDh6UW9w?= =?utf-8?B?SUtBMVpDeVk2VGNRNXRTUGpocTVJZFo2a0VERFhlT2Y0NlYvYmhzT2x0d2JI?= =?utf-8?B?QVJmK05sN283MFJEZ2t1U2RldWlUN2pBamtjTXRnVFZvZjdZZFBnN0pCNEUy?= =?utf-8?B?OGJkc1N1YmpmazNKc3BTUlR2RlJBSVgxb3JaL3hjTWFjZVo4SjZkOURZejRu?= =?utf-8?B?eU5jdk1EL1FucVdHZDF5SU5ZV1NyZDhpU2I2a24rVkJlMUtKb2toNm5HckxB?= =?utf-8?B?T1BOdWU5ekFqeFhEdloranRIUTNOTXMrV3BKcXk2V3ZTejl2S3BBNEpyTVV2?= =?utf-8?B?RmUvOVJkbmovdUxLTVVqSUgxNC9mQ09RV1lRbTZVVWc2MDF6OEYxUnl5aHlO?= =?utf-8?B?WUhESEg0b3Nidnc4eHRSVjJPMnBWd3RBbDI2V05HS3ZyNGhpalVmeWNBS0pV?= =?utf-8?B?TGlsV2k3L0lSRmhuTWZIcUZ1Uk1OQ1FlcXVBcWZzOFdGdkdOZmhJSVh5NUtT?= =?utf-8?B?RExySVJVMnEvbGRITEIrLzFLazltWVYyUGhXMDRnSlV0bEVSbHQ0VXRjRnNq?= =?utf-8?B?ZlNzN2ZUSXVWdmQybjZDbjVvb3gxRHhnbzZOWDV4cHU4Z1F1UlU4YnNBSFIy?= =?utf-8?B?OXVDanRrWUVxL2VTdWtyb3VXV0tuQWlTSU1LSEs4OG9haTEyRC9jeDlLK1JV?= =?utf-8?B?QzRtZlVYWjhkaUJIR2tIVmZsUXFxUnUrOS9TTTlJeFhPYytyMTA3cHByUEwr?= =?utf-8?B?Q3hGcnkreVpPZ0dnU2RnSHorS0RGQzhHYkw0Kzltc003QUozT21IRVR5cWVB?= =?utf-8?B?bWVzZ0ZXWDFzU04zOFlSQ0ZMVFArK050Q2RjS3I5aDhVemxsUEpJeHBhd3h2?= =?utf-8?B?NHNwL0JNRXoxNnV0d1E2ZjBzempEV3VNcDBWMWNoTCs0azdqdzZxWmcwcDZa?= =?utf-8?B?aHhhUEl6cmd5VVBTUUlxWXkzVU50c2h4Uk5qcWd2disvTVp5TWVzR3hwaWtL?= =?utf-8?Q?EG2sgd?= 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)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2025 12:56:26.3715 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 41f782d9-4a65-4a57-7b3f-08dd9c54b9ce 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: SJ1PEPF00001CE8.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6496 Log fences using the same format for coherency. Signed-off-by: Pierre-Eric Pelloux-Prayer Reviewed-by: Christian K=C3=B6nig Reviewed-by: Arvind Yadav --- drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h b/drivers/gpu/drm/am= d/amdgpu/amdgpu_trace.h index 4fd810cb5387..d13e64a69e25 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h @@ -168,8 +168,8 @@ TRACE_EVENT(amdgpu_cs_ioctl, TP_ARGS(job), TP_STRUCT__entry( __string(timeline, AMDGPU_JOB_GET_TIMELINE_NAME(job)) - __field(unsigned int, context) - __field(unsigned int, seqno) + __field(u64, context) + __field(u64, seqno) __field(struct dma_fence *, fence) __string(ring, to_amdgpu_ring(job->base.sched)->name) __field(u32, num_ibs) @@ -182,7 +182,7 @@ TRACE_EVENT(amdgpu_cs_ioctl, __assign_str(ring); __entry->num_ibs =3D job->num_ibs; ), - TP_printk("timeline=3D%s, context=3D%u, seqno=3D%u, ring_name=3D%s, n= um_ibs=3D%u", + TP_printk("timeline=3D%s, fence=3D%llu:%llu, ring_name=3D%s, num_ibs= =3D%u", __get_str(timeline), __entry->context, __entry->seqno, __get_str(ring), __entry->num_ibs) ); @@ -192,8 +192,8 @@ TRACE_EVENT(amdgpu_sched_run_job, TP_ARGS(job), TP_STRUCT__entry( __string(timeline, AMDGPU_JOB_GET_TIMELINE_NAME(job)) - __field(unsigned int, context) - __field(unsigned int, seqno) + __field(u64, context) + __field(u64, seqno) __string(ring, to_amdgpu_ring(job->base.sched)->name) __field(u32, num_ibs) ), @@ -205,7 +205,7 @@ TRACE_EVENT(amdgpu_sched_run_job, __assign_str(ring); __entry->num_ibs =3D job->num_ibs; ), - TP_printk("timeline=3D%s, context=3D%u, seqno=3D%u, ring_name=3D%s, n= um_ibs=3D%u", + TP_printk("timeline=3D%s, fence=3D%llu:%llu, ring_name=3D%s, num_ibs= =3D%u", __get_str(timeline), __entry->context, __entry->seqno, __get_str(ring), __entry->num_ibs) ); @@ -548,8 +548,8 @@ TRACE_EVENT(amdgpu_ib_pipe_sync, TP_STRUCT__entry( __string(ring, sched_job->base.sched->name) __field(struct dma_fence *, fence) - __field(uint64_t, ctx) - __field(unsigned, seqno) + __field(u64, ctx) + __field(u64, seqno) ), =20 TP_fast_assign( @@ -558,10 +558,8 @@ TRACE_EVENT(amdgpu_ib_pipe_sync, __entry->ctx =3D fence->context; __entry->seqno =3D fence->seqno; ), - TP_printk("job ring=3D%s need pipe sync to fence=3D%p, context=3D%llu= , seq=3D%u", - __get_str(ring), - __entry->fence, __entry->ctx, - __entry->seqno) + TP_printk("job ring=3D%s need pipe sync to fence=3D%llu:%llu", + __get_str(ring), __entry->ctx, __entry->seqno) ); =20 TRACE_EVENT(amdgpu_reset_reg_dumps, --=20 2.43.0