From nobody Mon Feb 9 04:42:18 2026 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2070.outbound.protection.outlook.com [40.107.212.70]) (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 72EC7220689 for ; Wed, 21 May 2025 15:48:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.212.70 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747842489; cv=fail; b=FWJQaKS2ZtTWq+uaqT1VBj7sHabIHcJFEI33+ghEam2e5uczVSimXbxU9LO4C/nDmEtcOWyFyOELoZK+PuvTUTH1svsIzsvlYHe+TQsSy49k1ZKYm7mhUmR5D8UJ/Z4VAR645MmIyeftO1RNd75eOvgwXTmHyds8FTjxoDl6XCs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747842489; c=relaxed/simple; bh=S4exrgp6nCCnjpU75pvGfnP76/5r83VUA6Fzx6/riZQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=PDCdGg8GQmbIB41AR7aCcANU2Ccf0Vepb323O060WB6eHT0rsR5U5sdWUj92nnVEoup6Y4t958WuEfjuJXlec+oKzyZHSykLLG+jZWh95+bg/EPx5EMkvp2v14hKK6wzTf76WSmBboyjFgRewzkhNxE/bgy3QvCRYbGvcfKMtnw= 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=iNAxYDQr; arc=fail smtp.client-ip=40.107.212.70 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="iNAxYDQr" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kFu0BR29RSCNRFiSJnatLygHG3OkWbfRBRtcqbUpWUr2BhElBMM6OQk8fUGilozymIyUctm/d0K4qcptlSNb1OBSoKWDDat3+h0qD9ZqzNUmxzG7zhQPZHSkQdhRBXKtAMRlrusupoOuCxTeVXgXegj2EgAAJ9l0tTIYSp7xHSr+xA7LASeIQp6/fYKBp+CMlBNcgNy3J1MGIuIoGbvPVEmL4WEM5/PMb4fCifVb8fbxmjWRJvSJ3yS7TZmUbIivANlZY3vTie/Da9jNU3a0L1S/C76AC7nF3b+AEmun/zQwcuQu8DYE51esb6Zlt44tsY0bG4Wi33KmO+cAnLGYkg== 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=AGOlyxt52u5koJh82tIv5Yj7KkTYrMquJMPMcRnS03XqcQdw7OVpJG/DUiKunbdgWTiNL2en7GMvfSZ+zYfYdQUOPnIRfh/l3F1GvJxJC1MjPGqnP/yZXb5xeyT3Dcu+250+Q9MOgoXk5HZPcNUdYOCO+I3OwK7R2NrogaV193feABxbGb82b58daRUkj1ArCJsxKLYgWNfoQmIV3CIptH1xXfc6PSc4CUnN3Ob83Qj8viTf/I/qN4VgYqfUNhGzXZcGdJ8AB0nb/TwFCAcctIQ1beUA0d8/OJZrr6U4FgvVm6AEagdj9h1EbDNt+eMwREwVI2biQR5SkxGJD+Wv4w== 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=iNAxYDQroRgfoY6jHLkFq0sot9O0VvE+9VsWlqVadT3k3mEli2NmSFot3gJqfMXm9ECogXfBWkKSoaSUEiiKxcWx4ooZ7FXBTQ10qVT9BbGggUqQORApmNHOQ2d+MpSJIHovCDhx2Uonb/Ax6AhOQs0yO2e2yeHb6cdd91jNoY8= Received: from DM6PR01CA0016.prod.exchangelabs.com (2603:10b6:5:296::21) by IA0PR12MB7626.namprd12.prod.outlook.com (2603:10b6:208:438::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8746.30; Wed, 21 May 2025 15:48:02 +0000 Received: from DS1PEPF0001708E.namprd03.prod.outlook.com (2603:10b6:5:296:cafe::e3) by DM6PR01CA0016.outlook.office365.com (2603:10b6:5:296::21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8769.18 via Frontend Transport; Wed, 21 May 2025 15:48: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 DS1PEPF0001708E.mail.protection.outlook.com (10.167.17.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Wed, 21 May 2025 15:48: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; Wed, 21 May 2025 10:48:00 -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 v10 10/10] drm/amdgpu: update trace format to match gpu_scheduler_trace Date: Wed, 21 May 2025 17:45:12 +0200 Message-ID: <20250521154531.10541-11-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250521154531.10541-1-pierre-eric.pelloux-prayer@amd.com> References: <20250521154531.10541-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: 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: DS1PEPF0001708E:EE_|IA0PR12MB7626:EE_ X-MS-Office365-Filtering-Correlation-Id: 2113e563-295a-4374-4a47-08dd987edebc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?utf-8?B?aXZSN3VSL0xZN1dnSDAxR0tsQVpXak11Q21ab1dlSE8xU2taSkVhdHJoNitu?= =?utf-8?B?M3lhei80S0cxUVo3Q0hRYjlCQnl6Unduc2ZOYTh0S2t6eG5QSHh6S2sxSnhp?= =?utf-8?B?M2lWb2R1N0N6QlFpTHZ4OGZweWk2cVZORXdBbFV0d2hMWTZyRXFBYmorOFRr?= =?utf-8?B?SlN3YTlTMVdnWmRJOHFPOGxJU3UzWU13RHA2OVAyVEVTWlFJYWl2V1ArUTlp?= =?utf-8?B?VWJ1MnR2bUdFdmYzYzFMY2FMYXBKN2JyaU84NUk3Y085RDJCRHMrQWsxME5r?= =?utf-8?B?SW11N3RrODJ4b0o5M0VjY0JxaGtWQjFkOU1VanNmczlPRUZPNk56MHprVWtZ?= =?utf-8?B?a3o2QzR1a0Ixb2ovMko0QkllU1dsMWt5K3BWOFQyWnZ2ajd4OWw1YVR4UUtI?= =?utf-8?B?Zmw2VkFTSWx0QmlLcDVlUVU1V3dZY2VrMVpKNFY2UzgzcERBRWxZeEZ6dStD?= =?utf-8?B?NmFyTGFkZC9NMHFqMWw1ak5GSTlBbTJBUE5EOVJ2NThBMnRaZHRxa0tjency?= =?utf-8?B?alBOVy85SGc4bks0alVIUjg4enhhT2s3MWdEY1hPSXE3bmoxaUVYMU8yVE1k?= =?utf-8?B?MGdVcytqNnVpZXNCVjhyRkhBZXNkMVprMXk4a3l5NW1VUzZ0ZEJtWXVIT0Vs?= =?utf-8?B?MzZvWDhkOGhocDU5elBkRmQ5ajF1a3VwUjk1U1NWU3kxYzBJbVR4QXZWa1Yv?= =?utf-8?B?UUVDQWZRbktmdHI3czFtWEVjQjhyZWRlekx3emM3TDk1Y0FTY1psY1NiT2VS?= =?utf-8?B?QUc1Q1cySElESjNMT3JZRnhBY21iRFhWd21raHoyZGJFYWpxWDhHUndPWGdQ?= =?utf-8?B?RHA2VVdQc0JWcWR1UXpHN05NSGdnS05wbDJBSFFBYzdGOFJTY3FPRVB3TjNx?= =?utf-8?B?OGdRcWVLUzZzbWE3azNoMDNUM3NCSFhYRFBKTjZSNk5oMGlaVDcwRVdFTEV5?= =?utf-8?B?bnpkLzY0aGR4Z3hTU2gxVkVNYXUxTVRaU09rdTVQWmJFd3pxZ1hOcm5zRmNy?= =?utf-8?B?eUJXTFhPZDNFLzkwQi90cld4QkNXZzBiVHlydUpRdS81RlBIS3pad2VFVFo3?= =?utf-8?B?QTB0QmxXelBLbVcvZXNkMCtnYkVCL1lPY2tKWlhMaXMveEFKY3FnaDBvcmJW?= =?utf-8?B?RDBubXI3dnh5RVlUMkxSbmZHOGFCOFlyR1JQY0k1elRjMG1HVEgyTWRZZ29r?= =?utf-8?B?OW9HekpzbzQzK0JrQVNmdWxxYzZmKy9DbC9ONzZ0MUQvNHFNeUdwbTkzVDVu?= =?utf-8?B?NjhZNnVFMjZBUWUrOXU1TnY2RXhsSUVqdlJUanBvTm1ldEZCRzNDazQyWVhp?= =?utf-8?B?SnFNMEFtOE1FZlJleEkxcHN0Q1Q2YkR1eTIzR2xHaEhRcmRUUHg4Vm5melNV?= =?utf-8?B?UE96bUpEZnhqa3VMMFB0aTlJSTZONStvd1ptdS83M1Jjc3FWcUJSeHZYY1dk?= =?utf-8?B?anRyaXpQNU00L3Z3K0VNK0pYZ3U4VG1sV2wralNSTEZDQXRMRmV4SU9lYnV2?= =?utf-8?B?aEp5TU0xN0ZORkI3MHovdnN5RkIxUEozR1BrR1NhbGJNdUl0dTZ2UXBueXRl?= =?utf-8?B?SVhKT21Idy9VSHZIZWNyU2IvV3pUTm14RU9XUTdsRERpdXZpRDNURENnaG1Z?= =?utf-8?B?MFFmMFNDM2NlaEs3N0NHdWYvU2lTVjJMR21GSjMrQUdVRVB6TUF1ZWlZQWF3?= =?utf-8?B?S1A1b2ttYk5KMDF1RlpnWDBhRXZ2eVhMS0xodFFtZU9DeTN3L2xyM1kzOFNl?= =?utf-8?B?KzVnOGEvTmNIdmZGT1FNRXRDdU5EdnpMZFp6L1RaNFNSZ0NRVmtrQ09USHhD?= =?utf-8?B?SmRNS1RFM3pQOXlXaThIMVNvaEpjMFhMZzlHUjFHc3FJTlI4dHY3cmF0RlhF?= =?utf-8?B?bnVRbnpjQjFsYlBYbWVkWFpsV1c5Q3FxUm50SXhxZ1ZkTVNoU28yaklkQUxr?= =?utf-8?B?RTlnUzVwTDR5SmwxTFFheExBTHZJNTBwNHg5dEZ1WEFQdWFUR2FCd2NaSFFQ?= =?utf-8?B?blBhQUlNb2NBVURKVmZkSnpQeHpKRU83OU9QaUxDVGNaSVlUcjhWK1ZpVjVP?= =?utf-8?Q?8h7fiP?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(1800799024)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 May 2025 15:48:02.5852 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2113e563-295a-4374-4a47-08dd987edebc 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: DS1PEPF0001708E.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB7626 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