From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7633C77B7A for ; Tue, 6 Jun 2023 22:32:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 533118E0003; Tue, 6 Jun 2023 18:32:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4BCA86B0075; Tue, 6 Jun 2023 18:32:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 30DD38E0003; Tue, 6 Jun 2023 18:32:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 1C01C6B0074 for ; Tue, 6 Jun 2023 18:32:00 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id A16A4A01E5 for ; Tue, 6 Jun 2023 22:31:59 +0000 (UTC) X-FDA: 80873771958.25.4F68CE8 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf17.hostedemail.com (Postfix) with ESMTP id 611E040012 for ; Tue, 6 Jun 2023 22:31:57 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="MMjMD6z/"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf17.hostedemail.com: domain of dakr@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dakr@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686090717; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=VAsnh4By1Dlsxa7yVRPYZeW4lQVXq7K2JYovOcCMg38=; b=SSE97HkuoSYcQAuuXswiqm3vHyVzfw3/pAWrEv+ZwPf5p2AH15JjuSo7OyCQ7qhsM0vu8R RTcKFgsKwVriy1nnzzsdQ9eJ9HtTalBYV1WIr0WmLRnRbVbzOyZDkNuPwoQh6TU6BjHoir NV0zNo4eyDkMRCMmbA2jXBxkNLfy/D0= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="MMjMD6z/"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf17.hostedemail.com: domain of dakr@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dakr@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686090717; a=rsa-sha256; cv=none; b=dTDjBPOGXOHf2irQW8ItsgwVzlANNw1sxEWj/+X2CDBoW3MthGOp+9kltRb1MJvdXvsuYO 8jPsyIrhDh5Qnn96CXUOKyvPweM/1VtQU2TRUTcGVHCQBV64FcKqblyRkEsmbsg9NuiaK+ JaVjDFB78JNHi/qMdvCLsUVR0T8wHxA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686090716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VAsnh4By1Dlsxa7yVRPYZeW4lQVXq7K2JYovOcCMg38=; b=MMjMD6z/Q7c9/vUa6x131UoCZEpS/Nq7aZu+x0p15l5YBsj4RSyhAY0xhn29fcAxkjxWm/ Zg8lPThygXHpjAZXbA+/i/bFBKxok0JYo2XKmSiyimEF9+IdxzN/IFAh5M5kgEPrq74jEw qzmiu9eyUQYmKkFbrZW41aq7Ryz37FY= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-167-vriDT4sUM-qjCXkEcZWjwQ-1; Tue, 06 Jun 2023 18:31:55 -0400 X-MC-Unique: vriDT4sUM-qjCXkEcZWjwQ-1 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-516302ba604so182283a12.2 for ; Tue, 06 Jun 2023 15:31:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686090714; x=1688682714; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VAsnh4By1Dlsxa7yVRPYZeW4lQVXq7K2JYovOcCMg38=; b=EfkZH/6U5MzCdDLJYjJLqiXt6CcyjpM9pzR1n3DZTyCOHX6L9Jvk9jql0DzefnIRJo SA78WCmb1HghnzGX2hFBHs5RD7PRuJhmHLP3TNp42Qw5Scmd/bcIgecUUoW8hxjYFsYP e9TvfxCXb6wBJRuiHYKoQUOfoR1iy9BBewfNwp4YcMss/8xHqSaQMcK5DVks+R3Zj8Ra CxmHrHHEI/G5J1QIminZu05nknNKB+6Ll4ibKQnoUUV05pqHvIu369tfzfyC2LJFQ3rf 5sYWcfkaYdtdvl+1IOdOWTHgFuOwFXk9mvtMjo4+w0s9tvp+6d5hHhZjjlrd1zjAtKQ8 WB5w== X-Gm-Message-State: AC+VfDxSpQZdvBjr9nfsu/pkYpaV6Iz7Y1Ev40g+5qzsTbcRK8DQKL+K NAAd03ix3sN9FRUZLhTRCogLtF1fhk5uUSnN5BSJUcSXH4GAQo6QfmeWkgvXmxxkAFDQ58g9MIC NquL8L7TvWrk= X-Received: by 2002:a17:906:730c:b0:969:813c:9868 with SMTP id di12-20020a170906730c00b00969813c9868mr3689634ejc.18.1686090714328; Tue, 06 Jun 2023 15:31:54 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ677sOlaIwttOdE/90cuoOF1xZWIzUBuXOFYJoKysNMAktXkCW6HXQIjOMQ54Ai2DrC/3Y3CA== X-Received: by 2002:a17:906:730c:b0:969:813c:9868 with SMTP id di12-20020a170906730c00b00969813c9868mr3689629ejc.18.1686090714181; Tue, 06 Jun 2023 15:31:54 -0700 (PDT) Received: from cassiopeiae.. ([2a02:810d:4b3f:de9c:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id dc19-20020a170906c7d300b0096efd44dbffsm6037894ejb.105.2023.06.06.15.31.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jun 2023 15:31:53 -0700 (PDT) From: Danilo Krummrich To: airlied@gmail.com, daniel@ffwll.ch, tzimmermann@suse.de, mripard@kernel.org, corbet@lwn.net, christian.koenig@amd.com, bskeggs@redhat.com, Liam.Howlett@oracle.com, matthew.brost@intel.com, boris.brezillon@collabora.com, alexdeucher@gmail.com, ogabbay@kernel.org, bagasdotme@gmail.com, willy@infradead.org, jason@jlekstrand.net Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH drm-next v4 04/14] drm: debugfs: provide infrastructure to dump a DRM GPU VA space Date: Wed, 7 Jun 2023 00:31:20 +0200 Message-Id: <20230606223130.6132-5-dakr@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230606223130.6132-1-dakr@redhat.com> References: <20230606223130.6132-1-dakr@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Rspam-User: X-Stat-Signature: c39q9sud35rpkzm6qnppsja9jjedbmd8 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 611E040012 X-HE-Tag: 1686090717-915555 X-HE-Meta: U2FsdGVkX19WM9tOnwUQr9NyQm1qxh6Jigy67I/iJyJxz9dE8GaL6mxECtU9g9L2cPcUPZlXR/RNxEUaNLdePfnCQ/VZfdBhlXx6nsDrE+wgXnCg5SAFy57jzNLoA1MoeakUtAFUm6BKAIDSupGQrDLRFbMhh4vR+Hif3wJoQZY5GOCjOzQYtIHXUH9k0xVgyTDBlgyfMf7uNi5KY7GApKgEpyhm8WIG3bsuuxnJxEaTgEpKCUCA2t0YfmAslqO6nhqpX1a9ojhh60Fvbxu6Ji2kYrID7ZbccnwtRdUyolNCbwI4UYxQJHdghU0sV1e1lJeNb3O3qNYoQAFhGk3WtCTlWYjciDJS9lYKB+aRJ5oS5o9WCE8oDFodeekbXgTMJhayi+MTdx3VUBBd2ZUTzgvlEFTPo0aYqNA2Mx5bJUGx4B4ebPjbODkcD48uZ2cMhT7Sdyx/HbisqJ8hOuSJQmHUDf+IDKCMVBZJWNEf1+JvoIH3M6sVaAal2d1Dhmn4DoiQVv/si+uNhbSfRiYtn+Tb2o+q3EohNKzQvprUWisKx3l/ACzDc88k2+WMBa3pPlfV1WLm7Yy8pOuPCucfvtweAKe2phLYkluV6i/gsNnYKA3gbhhJKdKocCCV6ywFeF/p/Ao49IvLDYVv/2nPPdhY/UMBkJlwl6+2IuN4JupuiifV3ocTVzL8cGLpsp60hpSNkEbDf6mCdpy5RMDWgJ0vJojrH+lej1KpuEYmNGCIH6udGtnPhKlQ3sTD7JVQoJyVWTe58RWMXqewIpEdLmC6KR1qxg0KHGFexOqQsdO7BjhDkGDQAm64kb1uwseH+QOi85TyGAmoVWu6vrtVnZCl/wkjjgkRiIfxjUVTt+P7MvuazlAnEYCb/whFek/JBqzy7vl0iS0BzUBSdNMnxVJ6Vwv+qJjvHiaLxt4g9Gaj2gsSi19lBVPa8E3cz24tRDVQiIbbffqqZTxkXYI UXSoG5ba /9P5b91HjQzVimoNnf2REmqKjOtY6yYJ8BxROOFfAarhnrVJ8gPbRS7+Iyx4Ix27nD4AnQ5M75KGUXZXdHgnsUYZhYPjCAC196M39+VCJ2W417/qPaoOvIu3xAXhQXd0Fn6yOLnc0sSQuoWNmEuWR9sxUs5XRZGaNsoaHM2Hg2fLYcS75BFdviX/eOggaHCL9g11RUjHguFKwxA4rkh+egCC2MZFw+dbaRaQF2VdaSrkeg+P2isr9CAXRS59fWZn20UTHzyiCE01MW31y4RwPaUeDpKLK70rUEp4ZCSu+Rw2F9eLKq/16rjvXQ35401oomULq/lkJw4qg9fJ9a/BCiHaoBnA4a4ssUHhqePtMHpgIr8OaxBFqFYEMGB6GLV0cfPomcXMPT7jLIrKggzhEaU2g+vqh4E1SsUQeEoI87FG0SsgX3XQbeRJ8AQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: This commit adds a function to dump a DRM GPU VA space and a macro for drivers to register the struct drm_info_list 'gpuvas' entry. Most likely, most drivers might maintain one DRM GPU VA space per struct drm_file, but there might also be drivers not having a fixed relation between DRM GPU VA spaces and a DRM core infrastructure, hence we need the indirection via the driver iterating it's maintained DRM GPU VA spaces. Signed-off-by: Danilo Krummrich --- drivers/gpu/drm/drm_debugfs.c | 41 +++++++++++++++++++++++++++++++++++ include/drm/drm_debugfs.h | 25 +++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c index 4855230ba2c6..82180fb1c200 100644 --- a/drivers/gpu/drm/drm_debugfs.c +++ b/drivers/gpu/drm/drm_debugfs.c @@ -39,6 +39,7 @@ #include #include #include +#include #include "drm_crtc_internal.h" #include "drm_internal.h" @@ -175,6 +176,46 @@ static const struct file_operations drm_debugfs_fops = { .release = single_release, }; +/** + * drm_debugfs_gpuva_info - dump the given DRM GPU VA space + * @m: pointer to the &seq_file to write + * @mgr: the &drm_gpuva_manager representing the GPU VA space + * + * Dumps the GPU VA mappings of a given DRM GPU VA manager. + * + * For each DRM GPU VA space drivers should call this function from their + * &drm_info_list's show callback. + * + * Returns: 0 on success, -ENODEV if the &mgr is not initialized + */ +int drm_debugfs_gpuva_info(struct seq_file *m, + struct drm_gpuva_manager *mgr) +{ + DRM_GPUVA_ITER(it, mgr, 0); + struct drm_gpuva *va, *kva = &mgr->kernel_alloc_node; + + if (!mgr->name) + return -ENODEV; + + seq_printf(m, "DRM GPU VA space (%s) [0x%016llx;0x%016llx]\n", + mgr->name, mgr->mm_start, mgr->mm_start + mgr->mm_range); + seq_printf(m, "Kernel reserved node [0x%016llx;0x%016llx]\n", + kva->va.addr, kva->va.addr + kva->va.range); + seq_puts(m, "\n"); + seq_puts(m, " VAs | start | range | end | object | object offset\n"); + seq_puts(m, "-------------------------------------------------------------------------------------------------------------\n"); + drm_gpuva_iter_for_each(va, it) { + if (unlikely(va == &mgr->kernel_alloc_node)) + continue; + + seq_printf(m, " | 0x%016llx | 0x%016llx | 0x%016llx | 0x%016llx | 0x%016llx\n", + va->va.addr, va->va.range, va->va.addr + va->va.range, + (u64)va->gem.obj, va->gem.offset); + } + + return 0; +} +EXPORT_SYMBOL(drm_debugfs_gpuva_info); /** * drm_debugfs_create_files - Initialize a given set of debugfs files for DRM diff --git a/include/drm/drm_debugfs.h b/include/drm/drm_debugfs.h index 7616f457ce70..cb2c1956a214 100644 --- a/include/drm/drm_debugfs.h +++ b/include/drm/drm_debugfs.h @@ -34,6 +34,22 @@ #include #include + +#include + +/** + * DRM_DEBUGFS_GPUVA_INFO - &drm_info_list entry to dump a GPU VA space + * @show: the &drm_info_list's show callback + * @data: driver private data + * + * Drivers should use this macro to define a &drm_info_list entry to provide a + * debugfs file for dumping the GPU VA space regions and mappings. + * + * For each DRM GPU VA space drivers should call drm_debugfs_gpuva_info() from + * their @show callback. + */ +#define DRM_DEBUGFS_GPUVA_INFO(show, data) {"gpuvas", show, DRIVER_GEM_GPUVA, data} + /** * struct drm_info_list - debugfs info list entry * @@ -134,6 +150,9 @@ void drm_debugfs_add_file(struct drm_device *dev, const char *name, void drm_debugfs_add_files(struct drm_device *dev, const struct drm_debugfs_info *files, int count); + +int drm_debugfs_gpuva_info(struct seq_file *m, + struct drm_gpuva_manager *mgr); #else static inline void drm_debugfs_create_files(const struct drm_info_list *files, int count, struct dentry *root, @@ -155,6 +174,12 @@ static inline void drm_debugfs_add_files(struct drm_device *dev, const struct drm_debugfs_info *files, int count) {} + +static inline int drm_debugfs_gpuva_info(struct seq_file *m, + struct drm_gpuva_manager *mgr) +{ + return 0; +} #endif #endif /* _DRM_DEBUGFS_H_ */ -- 2.40.1