From patchwork Thu Jul 20 00:14:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 122939 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2800896vqt; Wed, 19 Jul 2023 17:47:50 -0700 (PDT) X-Google-Smtp-Source: APBJJlGGMDZ0hJQcY1sMu4G0uhTj96zB0kAzN18wfqxBuv8V7YACqJdS+1jFIaWzeqYqrzmXBn+/ X-Received: by 2002:a05:6a00:2e85:b0:666:7ec0:22d7 with SMTP id fd5-20020a056a002e8500b006667ec022d7mr818679pfb.24.1689814070635; Wed, 19 Jul 2023 17:47:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689814070; cv=none; d=google.com; s=arc-20160816; b=pZzrby14RNEl4xTDrnE6oli2zGEm64GVXlJSNGGgfGPFqkcnMaNgvn+zNgkNGE7gzi gqHWtQD6d3AY3yIG3FuPC8oTKypEdtQKnznnAEF4M/8dWx8k4Hdt5XIH41D/VfW/5J4p aJ2fCUHJtPItnE5A9YFBdi5IlFLI0pfNEkppFUb51YwR05IcY5/Iua5gGmOoXBQ/g7Dh CndIa0GzfgbtMINboTZNhwi2MUGeBTpJfrNVpZbzo5JBGfT2zRFPGQjOIjn7z2pkUnPn 1AqbcQkm5aKbRuvHx/lVn0N+IWmcysYmA33LnaqH4l1f6if0r4pPqCaxsfH5876hs0xY W6Fw== 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=VFFV/4pnGfS5xOgVl1lU4W1qf1MMs0lzrapLnGgOEpU=; fh=grh6qrjW0oxu0S8zfHJMhxWLgUXiZ/TU2uoVe6KOi4w=; b=ssm3WgSkafZryN6HAkul053hyXCBTUZK1pu+1A8gEwOUpcARfxVk+bENUFUk6Boee+ r63pYOLHbqJX9Cq7H80k2S3pP1gEwD0/sKEtKYUBQZXW6xsm2/+yW5SfvkDaP3mtJ7g7 rJTUivyGeSNQ981oHZ53Lp0yWyWFK9cPTn2kpHfhL4TB3lmMkNP6Qm3Vdoc0BNT+wBWy 2ZRlRwPChW1mR68qriXAK5fqKnyV5jYj9OVRywcWo82FsFSqhaNP2cRr1gD/XYMjzi0C PVs6Z7L+XajwRzExB9IDJ2hS+C4nypwmxZtNelBDN5vDJF92twsGzxPxi3+pfM6RvSuo 6HTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PuQIp9YB; 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 t33-20020a634461000000b00557671b7ee5si4589460pgk.423.2023.07.19.17.47.37; Wed, 19 Jul 2023 17:47:50 -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=PuQIp9YB; 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 S229847AbjGTAQ4 (ORCPT + 99 others); Wed, 19 Jul 2023 20:16:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229826AbjGTAQm (ORCPT ); Wed, 19 Jul 2023 20:16:42 -0400 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 CAD481FFD for ; Wed, 19 Jul 2023 17:15:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689812151; 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=VFFV/4pnGfS5xOgVl1lU4W1qf1MMs0lzrapLnGgOEpU=; b=PuQIp9YBJtMwKcuBpc1ON8XyEd49hHLD/LQlxJEa/Fnhgy1gWUGupKRvhzuTwcP+sEM2uE APtet3C2gx68MKDfQk9axe5GLENvnhyzNH4evtxDh3YoAjXOG6gtmCB+Nwetw9Qy34ddl5 RpMVzSQfZ5feG8s2JUFVM1YQMuCRZTo= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-587-LAX_JsHnOCqu_fuLqADmTA-1; Wed, 19 Jul 2023 20:15:49 -0400 X-MC-Unique: LAX_JsHnOCqu_fuLqADmTA-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-997d144f31dso15929066b.0 for ; Wed, 19 Jul 2023 17:15:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689812148; x=1692404148; 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=VFFV/4pnGfS5xOgVl1lU4W1qf1MMs0lzrapLnGgOEpU=; b=PcuFCEqL1khkemcatuUpTL7tOB8Hji4G3Hwl3yRJvZxqZiDx2MLNwryLDGThMtS+f3 DFTaJjvgDX5S9TrtUYJHFm9JfD/rqfT2R2j+YfuM+macbK//bEqHvW5JU0jQ/zZFHSZc +Uz0rygrJcNmt4rr4ihLBo93dyhwJIvaz7oBYXEL9l8IqsblJwjXkXhX3UKAjCMCzGw+ F/BDXIG533V7bCoOWV8GEZBerKPnO3OBTiYnRF77yspJuaOEKM903GSUQ8Q8hCjRRg2o bmdHk8IIKlVXgkhdxFJHz/+GN/tpyrrqvZrAS2td9e22q0YIw2Nq6H2TWh9REZZAsbuP ij5w== X-Gm-Message-State: ABy/qLZ6C6ZtEbp1btWLLdYNqVOMCacIwSGN8U6jThY5SYsK5m5AyOf/ f5ba3UrY/OJ9uLBeJmRmyBMHMOxf0zRytontFj5lU/QqAJPz8z4fptIZfLdcojSYaRVEmBnqolQ kJL9MBQRnpelji1zMFoKuF1IG X-Received: by 2002:a17:906:77cd:b0:993:f2c2:750b with SMTP id m13-20020a17090677cd00b00993f2c2750bmr3700358ejn.17.1689812148710; Wed, 19 Jul 2023 17:15:48 -0700 (PDT) X-Received: by 2002:a17:906:77cd:b0:993:f2c2:750b with SMTP id m13-20020a17090677cd00b00993f2c2750bmr3700343ejn.17.1689812148501; Wed, 19 Jul 2023 17:15:48 -0700 (PDT) Received: from cassiopeiae.. ([2a02:810d:4b3f:de9c:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id i10-20020a170906a28a00b00997d7aa59fasm3077515ejz.14.2023.07.19.17.15.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jul 2023 17:15:47 -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 12/12] drm/nouveau: debugfs: implement DRM GPU VA debugfs Date: Thu, 20 Jul 2023 02:14:33 +0200 Message-ID: <20230720001443.2380-13-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 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_BLOCKED,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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771898478758978281 X-GMAIL-MSGID: 1771898478758978281 Provide the driver indirection iterating over all DRM GPU VA spaces to enable the common 'gpuvas' debugfs file for dumping DRM GPU VA spaces. Signed-off-by: Danilo Krummrich --- drivers/gpu/drm/nouveau/nouveau_debugfs.c | 39 +++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.c b/drivers/gpu/drm/nouveau/nouveau_debugfs.c index 99d022a91afc..053f703f2f68 100644 --- a/drivers/gpu/drm/nouveau/nouveau_debugfs.c +++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.c @@ -203,6 +203,44 @@ nouveau_debugfs_pstate_open(struct inode *inode, struct file *file) return single_open(file, nouveau_debugfs_pstate_get, inode->i_private); } +static void +nouveau_debugfs_gpuva_regions(struct seq_file *m, struct nouveau_uvmm *uvmm) +{ + MA_STATE(mas, &uvmm->region_mt, 0, 0); + struct nouveau_uvma_region *reg; + + seq_puts (m, " VA regions | start | range | end \n"); + seq_puts (m, "----------------------------------------------------------------------------\n"); + mas_for_each(&mas, reg, ULONG_MAX) + seq_printf(m, " | 0x%016llx | 0x%016llx | 0x%016llx\n", + reg->va.addr, reg->va.range, reg->va.addr + reg->va.range); +} + +static int +nouveau_debugfs_gpuva(struct seq_file *m, void *data) +{ + struct drm_info_node *node = (struct drm_info_node *) m->private; + struct nouveau_drm *drm = nouveau_drm(node->minor->dev); + struct nouveau_cli *cli; + + mutex_lock(&drm->clients_lock); + list_for_each_entry(cli, &drm->clients, head) { + struct nouveau_uvmm *uvmm = nouveau_cli_uvmm(cli); + + if (!uvmm) + continue; + + nouveau_uvmm_lock(uvmm); + drm_debugfs_gpuva_info(m, &uvmm->umgr); + seq_puts(m, "\n"); + nouveau_debugfs_gpuva_regions(m, uvmm); + nouveau_uvmm_unlock(uvmm); + } + mutex_unlock(&drm->clients_lock); + + return 0; +} + static const struct file_operations nouveau_pstate_fops = { .owner = THIS_MODULE, .open = nouveau_debugfs_pstate_open, @@ -214,6 +252,7 @@ static const struct file_operations nouveau_pstate_fops = { static struct drm_info_list nouveau_debugfs_list[] = { { "vbios.rom", nouveau_debugfs_vbios_image, 0, NULL }, { "strap_peek", nouveau_debugfs_strap_peek, 0, NULL }, + DRM_DEBUGFS_GPUVA_INFO(nouveau_debugfs_gpuva, NULL), }; #define NOUVEAU_DEBUGFS_ENTRIES ARRAY_SIZE(nouveau_debugfs_list)