From patchwork Thu Mar 20 09:58:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Eric Pelloux-Prayer X-Patchwork-Id: 14023650 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2081.outbound.protection.outlook.com [40.107.223.81]) (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 A2A20224AEF; Thu, 20 Mar 2025 09:59:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.81 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742464801; cv=fail; b=m6UVAr6IjXXUQUndJpv3kTFHXaY6Gw2Kyvewh5JSTb64+ySrNqO3zTThOb1Q9PVhp6s1+SqbvB18MhRiyLIsUW6lFsqweC/us6zkih4EpMmdQw8ZFVY6OmA/6xS4MZAMBy/maCJBErA2lyMaTbK8E4MlPJCxqeVAUBhUSIUMeAA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742464801; c=relaxed/simple; bh=zgR57lg0Ov65gxAFzt0qSztKr7rht3VU7R6hNG7j7Eg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=rjGuSh3Xz+btt+E847OCz2Twl2KzU3cIK6N3j1Y0nMSlzzLNiacJ8DgN316A1aM3vDvTIbBRv+NQUrNeo+EM2Z+SyYaTUIes16yX7tKdrvYaD/GkVVzw0irzKPvJdDCJ2nth1kbfroFF4wKQqzcP6zcxbIQXd044zG6flT2/n3Y= 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=ssBcZJYA; arc=fail smtp.client-ip=40.107.223.81 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="ssBcZJYA" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bWx7idvIJbAP1KwtcPqfPtur6UJ7l+kwIsjvbnr4ooL+qZ569V5rB7Gl8GIgrY2Zm1cb1/KjWUYA1nO4d+X3auMPEVgBFwWp5LtqbkUBc/EHIv3G0Spn9foGpH6NgwUW8wYKh1TXvw15du5M74wtpJKERmWEsoRLBmb8a+wBHUluM1fDmIsUok8I1VbiacOlrP2qstwxEjOawIw8Zw6ZSiw5vUNV0rZqQmq9/tQrqYtolsfD3L5jE2T92/O1aSFLZ5lm6NsiWzrhY1xc63GF/sE41WlSUq1wXQkcvuw3KYr/3KHjESVU46QccXIJ8e4DeaNTEtvNu2ugJ7e5/RCUvQ== 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=2GwW1gwtd0Ac6g63ryFVSSqjjw4F7gJa8exKTUx3eyY=; b=i8N6LBDaMADMhs21KSdKI9QR1bm6M0KROhOqRfpuF5hEUo6fqjqX9jr5FWHaJuL1Co2qAs62S07kqAFaPuYRGsUdvZBSL48VAvxj93QnOJ3VN6mYFtppsxrJvAIcbnIhLZR5Oq6Ibtrs9Vjn8Uez5Pae4MjZrshLd4T+oUNMOVeOKt16yFi3GoudiEiv9BVDsr1wYRzsRomCevf5q/Gjkj/el3HYsT0OctwOjB+E3dunvZELdbjVw00R5yTSsVPdhp+OVg7nYEvQGv3YSiCMg/ScALRP6E6l5TL4c825jyIbtoqwPcl80ozlWtIsWTFPbkmdgJEQQ413fjzewZDGAw== 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=2GwW1gwtd0Ac6g63ryFVSSqjjw4F7gJa8exKTUx3eyY=; b=ssBcZJYA7Vr+Jpq6lyhlD3sQzQJTFmIrhvf4EMZW/iiRehrvMD3lea4avngYpGYkhBFCvwdctfsZz/89xASwuAKimMuJ7c9lzaYX5LRzEI/h/8hx3KVV9LTjhyM0Hzx13rSh1jfi25KkveNyEFLD8IDXhkPRQkFrg/Iql2koDtI= Received: from BN9PR03CA0151.namprd03.prod.outlook.com (2603:10b6:408:f4::6) by DM4PR12MB5745.namprd12.prod.outlook.com (2603:10b6:8:5c::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.34; Thu, 20 Mar 2025 09:59:56 +0000 Received: from BL02EPF0001A0FD.namprd03.prod.outlook.com (2603:10b6:408:f4:cafe::c5) by BN9PR03CA0151.outlook.office365.com (2603:10b6:408:f4::6) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8534.34 via Frontend Transport; Thu, 20 Mar 2025 09:59:56 +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 BL02EPF0001A0FD.mail.protection.outlook.com (10.167.242.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Thu, 20 Mar 2025 09:59:54 +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, 20 Mar 2025 04:59:52 -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 , , , , Subject: [PATCH v8 04/10] drm/sched: cleanup gpu_scheduler trace events Date: Thu, 20 Mar 2025 10:58:00 +0100 Message-ID: <20250320095818.40622-5-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250320095818.40622-1-pierre-eric.pelloux-prayer@amd.com> References: <20250320095818.40622-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: BL02EPF0001A0FD:EE_|DM4PR12MB5745:EE_ X-MS-Office365-Filtering-Correlation-Id: 28a1335f-d8bc-4fe2-80fc-08dd6795f712 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|7416014|1800799024|36860700013|921020; X-Microsoft-Antispam-Message-Info: +fMQme0ZKlnxQcWe59koWMeuQSk+4nrEcZJi9GmKNoaOIZG1JEFqpUtEjz6gC6fAyGHvCrm7aODtWFNkPTeBufrvm0AYkGyx2BNaC/VY1u3Fwe4Zjj+09LzcZj/Tk61ZY/LucZAQIec63HJ/KncLi82UqDft0K8V4CsvULware4xxc+Hg1MwrFNjQ7dBEMpkGqFj8k+9uAqo/2CKsnQQ2g9C71rnec3ESijoABtx1k7lgEz/W5PAYEMiMXtr4KM5yK6f3yNn2koNoPnJUC5CL18eR1kl+/xqg4qRx6n5SeMj/P67oLLRI9ruz3TaeIwx5wAhRrOsvfmzi7syZ1EZ+DoRg6d5r/VK+MnXaditGaMx4G92QGJbL7v8++ZM55qBBxC9azCRFxrGQT3bB36VzGcdnRl8d4wZFSvjcGzIeyYCV1H+Z1lF/jcNdDtK2swQDzbMgL4qL7Qtr/9wbvhQcCH146VlIVpER08CRnCnWF865g7SPH4Rz6+xJlZDzPTs7dDRq/RZi9B+0US+Nvxk/BHjO0z3afd+K5jIFFrgvvJxXfIlLdFXson3lC4uxRJYQOwr8Gy96G2sgxDVRHEDDKGlzT19xd+JvberlxtbVliEYbIcBfRABXfyw+gWfFpuzyDptAdCKiVoOIIytnUp5j+zG5X1SIptLCDqgrkPgG9gRk/NfWCXDG6Omz7p3qdvk2VuCndTk984Ju4Vn9Bvd52PKzi1Hn6c1xqLX3TlWxa9P7UC2BbzkWliDKv8FNHOx6QT0VK+PSfoj4QAq5xdLGnFOlYh3V5G6IZzNwe7lejdrAHPo/AoMpy3iUYXCHedTOPVssT1SiV/tG0y9WE3m5CvpEACowwb6/sdh55IarXimUsXOvYTdT38iLZ3nbmH0eXd4c/+CXd4oDHB5UidmCBaCNPozvYpquoARCkblEXkk3MIoaapQ4Y163CtHMXmG5hdkIrb0GHS2gK4kuiX8XBYKgmBryuIbVtEGpsCMEbeWXb+joZORwj7LZHpBMzmQCNOl7vX25md89ydhTK4yZyddjp0bStTHMmIqFEjL3apBN3iBoPdFZcLJ6R97uZ2mj69HCO+T4B7Wm4Ok4liX5lUdYu7DYLzFu3xkuCAe2IAcbJi6MhUQ8ipeneyQ/s+3u/FstOJ1vFP/2pfPuM/Hx/RILe6ZWm8k3vEMKonfiKiPHtg+r5Qt0tHA1yR4bwT3kMKk0nQeao7Bd2eOofP9OwUvVH/R1CTqAJ8YnpkHwdt4MrTvfZPyiwXVOKhbVIAKfdxJ0kd1lO7RLTeFc0VO4Zz2NDviC4s3DND82w6pXTpKADYcb+NVBnmL4gdFmzVYvIO8sNjiwYxdK1dnoL1FrCq6E25aUu4r1os705ZyhgS9F/irwDz7MmCu9PxS08drcBtPRnpDdl7olXuj2sV8b2y9I6hkk9gFr18+eUhyEAlSTtkL0FpRUPDXprLTdCX47k/AZz/VH5GlMJ7HYttLJskuz5iO01okNrlVpw+3UCCciTc0MF+nXO/QnPPQuch 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)(1800799024)(36860700013)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2025 09:59:54.8982 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 28a1335f-d8bc-4fe2-80fc-08dd6795f712 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: BL02EPF0001A0FD.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5745 A fence uniquely identify a job, so this commits updates the places where a kernel pointer was used as an identifier by: "fence=%llu:%llu" Signed-off-by: Pierre-Eric Pelloux-Prayer Reviewed-by: Tvrtko Ursulin --- .../gpu/drm/scheduler/gpu_scheduler_trace.h | 45 ++++++++++--------- 1 file changed, 24 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..21a85ee59066 100644 --- a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h +++ b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h @@ -36,28 +36,29 @@ DECLARE_EVENT_CLASS(drm_sched_job, TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *entity), TP_ARGS(sched_job, entity), TP_STRUCT__entry( - __field(struct drm_sched_entity *, entity) - __field(struct dma_fence *, fence) - __string(name, sched_job->sched->name) __field(uint64_t, id) + __string(name, sched_job->sched->name) __field(u32, job_count) __field(int, hw_job_count) __string(dev, dev_name(sched_job->sched->dev)) + __field(u64, fence_context) + __field(u64, fence_seqno) ), TP_fast_assign( - __entry->entity = entity; __entry->id = sched_job->id; - __entry->fence = &sched_job->s_fence->finished; __assign_str(name); __entry->job_count = spsc_queue_count(&entity->job_queue); __entry->hw_job_count = atomic_read( &sched_job->sched->credit_count); __assign_str(dev); + __entry->fence_context = sched_job->s_fence->finished.context; + __entry->fence_seqno = sched_job->s_fence->finished.seqno; + ), - TP_printk("dev=%s, entity=%p, id=%llu, fence=%p, ring=%s, job count:%u, hw job count:%d", - __get_str(dev), __entry->entity, __entry->id, - __entry->fence, __get_str(name), + TP_printk("dev=%s, id=%llu, fence=%llu:%llu, ring=%s, job count:%u, hw job count:%d", + __get_str(dev), __entry->id, + __entry->fence_context, __entry->fence_seqno, __get_str(name), __entry->job_count, __entry->hw_job_count) ); @@ -75,37 +76,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) ), TP_fast_assign( - __entry->fence = &fence->finished; + __entry->fence_context = fence->finished.context; + __entry->fence_seqno = fence->finished.seqno; ), - TP_printk("fence=%p signaled", __entry->fence) + TP_printk("fence=%llu:%llu signaled", + __entry->fence_context, __entry->fence_seqno) ); TRACE_EVENT(drm_sched_job_wait_dep, TP_PROTO(struct drm_sched_job *sched_job, struct dma_fence *fence), TP_ARGS(sched_job, fence), TP_STRUCT__entry( - __string(name, sched_job->sched->name) + __field(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) ), TP_fast_assign( - __assign_str(name); + __entry->fence_context = sched_job->s_fence->finished.context; + __entry->fence_seqno = sched_job->s_fence->finished.seqno; __entry->id = sched_job->id; - __entry->fence = fence; __entry->ctx = fence->context; __entry->seqno = fence->seqno; ), - TP_printk("job ring=%s, id=%llu, depends fence=%p, context=%llu, seq=%u", - __get_str(name), __entry->id, - __entry->fence, __entry->ctx, - __entry->seqno) + TP_printk("fence=%llu:%llu, id=%llu depends on unsignalled fence=%llu:%llu", + __entry->fence_context, __entry->fence_seqno, __entry->id, + __entry->ctx, __entry->seqno) ); #endif /* _GPU_SCHED_TRACE_H_ */ From patchwork Thu Mar 20 09:58:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Eric Pelloux-Prayer X-Patchwork-Id: 14023651 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2043.outbound.protection.outlook.com [40.107.102.43]) (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 6B7B822371F; Thu, 20 Mar 2025 10:00:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.102.43 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742464810; cv=fail; b=dVhc+JM1YNKIqvp++gHvI2eg1u3q32YSLhARjrCcQ+W6IMn8+4MzFIC9+vXgGBaBN5gly+8pQ2NSNviqBnPkR8VAxZ+oqMzH8zCDcC/MR2bcZh1czWKXS1ayhCSS1eORctrE8L1wLFdfvpBsdJeRkiK/uIfDvu1RCvRke3+QIXE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742464810; c=relaxed/simple; bh=/DiNVqUMwB9D583SP5unh8lc7EFgd1O/mXUrvS72mtM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=oO+zeZYDERI45LSnDWMEQ7HAConDsGbRfcqJVcN8fErjac2Cmyfi3N2x95BnDdiAEqKMFUd3gce8/1EhQQWOtzEf2HrH2D7YGOMO6IHPIDeA2O4Wzr20XTpqOCY6EpkWiwjhCd8HarlnAOFkt5ShqirdaeC63MMbKPTRMKqrjPc= 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=uRv6GxUC; arc=fail smtp.client-ip=40.107.102.43 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="uRv6GxUC" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=M7FVwqCLJTcjk708kXZgPC6JY2edC/VTSr3UQlvT9Fq0Gd9SCuiwpjtqNrZX1XU13YBOlfy+iqjRRlapilGSA7ogMh0pC4Yzxb7X1Ec5NexMx0LWy5p/isiAMMTdI/wIGiXBxPu3T0NrokKaC1Msv0rkm/WDJaNF1BPV8SUxiXXNufTfFZkPljb6IhRn79xnnoDEpAISzGTv3lRd43ogWpG1BWaIXkPY7AQvpKTrmlT9pYJ9nilfSrdZBjzL0OBE+yyRMaQc8z4J5NKto85jZdFPtdAm2PYooFp/ljxBVFfnj4msyr/S8jqtbYTWBMMTAJPU6MhFdPYZc4nyCgVhlw== 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=WF5jPVNwlpkUPuvo0DwSEdRh77LyBMyrSyuWj6942VQ=; b=pKxks3Uzh5ykksVz4rJTrPg9+/wyemFbe6zSnXVvqOrhIr9K7jVwwWDf/Ve8hZ4Due2wELB0jXFTCM6HmifxF5okL3/G7y5+ok+1oVlihRrOvd6OVFS6nZ5qpMyEjCTXaR8jqrmV6PlCJWOJfUc5bBeCHwirqEbi5eoNB1qOzwSlqmFu6Ih4FrE+6YiNPHTnKyegpvviiuGwoKTCXrRLmYU1yGefcisgFEkQU6ilm8MHqF4D3h99ychc+lBAU/xSxnmM3UCe4b72lFQREYSdb/MXsKOKfjxJatLN7ctdRw5LSO5Q+Hd6+QZrtB/DBu+jNJXmcv7pFqrrcy3gnhgfBA== 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=WF5jPVNwlpkUPuvo0DwSEdRh77LyBMyrSyuWj6942VQ=; b=uRv6GxUCMCVhCg62B5TU9sOGt4NMPn/M5ox/HrdIvHesVzgYaBwdi29CVFi3jVmE47ftenU0sSL1BeLvkFKnd2G2B7+fIPM8JSPrWh37HnLGRZdB7vo/ksHvFh4QPhJLPRQE6Ok6ZShH6bbQAixHlBtx8qmno14iWK+j+RH74fM= Received: from BN9PR03CA0924.namprd03.prod.outlook.com (2603:10b6:408:107::29) by CY8PR12MB7633.namprd12.prod.outlook.com (2603:10b6:930:9c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.34; Thu, 20 Mar 2025 10:00:03 +0000 Received: from BL02EPF0001A0FB.namprd03.prod.outlook.com (2603:10b6:408:107:cafe::ad) by BN9PR03CA0924.outlook.office365.com (2603:10b6:408:107::29) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8534.35 via Frontend Transport; Thu, 20 Mar 2025 10:00:02 +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 BL02EPF0001A0FB.mail.protection.outlook.com (10.167.242.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Thu, 20 Mar 2025 10:00:02 +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, 20 Mar 2025 05:00:00 -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 , , , , Subject: [PATCH v8 05/10] drm/sched: trace dependencies for gpu jobs Date: Thu, 20 Mar 2025 10:58:01 +0100 Message-ID: <20250320095818.40622-6-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250320095818.40622-1-pierre-eric.pelloux-prayer@amd.com> References: <20250320095818.40622-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: BL02EPF0001A0FB:EE_|CY8PR12MB7633:EE_ X-MS-Office365-Filtering-Correlation-Id: 1a35200a-bfd0-4d3f-d7d3-08dd6795fbcd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|1800799024|7416014|376014|921020; X-Microsoft-Antispam-Message-Info: tjY4mYHFQVdp7h46hTNod3hvsIPZ7FL1zBPbDZJkABlbZH218cLfGftNgBqLELpX2R6SVaqQ7C7JQQHIGUdVxrxbvngyIuDUuDK70jBagawPgYFLE52Vua/lzJPaDsWq2yAIEUG5kakgsNWgtdXsdf4a8gPWoWAeDmje/2wyJVh4zI0YILhC+/1psjJMz6D9z8lB6lOIjjNNRQ5TbqA8ydbjws3NoVOr22rsI1OZicfAMS/5B/mIhTXD4c5hPj8SM0J7IlVtxoUrIxqguR6bI7UprquBNayj2hVt5n//JtjlUsRo9W0CpTRESoXTEjFFqitR1lBlKu3V0Lzqn/pk1mYBPq1pqjRX8ZeUv8YnilAUu/7bf+UM8PBDst9aRx24O+Py/avaLd0/kOsplKhf5ybw0q88NLscG8f9oVSwSZsyYKodYivGqLjjcjQ37ZbNosaYM/LZ/LPNsD54I9mieTIn2C/wn4C54spDgCvuNEjirI2H9b2lazBunUgCQgpeVhWGTukfG1dd9ehC7nvrf3BvZ8lXNqxvwcoHQVmklCtLhr0dBLVtUfVC6ynfh/NUNzbkH+GyJlXBN5ipkRE+RMn+QfBhdX0CX8NsBSSLjolTEaXhAFf7JnK5mUFYTb/jYzr+q/5wqKgl6814eetHl8UvNeQTCD9PY+ipXTSjeEtceFZBdgf+/9UcvMtwzajSDqVrAJtmL2gROSCli0rabkVKCUVpDTBGTpCSasykKo22BW3HcVeZ31+ksFuZuP1+GljUyY1CKZ9/yxUYmc3skV8W9oQTD7Ahpu2jeHou+/g1GfMkhZCH/mrlsC72B3GJLqB259tuejn+2wmGlhDwheV9tt1H6VOi/6do2Ds+p+KpmG/+L6irPQlCO0nP7ek3rQnCk1bXCmLpTfWAQrZ7z5ez9mIyJPIBmuuKcF/vOG663sj2GYgGjZBpiQaqaSY9e3LT/vLXixMqCW1/lLdwmLE70Q9iRINP0RyiLSTEprS/YGfAaSyYGDL/XLXtaB31HfJPW6znWaobLuOgpTTN2k/n20ZujCcVv99fdUBz51HwbFUkq2M5z8w08GmR9WP461RdS1bLt10YSpuSdYBrPc8FDrWXE1ca/DPzXJu1/2mLcTQWcNERjbxIN7p2+/Flu5ja30QcEc/RFrtuS+OfQeIgqijhDCGV0wfvk3aqDm9Twewv5dNk766rGsLW+igJOBpzK19gBSBmqGE5JOIKATL/3hbohhClINGrTMV31KMf/xhekbJWTSx/2T72PiajZ2nmFqCAbdn8qsGM8JyH+1SS5bLlBzVFqoc4qp8ctwFep6mTT7A1g6VF7mAXeYeVN3pbq9JmXFnaNkqSC+3lDFfvY0BGMUSl3CQ32PNpVQ5ZH8nZkaWa2+WwQJiu6LPz/Ivq1QZJKlaDk2vPcFZjXQPdyd1NlgbzFiAn24YnEM/uAkUk5FOnqttNdLf8z7yVvNF4qO18acNFlXyU3rqBqG7cLYROit6NiRmcZOHFRHfOCqoTPAQu2lQbrznsg+2G X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(82310400026)(1800799024)(7416014)(376014)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2025 10:00:02.8369 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1a35200a-bfd0-4d3f-d7d3-08dd6795fbcd 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: BL02EPF0001A0FB.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7633 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 | 24 ++++++++++++++++++- drivers/gpu/drm/scheduler/sched_entity.c | 8 +++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h index 21a85ee59066..5d9992ad47d3 100644 --- a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h +++ b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h @@ -54,7 +54,6 @@ DECLARE_EVENT_CLASS(drm_sched_job, __assign_str(dev); __entry->fence_context = sched_job->s_fence->finished.context; __entry->fence_seqno = sched_job->s_fence->finished.seqno; - ), TP_printk("dev=%s, id=%llu, fence=%llu:%llu, ring=%s, job count:%u, hw job count:%d", __get_str(dev), __entry->id, @@ -88,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 a6d2a4722d82..047e42cfb129 100644 --- a/drivers/gpu/drm/scheduler/sched_entity.c +++ b/drivers/gpu/drm/scheduler/sched_entity.c @@ -580,6 +580,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); From patchwork Thu Mar 20 09:58:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre-Eric Pelloux-Prayer X-Patchwork-Id: 14023652 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2058.outbound.protection.outlook.com [40.107.220.58]) (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 52186225777; Thu, 20 Mar 2025 10:00:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.58 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742464828; cv=fail; b=jGA4khJQrEbAcHwjXDiY535TMQvYbGWCMrrumES8ykCst8eQGkbfUplyMCFztix/zRPhocpx/omgCM4rd9Tjjrab8qo9+af0U3u150aC1eThFXSG/ZaVYFLUbc6Q40JGFEsqHwqi7XXqfJxEF5XI8G4NlIZv2Uzd7cRarJnakZg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742464828; c=relaxed/simple; bh=p0wpIfOaBEke/lu6FUNrLMEtHSLtGclpc0fmJEh+Ano=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ThSnCfmcbrzARpm9AkHUdJFoo3hT0Tye12mZHs6zmBC3x0uRik+fVOZzmFgYdUyk+zzaWIb4lGoI1CN7gdnpvzTdX1q+rv+eloSVKq2DHChBoZi2TOgyqw3LzK3VqBD3OGUzzRq/7qoAJ441oOi0kIdwxNWDJ5RiwVjVKHTj9u8= 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=FG3GpjrP; arc=fail smtp.client-ip=40.107.220.58 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="FG3GpjrP" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=F9RymT6og7sJTmkFYnt+iJgpjhLRsUIscwUKsG/YfNMU1Ka9AAB3ZAi5hJp0g69UP7FMxyfg/IXk6hHdHQSSROOhyZyByZNbnk3AQgZS8aW1dZ6lZzN/d5Wee0mGayWIaRlApFwpgmPOShdFAErQ+l4emJWWtXJqoYiDWTlm39vK0PFMCVhPaiAEePiT0xJ075GxYiJKwsfZOlPiLVrGuVHNgIjjzhotf6ZP1JA/gTiOD5t7Fkd2OuOZG7JvR3pElnFGcnX9TwvIFWxpbUcjhBi7QW4G9FWtObtoEpAaG0aODnSKGt3X4Rstr6ygM1s1M/MsPkorhP214hPr3eg+3g== 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=XVMF1EMzMmNICY/mkImE9hLbB4xuVw+XXWrQQFOtzZ4=; b=FI6fd9h4DlvmNfpj6vZQw02sSh1Qu05ApEkB3NItUAcP1OoWrmkv4tYp3AtX58u5YxhBoB51lnV8ePaudRcbuCPrfilRPz1nRPHpwQ/vkQZldcAPNag1PjHHPomycG+4R1kkvSmDRLz8fIvJsMqDhuax0Ur40hTaX+2xpZiTo6O/i/bKi2ksG+1O5XyglfAQxrfg8z5WWi69R2fZDXqEuef91L0ivVf6uUpP8jq2iBX2SpCDzqVKeLMP2a4QJA9uS8jKRr4vE11+0xTut+r3xkR7VXPD3SK76QhNZ0zhkMNRXQM2U2IQ0Dobn2NxAWV1HcgrVmFSWg0pS1ctPArTiw== 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=XVMF1EMzMmNICY/mkImE9hLbB4xuVw+XXWrQQFOtzZ4=; b=FG3GpjrPLHZd61Exw8TouLpBSTmWm6aONnPkmjngms+LazrGzIOwFtVOd3U9z9g6+Bc55j9y+qutqRnPXMVBQB8fLLntIhTJ2ca8vv5a7eWV6ICJqiAVqU1E9dWSkU6TFZtHmAjnCKh5SvSk2ZuTh2ylAwXCI1lzXOOccnv89/o= Received: from BL0PR0102CA0038.prod.exchangelabs.com (2603:10b6:208:25::15) by MN2PR12MB4160.namprd12.prod.outlook.com (2603:10b6:208:19a::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.33; Thu, 20 Mar 2025 10:00:21 +0000 Received: from BL02EPF0001A0F9.namprd03.prod.outlook.com (2603:10b6:208:25:cafe::7a) by BL0PR0102CA0038.outlook.office365.com (2603:10b6:208:25::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8534.34 via Frontend Transport; Thu, 20 Mar 2025 10:00:21 +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 BL02EPF0001A0F9.mail.protection.outlook.com (10.167.242.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Thu, 20 Mar 2025 10:00: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; Thu, 20 Mar 2025 05:00: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_K=C3=B6nig?= , "Sumit Semwal" CC: Pierre-Eric Pelloux-Prayer , "Lucas Stach" , =?utf-8?q?Ma=C3=ADra_Canal?= , =?utf-8?q?Christian_K?= =?utf-8?q?=C3=B6nig?= , , , , , Subject: [PATCH v8 08/10] drm/doc: document some tracepoints as uAPI Date: Thu, 20 Mar 2025 10:58:04 +0100 Message-ID: <20250320095818.40622-9-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250320095818.40622-1-pierre-eric.pelloux-prayer@amd.com> References: <20250320095818.40622-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: BL02EPF0001A0F9:EE_|MN2PR12MB4160:EE_ X-MS-Office365-Filtering-Correlation-Id: 40b82cf8-0e33-4896-0349-08dd679606bd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|7416014|376014|36860700013|1800799024|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?VfMRJsTD4m8gZXc+6K4cHLf87H/rVMf?= =?utf-8?q?3IGc9ckY/p/qWIWlLEuCUGDwBn4Cq++Pp1mZCKZyilDYJuR+/ZPUddlW4ix3E9Yue?= =?utf-8?q?Uak+5rolZMlYuI4knnFbUdwuo9bAgdlWx1EBteUOphMzrVm0wt44D2x04c69zUZVp?= =?utf-8?q?fRq7KJZhInNtOiQlDe1CnMhFOFdBXUdgPqUC3pTItCF6J27EfeOhCNMEz13DnmJdX?= =?utf-8?q?55NH/C43cw4vH4gcx+7lmk/HyenLTWDBdG/13zXsvWI3VInIBnmO2Z3pjcSNlCnuF?= =?utf-8?q?oz1VBbPHUTC1l6llhJ3XqQhOBSpXKNlwZ+nZBONIKdQc6ngQVfII+XAKpICisZaDo?= =?utf-8?q?JJORDrKjErnFCs4gusIVWl70zIDHZE7JWmCM3UO4S9uA6BsZDVVMllmS3lNW8rDRk?= =?utf-8?q?u7qFhRxOewa/C8oQiX3QfLXt+EGz+amQqBnzwAxtn7VThjNtU5iGRsjyeJJNAs/Ly?= =?utf-8?q?Im9/QMpytIZ+IJAcrNuLiShBnfwn6NXlfJJ02ATwydHrjXHXX4qiF7XeX0BEidyCZ?= =?utf-8?q?OhQNjkCvg4bdYRh0WoNOXU2lw9b1JODBmYNhXDOpSM6MqqvQT1GYyTR5hrnWWfPrz?= =?utf-8?q?Jri/bPCCnJytMJhrVG2YY0mT+r8OCngIWT9iBqm7K82RQsHzDHv2q0cIWVnKA2s7H?= =?utf-8?q?X71aS2Q8vrnUd2FIsK4RJhD/rxQ3m6eWoRe0YqcdpnSNMXVU96kbWyMbQyWSxjrle?= =?utf-8?q?Kis/y0BJSOQItV4+7OMTn6RfSTfx96n8L9YI2c2yO46UyPdE7ihwmXbfY/iC77fin?= =?utf-8?q?CFkCJv5y0cEflKDw6d9olLJ2JBmBuOtKoUo6VNPHZ7Sz+Q1DbMUNBdGfs1MAwJIlS?= =?utf-8?q?RkMiHaBZ5fGQ79H3HQn8hvdfeVsd84viDMZtdJKWumtayjKJyop6B4BJ18pClY9q7?= =?utf-8?q?2cNLmOX1r8FxiuiaXar95gklBOt9yTnoo74t1CHZEHcLXOKaCAoMe2b8yAl9MWZpb?= =?utf-8?q?ndGf7zrKeBmRjg7H8Wl0s4fCqFc1+8sm9vXemmnA8FEDvWm3pJJYj+4IQtw9O0szY?= =?utf-8?q?Db0fSdq+CGNJUIpmbb5p5FmI3+QfQQsAOL0//FQWOxU/iuo4aiDSEVz14h1dSAf0i?= =?utf-8?q?6QeTLdnQ6l1+mk2kOzvAbXh5chPJcS/D3SZ0JTHLcMMGkqVpkh164QdhA7TK+65u4?= =?utf-8?q?0KlHouT4oj1IILc3iMZ5y9S+2DcsgrX1aXiwDgM3FGEIp20FvkSHa8SybcTxVOdbe?= =?utf-8?q?b9S5/3rVN7e0GounczRu4nNIQSv/T8TxeQ/kS0tGpixos94YvMstAf3qEiVf4uqJv?= =?utf-8?q?wglMKogGQxanodMtzDJBZ3ns9QtuJ3u5pKgYa95aHWf/4nqQ2uu9xNEYUaku4jP73?= =?utf-8?q?4qRssGq/LNE5ubHnWqeEK6cXKAKl55nyVT345g1/j3b9zOFm1tL95MUc32IqN+e/o?= =?utf-8?q?Jl42OlvUurGX7jPvr+weFd5rOmQiMqRAPupew7r6PcCbP4rPd3bzVefCUXTTOU+9h?= =?utf-8?q?b/9pJuGs3E?= 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)(7416014)(376014)(36860700013)(1800799024)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2025 10:00:21.1815 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 40b82cf8-0e33-4896-0349-08dd679606bd 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: BL02EPF0001A0F9.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4160 This commit adds a document section in drm-uapi.rst about tracepoints, and mark the events gpu_scheduler_trace.h as stable uAPI. The goal is to explicitly state that tools can rely on the fields, formats and semantics of these events. Acked-by: Lucas Stach Acked-by: Maíra Canal Reviewed-by: Christian König 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 Please see Documentation/userspace-api/dma-buf-alloc-exchange.rst for information on how dma-buf is integrated and exposed within DRM. + + +Trace events +============ + +See Documentation/trace/tracepoints.rst for information about using +Linux Kernel Tracepoints. +In the DRM subsystem, some events are considered stable uAPI to avoid +breaking tools (e.g.: GPUVis, umr) relying on them. Stable means that fields +cannot be removed, nor their formatting updated. Adding new fields is +possible, under the normal uAPI requirements. + +Stable uAPI events +------------------ + +From ``drivers/gpu/drm/scheduler/gpu_scheduler_trace.h`` + +.. kernel-doc:: drivers/gpu/drm/scheduler/gpu_scheduler_trace.h + :doc: uAPI trace events \ No newline at end of file diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h index 4ce53e493fef..3c7f6a39cf91 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 +/** + * 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 considered + * stable uAPI. + * + * Common trace events attributes: + * + * * ``id`` - this is &drm_sched_job->id. It uniquely idenfies a job + * inside a &struct drm_gpu_scheduler. + * + * * ``dev`` - the dev_name() of the device running the job. + * + * * ``ring`` - the hardware ring running the job. Together with ``dev`` it + * uniquely identifies where the job is going to be executed. + * + * * ``fence`` - the &dma_fence.context and the &dma_fence.seqno of + * &drm_sched_fence.finished + * + */ + DECLARE_EVENT_CLASS(drm_sched_job, TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *entity), TP_ARGS(sched_job, entity),