From patchwork Wed Jan 18 06:12:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 45021 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2176360wrn; Tue, 17 Jan 2023 22:38:47 -0800 (PST) X-Google-Smtp-Source: AMrXdXsC1Irdw5XflkTHNloH7Z4axAOFBdJLO5tqVhuWobP/I8GO19o5uJ6RfPtQtrfXylFRgU2k X-Received: by 2002:a05:6a20:4c25:b0:ac:83e:a9dc with SMTP id fm37-20020a056a204c2500b000ac083ea9dcmr5438060pzb.13.1674023926792; Tue, 17 Jan 2023 22:38:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674023926; cv=none; d=google.com; s=arc-20160816; b=Q6kgROS7mG2bEEbNsrdw7RZIVq9fOHrgx5lK07sm3m8wPFZBpzJJXxAr2/56xv0yol Kc+/4920HZ85OWJQLnUOfJ+ShCsVXIkxLQ4rhA1ybpkguyAHrqztfP1OGVqtDHeabh77 nPnAKLVRgGWbq1AvqPTtlJ0rUglWHL2j0Z/0rC+kFRbM/JcXEnJBQluxZCvQbI4BKxqG rbH7XAuMF49kTzQ7oRlSULNyt2TExcsM+mr5s5YzfzbqckyzQhISmpPH06T8RDbJL9uA mCxm7FrLmJBEuq1lIfDz9hXDI3Q1/JMCXgMik2SPL5osOyEUG1CkmaJp+h9igRM15pjC CV6w== 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=LRj04i8kO8UNSuXsGqfC3ZL11EhFJ7RqZPr5BWcyY7o=; b=cy48fe1qsOlFdj8RDqsNB105aiVd43h/dzyDWRbx6zXkb5h0uGQw6w4FreIyUgQaqx ySb8MaxCILkvS0brHCrhvw11K8dN42vdMUU3oCosAU8Fz1o2lIwLAOhlU2zzaUe2NECl tRmDZp3bEhkvYJ4I2prQweEotM5nyYeKTIt4k9JAtyuegUCQrAuNw1aDCV0dURp+yN12 HUXYrdzknYNMeJabkeEurdZe0bXIffkPGUUPwnpxqRXf27bSNH4wB3d7nvHhHG6sQCD+ igY16s/uFDRwRBySsvYYyeEPOu9npEAvCe7NzUDx/YoY54xvtnsv8JqajsFjuSSR5j38 GCiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZtPxhE3r; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y184-20020a638ac1000000b004b6578f3355si4608092pgd.773.2023.01.17.22.38.34; Tue, 17 Jan 2023 22:38:46 -0800 (PST) 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=ZtPxhE3r; 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 S229910AbjARGgy (ORCPT + 99 others); Wed, 18 Jan 2023 01:36:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229685AbjARGYe (ORCPT ); Wed, 18 Jan 2023 01:24:34 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 462C834C36 for ; Tue, 17 Jan 2023 22:13:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674022422; 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=LRj04i8kO8UNSuXsGqfC3ZL11EhFJ7RqZPr5BWcyY7o=; b=ZtPxhE3rJNHu91IHySTtya1e39LQkoyfSxMqe0nJpuBSF52YhDOGEv3c6xBZ3rLRspXaSv dIF9JlUYpk9WKR3tMrBfZMIJ3diQGwKAzyrrHhnMRhvO/ifIaWVwNr1zxtzRz5DIJR3eCV fHsGPPgkfAQs52ymH1yZks+30rJK2Wo= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-675-zdLZzG-uNB66xnfFf1yNzA-1; Wed, 18 Jan 2023 01:13:41 -0500 X-MC-Unique: zdLZzG-uNB66xnfFf1yNzA-1 Received: by mail-ej1-f71.google.com with SMTP id sa32-20020a1709076d2000b0084d4593797eso19757421ejc.16 for ; Tue, 17 Jan 2023 22:13:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=LRj04i8kO8UNSuXsGqfC3ZL11EhFJ7RqZPr5BWcyY7o=; b=t5cAn7yt9h5Z/8xd15nWTZ7Hx2IesWP5/rTDicDXT5uJ9fPZPle5S6D4ksFbansqUI yhIuwipb+5QvvP1C5gQK8lfT49syccDRKqvfMA4NY1eTL0HhX0SWqVfJXYNQSI4HceXW zVzV1qVTRVvoDBqI2zkVUFLqxnW7FNU2mulFbD1hyn1cY61UW5KQaQxZ11NAll5iLoih 6+JBu+vr4qjixNa8k/0JpbcTWV/4tKQBaTO3MeMzfXcTo0sNluAeWfDOleGVnF49qlh9 a3ZH24iiadlDzTGhEtr09g6HvB1sTD5rEWIIqVrojXKb2G2z7PpuLER9efVP8gKrfDQ+ OyVg== X-Gm-Message-State: AFqh2koIF7UbcWJhBYKTWL9yd6GbaDNvPnqV2McsUKOKvKdKQ31/ZtPz Q5rB5aJ+7JcmnT+jPs7m022gal/hVmPA3/8Yhk1+AXl0GGZkZnymPHDzK1uGZP+ERExgWrVHZRk TLM50CaddmuGOdBdkIybZ2286 X-Received: by 2002:a05:6402:1f8c:b0:49c:77ba:fa4e with SMTP id c12-20020a0564021f8c00b0049c77bafa4emr6733974edc.28.1674022420597; Tue, 17 Jan 2023 22:13:40 -0800 (PST) X-Received: by 2002:a05:6402:1f8c:b0:49c:77ba:fa4e with SMTP id c12-20020a0564021f8c00b0049c77bafa4emr6733954edc.28.1674022420424; Tue, 17 Jan 2023 22:13:40 -0800 (PST) Received: from cassiopeiae.. ([2a02:810d:4b3f:de78:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id f22-20020a17090631d600b00779cde476e4sm14066042ejf.62.2023.01.17.22.13.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jan 2023 22:13:40 -0800 (PST) From: Danilo Krummrich To: daniel@ffwll.ch, airlied@redhat.com, christian.koenig@amd.com, bskeggs@redhat.com, jason@jlekstrand.net, tzimmermann@suse.de, mripard@kernel.org, corbet@lwn.net 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-next 04/14] drm: debugfs: provide infrastructure to dump a DRM GPU VA space Date: Wed, 18 Jan 2023 07:12:46 +0100 Message-Id: <20230118061256.2689-5-dakr@redhat.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230118061256.2689-1-dakr@redhat.com> References: <20230118061256.2689-1-dakr@redhat.com> MIME-Version: 1.0 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_H2,SPF_HELO_NONE,SPF_NONE 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755341312776578978?= X-GMAIL-MSGID: =?utf-8?q?1755341312776578978?= 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 | 56 +++++++++++++++++++++++++++++++++++ include/drm/drm_debugfs.h | 25 ++++++++++++++++ 2 files changed, 81 insertions(+) diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c index 4f643a490dc3..5389dd73c0fb 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,61 @@ 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 regions and 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_region *reg; + struct drm_gpuva *va; + + if (!mgr->name) + return -ENODEV; + + seq_printf(m, "DRM GPU VA space (%s)\n", mgr->name); + seq_puts (m, "\n"); + seq_puts (m, " VA regions | start | range | end | sparse\n"); + seq_puts (m, "------------------------------------------------------------------------------------\n"); + seq_printf(m, " VA space | 0x%016llx | 0x%016llx | 0x%016llx | -\n", + mgr->mm_start, mgr->mm_range, mgr->mm_start + mgr->mm_range); + seq_puts (m, "-----------------------------------------------------------------------------------\n"); + drm_gpuva_for_each_region(reg, mgr) { + struct drm_mm_node *node = ®->node; + + if (node == &mgr->kernel_alloc_node) { + seq_printf(m, " kernel node | 0x%016llx | 0x%016llx | 0x%016llx | -\n", + node->start, node->size, node->start + node->size); + continue; + } + + seq_printf(m, " | 0x%016llx | 0x%016llx | 0x%016llx | %s\n", + node->start, node->size, node->start + node->size, + reg->sparse ? "true" : "false"); + } + 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) { + struct drm_mm_node *node = &va->node; + + seq_printf(m, " | 0x%016llx | 0x%016llx | 0x%016llx | 0x%016llx | 0x%016llx\n", + node->start, node->size, node->start + node->size, + (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_ */