From patchwork Thu Apr 24 08:38:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Eric Pelloux-Prayer X-Patchwork-Id: 884124 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2046.outbound.protection.outlook.com [40.107.236.46]) (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 2E51520B808; Thu, 24 Apr 2025 08:41:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.46 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745484103; cv=fail; b=gmvgORRFMDzum9IbzdYnqaNGLeFdd6N2N67ArJKj0sdONOoxxCaz5FkV3DUfQJeIcj60GN3oeF6MFj+V+mHDzv2z7DnZXe+c1ifaZr1+/WAODwXVfTfa6xvzbfNM7CxiVAdJPcss4KoSbgZSVSxGQHpQ+FNqggxEz3x4aIQST8E= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745484103; c=relaxed/simple; bh=O0CwZt+7H+MQFldTjXuiyxYlCez+w7LttflFoKcdV/4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tms29gqXpmt1JW64O+KzXC67s7cVWoi/MxSHkjRaRfett/gwWhAEB5m0crdyuPJIXv1UtipEQefaMpCkWtlwudf6vvINgmS2GxH9ncnFDmUF+1D7/lncJuF8a4m1X1WoK5juhOV/u0Yy5uRSMrejW4ZE6cedAxnk9Vr0TVGJ/KA= 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=2fSBAKod; arc=fail smtp.client-ip=40.107.236.46 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="2fSBAKod" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Lstm5D8C0cVWjeFREzVmOvPLUFdrKyAWcHVLPbZHA3pjEJWV4YqbyBTXOBvW3wuVUW8gvAWIUzAaQkNlXQnmXL6K17xC5fJmIoKfnNFMS1pWRPC4SVBxxQ0V/DNVj5uNWgNpT5TNgAP293Ltx/P4sqwxjPkAL1iWVWUgRn26cSVX3P2Pow7uTymBzgTR9H35f/thyrWghMmuY4aEZiHu/tsTHxDRXPXcqxeotT1NnGatstXGc7r1E+MRAIxoGgzvM/Em+ygBGNnKor5k5HDx89+3lNpd83HGoFB1Y7Xw4V2kewifAlft3xqcLQCtpETP1dqweX+0zu7fbRZoodX2bg== 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=EHYMYNGFF9uKuQ3khXkbLAwz3Hd5pM8+94Ze52BPEZA=; b=oaEc7UObmzKg9Po3lJkM0Pf9lv690SRdZAavmplvb/YXlN1/fH174NZqtZyv/7ZcKb3U54Zrahj34Rw9ApFcRdZLGWm3wo+U1zIA/j9TuC6VhmFq63O5emYGD2XIazRZBj1QI77zvH1Dc4V+H8LNIvRi86VTRiSH761dBbZNCjnUp7FpswLYNbPLku5lzDIjAfwfUXPk8jw7eIC6FGxNfc81rfA+Rj2Ozn5uOdpURgQMJ1ZOlWle3IB3WJnC4/FRi1zLbaNJv4mqnBPPzgK5+jWqTX7ojaDRVoyQMHHzYvu52etebwUvc+UOqO+ZJeLwFlzzSWyU5eu2RMsTJ5+bag== 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=EHYMYNGFF9uKuQ3khXkbLAwz3Hd5pM8+94Ze52BPEZA=; b=2fSBAKodVOIo4P2Hid+9wjuIeEsGyGzeEGHpLpM0r+HmDYKb6u7WGHkVV4DVpUaUqiy+nnrtYoOO73mEi89eiFjef7H14RuwRevTlcb5K0tqo6ODocj6XUiwyBIJU7SpxOxIS7g9De4/zfNNnM0FhdrSm615G+la4v2QR27SwGQ= Received: from DS7PR03CA0356.namprd03.prod.outlook.com (2603:10b6:8:55::22) by MN0PR12MB5860.namprd12.prod.outlook.com (2603:10b6:208:37b::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.23; Thu, 24 Apr 2025 08:41:37 +0000 Received: from CH3PEPF00000018.namprd21.prod.outlook.com (2603:10b6:8:55:cafe::2d) by DS7PR03CA0356.outlook.office365.com (2603:10b6:8:55::22) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.36 via Frontend Transport; Thu, 24 Apr 2025 08:41:36 +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 CH3PEPF00000018.mail.protection.outlook.com (10.167.244.123) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8699.1 via Frontend Transport; Thu, 24 Apr 2025 08:41:36 +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; Thu, 24 Apr 2025 03:41:31 -0500 From: Pierre-Eric Pelloux-Prayer To: Matthew Brost , Danilo Krummrich , Philipp Stanner , =?utf-8?q?Christian_K=C3=B6nig?= , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Sumit Semwal CC: Pierre-Eric Pelloux-Prayer , "Tvrtko Ursulin" , , , , Subject: [PATCH v9 05/10] drm/sched: trace dependencies for gpu jobs Date: Thu, 24 Apr 2025 10:38:17 +0200 Message-ID: <20250424083834.15518-6-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250424083834.15518-1-pierre-eric.pelloux-prayer@amd.com> References: <20250424083834.15518-1-pierre-eric.pelloux-prayer@amd.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PEPF00000018:EE_|MN0PR12MB5860:EE_ X-MS-Office365-Filtering-Correlation-Id: e884d1cd-56ca-44ce-9f6c-08dd830bd34d 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: +8WkuDxFNQW4AwaSxS1d8uZ36HVcIil11OyjOFDNFY/O3PxzWkPe7qarZT+sae0ovoMXbA+9j3cURR18T2ssDk1BezJgkt9sP5n3QImp1fhe1Cn6+0Q+uV8ve8uPBU5PQ8cbAnpYKPiWCuaKTcSGrSf2vmnpLtGw0yoSpn+NpS0p5cILpwIgD8Xaj6yXvalWvMYWxpOSBm053QOmSyp1ni5+FhjLUiYXl4xjS/Oyv4OROPJBhaF/EOPQDksTI0QAoMwonw4hP/y/CyMbCeh7EwDDk4opDwOBXi0mIno7bmu1dx88idMSgqqsrf+jMm2ylIyAZ5mkrRjJk90BKayd2tzT7NfXcguThPcq4a50ECkQa6cOS3HBERsxg3u3Qkhhu30UVfKDQ3+pjy0YSxNJZ46GAioNwBTCxwQNoeBbH5zWoQ88XO8dBNfD4hLgNKhFphwSjPOqjF2MASPvkJw/vp/ANgtjRVDRGvPeXpDE9IB0pVg2VJThNdh+GwVYlIHE1GgcU56MH2Fb39wcVLf8oWVkPTJshgt5+whCbPdtsS6dg/fmlCShwB1QrK7tRo5QyNLeA6PLmuU1QV1FqcquGCfv5HT1iI9rBIhvy0vw04D/1/u+27rLt5GS+0suYs037GebUk5foVJuHyPZvAPE+1ymCC9bdkvCfdPT1gPRR5S+oEvERHWtecAWVnZG2sORj55GFDKEbnW72hMnNhrZ8Lu5makDNbrt8/+iUnjGLxJ3e/kC9mExdpk5+EZa6KOioGHG9EtGIDBz3gd2hRT0a1Ha6ae8Is/kALtSlwKdVqLGQ6CxMPKL6+VKptWBh3njjWoW0aM04nSZYWy2307+zW+OFLPP/H6ACcWKB8hwUeBqR6/RaraAp+OMqq9yTjif91O+SA5rlH9SNtDteklwsnlGHAb4zWvbuv+m2K2rgWIbX4vHoRdw7PyAtJVBzHup77s/AKy+9jq8XRSSzXM5mxM5cxBVtvdCvp547ALOqweC22+vU5Vx5bmMy8qURuHf754oAnhwUtLU65YKr6ahUcStVGzFK6EhlprJASrI6PGHPmjBQ2Aehaoe5SHmg31b7oZrRohhx94CFFDqwKW7gDc5bremQrjRGWPoYfqmnUmgppcx2q0vYrsEySvhP1cttRR2/XpoRJvweNro/rSGsGCoXxG0W2wze3htApmeDk8trvj2uuASx0v6uDKQEvg6IABWFC9vG6hDckcIgQW3oaNbaLN5Fy9SL1YX5YAUzP88ap1KZqhNPCiCnJ67O+9aezw6HulEckyPJpVH3vRshMwJ0yQdcg+6GsZT9G9G6PTISdF9wpS7dt4dIgAi43SY2zgnpZS74jMKVbinU1M9UeEuqRT3Id/IVNGm8k6BBuq9bwFsnMm8odSpQ5Jgj2c4zlaurTI+pWGkWDE/lj9DV82gB2OxSafU/1OtEoAQx7aHX9FrhaeIW5NUv5l4H6/VMobP7fXISZkaCPL+pMiO/JTuRP45d6PsFEvUeZs11XWHc1O1iXNW5fh8x59l8ZlLATN5PGOSixdH1eoMQGVr0A== 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: 24 Apr 2025 08:41:36.8796 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e884d1cd-56ca-44ce-9f6c-08dd830bd34d 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: CH3PEPF00000018.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5860 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) ); +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 = sched_job->s_fence->finished.context; + __entry->fence_seqno = sched_job->s_fence->finished.seqno; + __entry->id = sched_job->id; + __entry->ctx = fence->context; + __entry->seqno = fence->seqno; + ), + TP_printk("fence=%llu:%llu, id=%llu depends on fence=%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/scheduler/sched_entity.c index bd39db7bb240..be579e132711 100644 --- a/drivers/gpu/drm/scheduler/sched_entity.c +++ b/drivers/gpu/drm/scheduler/sched_entity.c @@ -587,6 +587,14 @@ void drm_sched_entity_push_job(struct drm_sched_job *sched_job) ktime_t submit_ts; 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);