Received: by 2002:a05:6358:7058:b0:131:369:b2a3 with SMTP id 24csp8874526rwp; Wed, 19 Jul 2023 17:18:52 -0700 (PDT) X-Google-Smtp-Source: APBJJlErKAb7dfuWuVZZ5PnsoI6QwPbTbM0PKF3MeUod/od0MAPp0FPKrgLD/6R//ok7Lp5zk89j X-Received: by 2002:aa7:d50b:0:b0:521:a86d:d596 with SMTP id y11-20020aa7d50b000000b00521a86dd596mr3880779edq.7.1689812332095; Wed, 19 Jul 2023 17:18:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689812332; cv=none; d=google.com; s=arc-20160816; b=NyvUTh3FJgSUjm7VmN4eT5AVN0nzGNjRxHJhNOyTsvZsqN0SdqvPmXHmFIRTgCUSuV RAgzfMaNxXKo2xzXMH/yl7gqdODJik7cNnxyKqi8gh+erKYYAPhBbJyilgloUNIFpSWg rf7zQJAITWVJWp7mcp3egKGoLxdCJzu5z/wCM9dn+e1537RT82IvhxSwSDT9Vd+L6ftU LAJvRXG0K3ncD3dpIjKtjmBAV9uV42xYs2p4FLP09kew6H38HMNIGK7hUOBYD5h6eDAL mieJpNDd71D5wXbHcSkfPlVaNRJDymzttqFubcuwrpS47cWPAFmnG785YfrrFLIyT+xq uisg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=mDBNWdVA4hQ8PRBsFs3dd+X68qTkUgeiN1mzO/5EjB0=; fh=grh6qrjW0oxu0S8zfHJMhxWLgUXiZ/TU2uoVe6KOi4w=; b=FvJV2QWdMSR/lSCVrrVcD4agwZVnGBDAILGABFTi69tP/DwpU+q/NOm9m1/MCn2/Yh M+okiYIMtqnBgOVhrjP3y++3vqLuL4dlrO8IMdNYOEkugqNdNFH2nw0zfJb+ACtHSS3M 1EAod3hQHQ1dgJnRlfeFw4IVhD/Cmzc6Q/9axM/OKqcbGF05nhi5AwQ8s7e6oyXG5I1Y QMY65fm/fu9L67qyWTtKJlKWF2Ayj9gpElVD7uBiCvNBaZr2aXKqpfPQfeAmbZ8VTqYg 82YQ7QVv6l2NWvEZpqxFKntJ+ECf49hC2yOAFAPPF2jjMhVyC6MP5AIg66VUdE6wUdUc Qzww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Gw4sq8l6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i18-20020aa7c9d2000000b0051d92aee623si4123366edt.54.2023.07.19.17.18.27; Wed, 19 Jul 2023 17:18:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Gw4sq8l6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229730AbjGTAP4 (ORCPT + 99 others); Wed, 19 Jul 2023 20:15:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229476AbjGTAPz (ORCPT ); Wed, 19 Jul 2023 20:15:55 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2FF21FD8 for ; Wed, 19 Jul 2023 17:15:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689812108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mDBNWdVA4hQ8PRBsFs3dd+X68qTkUgeiN1mzO/5EjB0=; b=Gw4sq8l67j+xCfeGwVWqLnUCD9yKyRTIbcp2MQ98lUb1QLga26dHybBIESm3VCN86xGkZi fn5jGqKJGoscqtOfxHyfTInXCfH7hqyYja+9WNkg1plRAGuijIMHKFgv8ripiK4h65cwOy Bo20FjkaaOur1aOGSUi4sMRkDBQ1qsw= Received: from mail-lf1-f70.google.com (mail-lf1-f70.google.com [209.85.167.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-532-Dzu6sp_1ONuGPZEUi2KoHg-1; Wed, 19 Jul 2023 20:15:07 -0400 X-MC-Unique: Dzu6sp_1ONuGPZEUi2KoHg-1 Received: by mail-lf1-f70.google.com with SMTP id 2adb3069b0e04-4fbcdca9080so138226e87.3 for ; Wed, 19 Jul 2023 17:15:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689812105; x=1692404105; 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=mDBNWdVA4hQ8PRBsFs3dd+X68qTkUgeiN1mzO/5EjB0=; b=eTs3NPznzFI6llmDpktMD6ZtyhlIuaskcigcoicGmAU1W4okgLprDTq0bqNyf1Zf/f FNBVjg+I3sgXVYb9M6WK/CaJddIhvEQJ5M+Jb7kKs6t9CAc9f7QJ/Nlq87LSAJKRp8zc couoi/j6/L5Bz/KogEmU2B2tjRSnq2zL6r1cQukS6dHt6FdvzBAeBX6+9foV9p3C8+k+ Z/2M586cz9anWKpSQSPi0eBnQT3uwi8L0IUGKC+8wmdulF8suhlH4IeWE5sjrrU2RYam x/qbMo/TfvasAsFKwPI7qS5E/ZF3bMqQ+vdFP9HBYyyHWj+6C6HowlTRhFZ9PaqY/M3+ RH8Q== X-Gm-Message-State: ABy/qLbNnbPXVy4A5X+QtcHM/DB35GppdNrWooetarkaDSbDmNOyy9Wn gxrIn7eG43Ui6ZaTyCvi93FIMLMJwtmoi7WCu7/jo6phdY9uZq5VOsAz/UsRj7AFbeGRjURi4n0 VCBVW9rVvMojqrXOP7QQeIBQL X-Received: by 2002:a05:6512:3d1c:b0:4f9:8c08:57db with SMTP id d28-20020a0565123d1c00b004f98c0857dbmr1145853lfv.58.1689812105453; Wed, 19 Jul 2023 17:15:05 -0700 (PDT) X-Received: by 2002:a05:6512:3d1c:b0:4f9:8c08:57db with SMTP id d28-20020a0565123d1c00b004f98c0857dbmr1145842lfv.58.1689812105043; Wed, 19 Jul 2023 17:15:05 -0700 (PDT) Received: from cassiopeiae.. ([2a02:810d:4b3f:de9c:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id s10-20020a056402014a00b00521830574c1sm3362386edu.2.2023.07.19.17.15.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jul 2023 17:15:04 -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, donald.robson@imgtec.com Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH drm-misc-next v8 02/12] drm: debugfs: provide infrastructure to dump a DRM GPU VA space Date: Thu, 20 Jul 2023 02:14:23 +0200 Message-ID: <20230720001443.2380-3-dakr@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230720001443.2380-1-dakr@redhat.com> References: <20230720001443.2380-1-dakr@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Reviewed-by: Boris Brezillon Signed-off-by: Danilo Krummrich --- drivers/gpu/drm/drm_debugfs.c | 40 +++++++++++++++++++++++++++++++++++ include/drm/drm_debugfs.h | 25 ++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c index 4855230ba2c6..c90dbcffa0dc 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,45 @@ 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) +{ + 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_for_each_va(va, mgr) { + if (unlikely(va == kva)) + 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.41.0