From patchwork Tue Jul 31 14:56:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Grodzovsky X-Patchwork-Id: 10550883 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0C48F13B8 for ; Tue, 31 Jul 2018 14:57:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EFD3E2AF9F for ; Tue, 31 Jul 2018 14:57:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E3D3D2AFAA; Tue, 31 Jul 2018 14:57:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9470F2AFA7 for ; Tue, 31 Jul 2018 14:57:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 67AF989EAE; Tue, 31 Jul 2018 14:57:43 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM04-BN3-obe.outbound.protection.outlook.com (mail-eopbgr680045.outbound.protection.outlook.com [40.107.68.45]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1C71889EAE; Tue, 31 Jul 2018 14:57:42 +0000 (UTC) Received: from MWHPR12CA0070.namprd12.prod.outlook.com (2603:10b6:300:103::32) by SN1PR12MB2397.namprd12.prod.outlook.com (2603:10b6:802:26::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.995.17; Tue, 31 Jul 2018 14:57:39 +0000 Received: from DM3NAM03FT012.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e49::206) by MWHPR12CA0070.outlook.office365.com (2603:10b6:300:103::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1017.15 via Frontend Transport; Tue, 31 Jul 2018 14:57:39 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by DM3NAM03FT012.mail.protection.outlook.com (10.152.82.116) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.1038.3 via Frontend Transport; Tue, 31 Jul 2018 14:57:37 +0000 Received: from agrodzovsky-All-Series.amd.com (10.34.1.3) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.389.1; Tue, 31 Jul 2018 09:57:36 -0500 From: Andrey Grodzovsky To: , Subject: [PATCH 2/2] drm/amdgpu: Add job pipe sync dependecy trace Date: Tue, 31 Jul 2018 10:56:54 -0400 Message-ID: <1533049014-6934-2-git-send-email-andrey.grodzovsky@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533049014-6934-1-git-send-email-andrey.grodzovsky@amd.com> References: <1533049014-6934-1-git-send-email-andrey.grodzovsky@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39860400002)(136003)(376002)(346002)(396003)(2980300002)(428003)(189003)(199004)(476003)(305945005)(72206003)(2906002)(356003)(104016004)(478600001)(53936002)(50466002)(53416004)(48376002)(105586002)(44832011)(106466001)(2616005)(186003)(47776003)(126002)(81166006)(77096007)(5660300001)(11346002)(6666003)(336012)(86362001)(51416003)(7696005)(450100002)(4326008)(36756003)(16586007)(54906003)(97736004)(26005)(486006)(110136005)(81156014)(76176011)(50226002)(426003)(8936002)(68736007)(446003)(8676002)(316002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR12MB2397; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; DM3NAM03FT012; 1:1kv3QpxE9SaCdF1ORn7klmsadVtYTMQqOD2KvaZjX3b4ngBxtrc7dIDw5oxnaeNmlwITuIcn72t2NnHfwo2ioPy9OtgodcYxcuElMGsb6Fo0yS9fsx+0Q/ln7b2scnQ9 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0ea72312-ac9f-404c-f9cd-08d5f6f5f568 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600074)(711020)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060); SRVR:SN1PR12MB2397; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB2397; 3:o8HJL+u5bP2dLyGCaOUfLUFK+kyPOB7oDYisddlt2YuRMwgNanpyXqcDyepuRgiDhR72uGWE4nMtQkTfZmj22AkAl+0lVi5IGjvIIyuxc+n2JW3F/sg9yv7p4bpNhdhooOVu2vJ0tQzYIkA7U7WYAqEBbsTzDSX207Q/6U9abE+oS/LX3udp4GXMPW3rv5I2hFYzS7PAfALA9rrAp9QG/kDWRiEO2YxDC2BcCzSwJMxSxR33zyiOWMYQkNvxzv/iPLGQgQfmiR+GHzAqgku1/5R04oy62hcTrWc1IfCyFk7Fr5uexbqLQvYGek9zjLoeXiB9UtxAA/5j4FTruBg2TXxv11WrOQLkO8eqMMvU+Q8=; 25:DUbF49IrsSrs7RAKi8r2O7HwSP2+409PURpxwG0e46PmsctMDSPDOdba8h8Lc7AFI7TpheCpA/x1Fx/KL0NxQfEIrVSLFdwq03DCfjgN+YbOtDE1pvQakVXqTP5SNZdIyh5gMk8LTGfUn4iQggyA/vzh/rynmW2hT6VzbWUKnrZGoC450g1FnOo8kyZkCTidx6P51PVDgaZd6uRIonUE+gI8T1FIsmcnpwH/qqT8iXPjeKt5ftB376aWkyKvsTi9OWJv/ufHO+DDwnI3f2SBpnWMyZ0YYREF5E7+iCBYCMwLN2xix5qPQPFfEDmYzg7YWuiXn/pd7WFpAZ7GnjUMQA== X-MS-TrafficTypeDiagnostic: SN1PR12MB2397: X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB2397; 31:GeGHuiNFNqPl22BkDxqvVffhETN3v9G/cGr2d5BfSTHcODM9EksaOTSaCD6wT//JxLMsX+nFCahB86+RTZU99aZyv5rx0GnemsVqRSfdnHENYEju/djQarQQeAWINaofyn//yp6f3tWzZ3DHGt+s3EgeKRYC0y6wC/0aGdQSJ6hXE2FTH2P4r7K3kwBhEvydGOlXp4Gfgk+l9aCPP/sb8aB7SA6GRKYOpnVzEGv4vyE=; 20:AWaVvIUYLZ459NHNZfaAa1q16mDB4H3fpAc+UCrtSBUBX5Lp5koeFUoSxXVauQRQFcaXGP+WTa7JUijre30IlQplZ5bkajquq8HXaKfgN/hX9n3LkrwbBmUNT6dMol+PN9tdh20vJovXtBKgsWJ1Fu1P+ZNKXG180hMfr+jQQ4EZWDTKLDYFTQy03IQWOm5th79zkTT6QXv4qU4dLWIe/mBAcX9TARFdqePJt4b+nfVGQA+m9RdvIA7OPvfNAqThx1+x/i4B6r80N8dlSK8ZaiR04Xa6qftJsw/aySeJkjWurF7a9GR81z7mfr+N8yWiWxjMRoUUGzlGSAVTneLBVLbkOzV4zU5trIATBuq2mb/mWnDm3LD+dpD8QhMvRN5MncxacIlZ4SdcxKoTNQB2l3GyypPVgZYL6U89xvOCdfIQZax5JJUSXK8247Tq3/GhsToYkGNYk166/H0a1lsu383Z4ZvdT/X6llmrs8A2cKPOBI+uptXND7I1EPqXZi9j X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93003095)(10201501046)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(6072148)(201708071742011)(7699016); SRVR:SN1PR12MB2397; BCL:0; PCL:0; RULEID:; SRVR:SN1PR12MB2397; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB2397; 4:9NsQhPuTKTMCAouLkHgydWzPoKInehZCYPUcclrMrt89dCJ6+5eCr/P8gghTjRF4i2M/l4n8d4OFnph9T+kBNLpWgLkOuBXQ8Bi8jRVToye0KZCE/upVqG+xCY+r5AkTBW6EaaxsXB9WqkdgHhtYUPXmuDSLzLuuhlsFn9sAcsIXISmD1+pms6FZ3vc4b17zOrwoIBNHqHBWDF2LprMgkqhVQBlYZ9udGGVhOzcur99ZYo8SyoxDVJ4x+PiGJ5z6CKa+VtOwZMcTeHySewT/tjTJW4w+OBxXwGs5S1cyQkLa7IWNY37MhbA8At8g8d2H X-Forefront-PRVS: 0750463DC9 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR12MB2397; 23:foSJCJrtDRHFUf/EBxhvfRedAphN8Y8KtSUPwkm/z?= pmxs3BATepV407VXlkpsIBO6bWEoNVO8I2vEITVESLopE+Dm5pbnLTbCNLmHtQYfjD3tYJkzVq3LUsGBaeUujOsEtQGJLh5uuEdB6jdJ5yaLECIHMqdEb8xdMAay3rT9GZ5rqBCFMaz2X+tF+CHQw6XOYrXrscN9JnPLUQkjTPakhVMRQoSZkWbU2APqCNz2QZGLoTN8OuYUFzHSdCBa1HoYlp90ZHB+J/bysDlu+Fk4vETyzqPRb9UNLlLbCQWtGpO5/OaQEHNeQZ/Scv6eMzl7GNF+5jt9okJnBFtpT9VpAC+H0xkyp0/EA3NrH72EezLBfrKrv+o/kbUOYVGibKaUZcoFZHp5oczh8U4wSOiT3sD4aHJ6pRrFX1l04uMTEp/QsIEITP1tobKIfjT6LMamuPOallFs+NfQIF1S8EM/q8WdQ8MNXJElV50msN9ePG/dzQliFim/W0dQudy0sq+x8cGNID15s4olQpTmLBz6EgkwP6Pmsy/uVaNsqJwRTsJypwFsUQBIrPjGZ4BuDj5Bcotmcw09jEBreX3qQnCr7J+gSJ+ZkXlBRxYIl8UMGjkuDg+6Ek86P9E40uDPqQNSOaH4r+cqyV0ngaKxa1Lfa2t1nORdsnCFwT9gQngB2WCAL1SbofbAW+uBLHox/kbCQJKpYEFjCNguVaF4lPocQmLW8gO/zdLlWUbWvX4UQNTR+86U1zeZQOSZ8R5sYkE1OW8AYB+pfiOYopiwg61lgPx0FR5OjqP+EZO2LLGBuoPzXWmgkY6YVSzFBSY/mSFgeb5T2nzFlcdr5wmd2bKfMTHJxsrsEZf45z0iIfxeqt0SfVgp7EcF+or6lPJkLYriYQpDJEGrVrj5fw256ZHOSByg4pqUeoSWF3KCCEckCkcLx7Msqx5ipFhXrUHyiIzOMbeFTvHozFxC+z/jWo/YTer2JezEztBgdZxZl+OQMSvpvOo3duC967tqdpC/+K9nrewkPwstfJ655j2zwnHP8tw+a6cmDGkg5aHNW/0eLuOBepZSi4ZGAOCY7c/5zzUcAv9dgay2YFiWlFivrFob4GAhNy3NPogsnH2PtXVwXooB3wMb6HdL6BjnuirVsvA76r2BwwJ9OM7VjBAfbTq8VpJggPfPGZEO+LBh10yaTiKxZy4IhMEU8Ce9kzBrBnW X-Microsoft-Antispam-Message-Info: wB35TQ+F0uBE4tfhOcv7buJsKSQDOGitA5XxbnjPKom2Dn4Fy+zCdGWspS1TrlvR479Oz7rrucoMxVoIJGSUw0jeHZKOrJjVI+qAXgmU993D4eY2t79pgTCjk1YdfRi29lbGC+lgdq6AvGBehupOnAWnE5mtXTE3RRCq+c/9ihXzcu6oOyxmsTeYIGHuJBfsrblLulKiKZzc/NatS7G61BkwUQDyIslvLAKoLNPF8D9YYvbgnmG1T6DIZ0fD0K1HRGN+lSmo6RoxeJ4SwdKJEvJqL1xvMW5J0wrDrRbnwp6vXsu6bXs+Cvpo0cYi186/3zEymFkhm2wqdjcaHOog61K1BCYQVXG+aY1DGeaOvAM= X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB2397; 6:9wpZGr+4gw1g5mahdSnjhqEzQ3+2G1vrRogVn5Z0OykMPr7MvBCN23wyV3ykzOUTLUp5pOMvvPhlvMB17q8zQC1nNZJrVQ+TGegk0Dk2I2WeGZEEjux5Sm0cRz82SMyxq2S9FrP0RG31/oXCDZj7JYYljblcbs9qqXFnDzlBxb0XUeexnnmsmV+zVtEPs8Xy0sbzp63/2flGAzQUye3E4B6IlqjdZiVKWGqNo4JugTB8H2TKsXrov+dsHOrQHMKYv4MxXMR9nnbBvP3ddctZjcHG+zIBtKbp46DC/9lYdBHJrv+TdyLJDRXENRkDGBtOBfVgzlMiSCaWSi5a93I7CSrBqj6f8WASJNVPHe4dKryueGL8V85i3nzwCH6xGmL83CcJSQ7XoKKUNNOMPjBMJBKig+cp0yHtNfFsm8Q1Q68pMo8nalF8CjVQgYJy7wQK2nKy+D0N1VuF6OS8Q+/u1w==; 5:oxljhKlWksydiEVRuGfrk76wdmMBHvIsfT2uf6nLxe8rdAHwnKwehQGucz3WYZMWMprD4duw/EmkvvG1k/gHr81DC+P4yOwJPJqz2vLOZXxYhlMfEHbTJKnI7zKwhGj7AkZms87ENLsxcHxb1V4L9HViwjHoIJwP8hWJkqAUlBA=; 7:vfgwl5JVkyuvXbszhyuSbXSL5q5mwIy2S5cyS9kL7oXlF6MJFNMcmKZNIASGh9VP1YuU9yJer3tGe9PDzXlI7E7d1kk40Ek3+ILyzu3ccEYRxLAgD6ysANJsplmPuLXx1T0Ah5LiFzHLeoYERWFWtwSjYBoGqbdSL2TBva6ZrQ2QPXz1MjpeqV7LgBr+mlnIeIX3Jx6acuJ1hEGZtweByWJzxKqqm28GLgoQvnXt5cKZKaImCNxcHPbuGVS9vUAy SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB2397; 20:MzNhuvegUirmHui9ECDQP1GVV36CApBjbxwsUKvs2sb1g4+PcASqg3Q8OusAhXVaewvQ+AbOtLc65xKmMZhxRM1h9/lpbPzIV9+PMU0Jx9Xlx99+DD3aOEytBNaX5yGzGdK7oPNxolY5JQGQtzQDbvJFJVfIDLGB0J1jH44zL2MraW3r13+ji+KlVg9L9kpxkj4/EF/Kwb6WOcNiVuRWcI2qtghvBc1ub8wQm8IuzcmubOHZe+UjOBsPfkMvrWVp X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jul 2018 14:57:37.9853 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0ea72312-ac9f-404c-f9cd-08d5f6f5f568 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=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2397 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: christian.koenig@amd.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP It's useful to trace any dependency a job has on prevoius jobs. Signed-off-by: Andrey Grodzovsky --- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 5 +++++ drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 24 ++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c index 5518e62..5c22cfd 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c @@ -32,6 +32,7 @@ #include #include "amdgpu.h" #include "atom.h" +#include "amdgpu_trace.h" #define AMDGPU_IB_TEST_TIMEOUT msecs_to_jiffies(1000) @@ -168,6 +169,10 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, ((tmp = amdgpu_sync_get_fence(&job->sched_sync, NULL)) || amdgpu_vm_need_pipeline_sync(ring, job))) { need_pipe_sync = true; + + if (tmp) + trace_amdgpu_ib_pipe_sync(job, tmp); + dma_fence_put(tmp); } diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h index 11f262f..3cffe53 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h @@ -457,6 +457,30 @@ TRACE_EVENT(amdgpu_bo_move, __entry->new_placement, __entry->bo_size) ); +TRACE_EVENT(amdgpu_ib_pipe_sync, + TP_PROTO(struct amdgpu_job *sched_job, struct dma_fence *fence), + TP_ARGS(sched_job, fence), + TP_STRUCT__entry( + __field(const char *,name) + __field(uint64_t, id) + __field(struct dma_fence *, fence) + __field(uint64_t, ctx) + __field(unsigned, seqno) + ), + + TP_fast_assign( + __entry->name = sched_job->base.sched->name; + __entry->id = sched_job->base.id; + __entry->fence = fence; + __entry->ctx = fence->context; + __entry->seqno = fence->seqno; + ), + TP_printk("job ring=%s, id=%llu, need pipe sync to fence=%p, context=%llu, seq=%u", + __entry->name, __entry->id, + __entry->fence, __entry->ctx, + __entry->seqno) +); + #undef AMDGPU_JOB_GET_TIMELINE_NAME #endif