From patchwork Wed Mar 19 14:52:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 14022736 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EACA1C36000 for ; Wed, 19 Mar 2025 14:56:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2EEF210E53D; Wed, 19 Mar 2025 14:56:10 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="d3Jxj66l"; dkim-atps=neutral Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by gabe.freedesktop.org (Postfix) with ESMTPS id A858610E534; Wed, 19 Mar 2025 14:56:02 +0000 (UTC) Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-301c4850194so978914a91.2; Wed, 19 Mar 2025 07:56:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742396162; x=1743000962; darn=lists.freedesktop.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MaBXykVFASxAwzp1K2UYEY9RdYGqxushMJyfSpoqDmM=; b=d3Jxj66l2CdawKJwZfHi7UtsZgHIS01STjs0VCMhaDLDWjfAteWs2JANnfXCRMkpx2 qR4I1ot5dc6mbsMkJ46iLA49nIsojP7nJWfQWVrZxb8/Tm+PP3BYULAqnn0R4pSCpS8l kd2hm6qSaMSY82rAvpWXMCd82EzUnk1LcxWq2bHxqix1XfxEnqgknJ3fej8i4vfnfzxE h+rCm4KfoGs0Op0MrNmbkFLH1HqVF3khxvBIhhwLh+kQDpjm5B9VhNO+i7jU0UjjNXlV egp1EZr18bELPZ9MnqzN103jquT0VbRebXeMGYxxBbbuQz4OaTG/eNWzUTqi7AwYmTg9 ProA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742396162; x=1743000962; 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=MaBXykVFASxAwzp1K2UYEY9RdYGqxushMJyfSpoqDmM=; b=vd+LfZXGGKobhZHycxfw0EASgy6RN36HB39TfLNbXxO70uRLna3uoNYMk93FnAxMpB VxsParRw90QoC8kBLzB22Q6gdtY7XlAnaio4fYJMHdy2VT9aiXEcEAJw8OhnMMQuOadb erkq1HzCZKn9DDDj52p+lM3w/q9Rf3yJgRxXOsTHGJzJrrLtAtzeIF73cJX+SDslVO9h 8/HXQSp5Jvh0+xRBR8f/jmnmyiNbt289WRk/lxy4JcoN60eFusohoEBuUoF6EPoUAXdX OSYvAS1xSWu/NiqiND9ux1JpWW/K5Qs+WdJUdUToDg3yKZbKzy6e6HqMBlrRUu8C304k +mmQ== X-Gm-Message-State: AOJu0Yzv16orPw+Kfx069Fhu8iwGF1GPt6CUHr9E+oGXmIYcpPpoPycw dgzUAShha66UQCRPHipw0kgKtQAk23etIoEx2nEuF42/4gCSEbyxN8kfNg== X-Gm-Gg: ASbGncvcFM6blYlo5OQGtRaWuJYbbHPptDAW3wSPS7rDs+oR5ne0B+gdXfEr3005bnz GaxTJrmDLHIknjA1kcfpJ/1gptqtgiWoy/o9rMy2l/tssS53fvgQXZshY6uWA+jzgwwsziXS8uF ne9Fiw7TcR0kuHLPa9iMTgsEgPF41Oa/kvyTPJliTTZE2LgbCBMFE9pS9WbGdRGNHrhO8E9RC2S Z3IiybhevraT3MYq93suauRiVxPFpFfgXjJdMlp6OwrYANbhis3xKkWuZkeGip+xR8zy19nd5tz KsIbyL5fcGRf2Kq4fmGQwC7lb9hLQk1dxzWVgOG61ZHOVj/NNZUple8+tpSL51tAmrgwbnNrelX GGXE5yJUWkunyM7HGCXWogLD5AszRqQ== X-Google-Smtp-Source: AGHT+IFMlaSejbhUztYFhKWDKCCn4rM1IcgZmZyorwckAVgEaKWxG3BpCnnYdHXGWTzjGeXSG9hkLQ== X-Received: by 2002:a17:90a:e710:b0:2fe:a336:fe63 with SMTP id 98e67ed59e1d1-301be201f40mr5243686a91.24.1742396161750; Wed, 19 Mar 2025 07:56:01 -0700 (PDT) Received: from localhost ([2a00:79e0:3e00:2601:3afc:446b:f0df:eadc]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301b9e19ceesm1903278a91.0.2025.03.19.07.56.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Mar 2025 07:56:01 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Rob Clark , Rob Clark , Sean Paul , Konrad Dybcio , Abhinav Kumar , Dmitry Baryshkov , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 29/34] drm/msm: Wire up drm_gpuvm debugfs Date: Wed, 19 Mar 2025 07:52:41 -0700 Message-ID: <20250319145425.51935-30-robdclark@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250319145425.51935-1-robdclark@gmail.com> References: <20250319145425.51935-1-robdclark@gmail.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Rob Clark Core drm already provides a helper to dump vm state. We just need to wire up tracking of VMs and giving userspace VMs a suitable name. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- drivers/gpu/drm/msm/msm_debugfs.c | 20 ++++++++++++++++++++ drivers/gpu/drm/msm/msm_drv.c | 3 +++ drivers/gpu/drm/msm/msm_drv.h | 4 ++++ drivers/gpu/drm/msm/msm_gem.h | 8 ++++++++ drivers/gpu/drm/msm/msm_gem_vma.c | 23 +++++++++++++++++++++++ 6 files changed, 59 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c index 9f66ad5bf0dc..3189a6f75d74 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -2272,7 +2272,7 @@ a6xx_create_private_vm(struct msm_gpu *gpu, bool kernel_managed) if (IS_ERR(mmu)) return ERR_CAST(mmu); - return msm_gem_vm_create(gpu->dev, mmu, "gpu", 0x100000000ULL, + return msm_gem_vm_create(gpu->dev, mmu, NULL, 0x100000000ULL, adreno_private_vm_size(gpu), kernel_managed); } diff --git a/drivers/gpu/drm/msm/msm_debugfs.c b/drivers/gpu/drm/msm/msm_debugfs.c index 7ab607252d18..bde25981254f 100644 --- a/drivers/gpu/drm/msm/msm_debugfs.c +++ b/drivers/gpu/drm/msm/msm_debugfs.c @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -238,6 +239,24 @@ static int msm_mm_show(struct seq_file *m, void *arg) return 0; } +static int msm_gpuvas_show(struct seq_file *m, void *arg) +{ + struct drm_info_node *node = m->private; + struct drm_device *dev = node->minor->dev; + struct msm_drm_private *priv = dev->dev_private; + struct msm_gem_vm *vm; + + mutex_lock(&priv->vm_lock); + list_for_each_entry(vm, &priv->vms, node) { + mutex_lock(&vm->op_lock); + drm_debugfs_gpuva_info(m, &vm->base); + mutex_unlock(&vm->op_lock); + } + mutex_unlock(&priv->vm_lock); + + return 0; +} + static int msm_fb_show(struct seq_file *m, void *arg) { struct drm_info_node *node = m->private; @@ -266,6 +285,7 @@ static int msm_fb_show(struct seq_file *m, void *arg) static struct drm_info_list msm_debugfs_list[] = { {"gem", msm_gem_show}, { "mm", msm_mm_show }, + DRM_DEBUGFS_GPUVA_INFO(msm_gpuvas_show, NULL), }; static struct drm_info_list msm_kms_debugfs_list[] = { diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 5b5a64c8dddb..70c3a3712a3e 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -124,6 +124,9 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) goto err_put_dev; } + INIT_LIST_HEAD(&priv->vms); + mutex_init(&priv->vm_lock); + INIT_LIST_HEAD(&priv->objects); mutex_init(&priv->obj_lock); diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index b0add236cbb3..83d2a480cfcf 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -112,6 +112,10 @@ struct msm_drm_private { */ atomic64_t total_mem; + /** @vms: List of all VMs, protected by @vm_lock */ + struct list_head vms; + struct mutex vm_lock; + /** * List of all GEM objects (mainly for debugfs, protected by obj_lock * (acquire before per GEM object lock) diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index 7f6315a66751..0409d35ebb32 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -54,6 +54,9 @@ struct msm_gem_vm { /** @base: Inherit from drm_gpuvm. */ struct drm_gpuvm base; + /** @name: Storage for dynamically generated VM name for user VMs */ + char name[32]; + /** * @sched: Scheduler used for asynchronous VM_BIND request. * @@ -95,6 +98,11 @@ struct msm_gem_vm { */ struct pid *pid; + /** + * @node: List node in msm_drm_private.vms list + */ + struct list_head node; + /** @faults: the number of GPU hangs associated with this address space */ int faults; diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_gem_vma.c index 09d4746248c2..8d0c4d3afa13 100644 --- a/drivers/gpu/drm/msm/msm_gem_vma.c +++ b/drivers/gpu/drm/msm/msm_gem_vma.c @@ -14,6 +14,11 @@ static void msm_gem_vm_free(struct drm_gpuvm *gpuvm) { struct msm_gem_vm *vm = container_of(gpuvm, struct msm_gem_vm, base); + struct msm_drm_private *priv = gpuvm->drm->dev_private; + + mutex_lock(&priv->vm_lock); + list_del(&vm->node); + mutex_unlock(&priv->vm_lock); drm_mm_takedown(&vm->mm); if (vm->mmu) @@ -640,6 +645,7 @@ struct drm_gpuvm * msm_gem_vm_create(struct drm_device *drm, struct msm_mmu *mmu, const char *name, u64 va_start, u64 va_size, bool managed) { + struct msm_drm_private *priv = drm->dev_private; enum drm_gpuvm_flags flags = managed ? DRM_GPUVM_VA_WEAK_REF : 0; struct msm_gem_vm *vm; struct drm_gem_object *dummy_gem; @@ -673,6 +679,19 @@ msm_gem_vm_create(struct drm_device *drm, struct msm_mmu *mmu, const char *name, goto err_free_dummy; } + /* For userspace pgtables, generate a VM name based on comm and PID nr: */ + if (!name) { + char tmpname[TASK_COMM_LEN]; + struct pid *pid = get_pid(task_tgid(current)); + + get_task_comm(tmpname, current); + rcu_read_lock(); + snprintf(vm->name, sizeof(name), "%s[%d]", tmpname, pid_nr(pid)); + rcu_read_unlock(); + + name = vm->name; + } + drm_gpuvm_init(&vm->base, name, flags, drm, dummy_gem, va_start, va_size, 0, 0, &msm_gpuvm_ops); drm_gem_object_put(dummy_gem); @@ -686,6 +705,10 @@ msm_gem_vm_create(struct drm_device *drm, struct msm_mmu *mmu, const char *name, drm_mm_init(&vm->mm, va_start, va_size); + mutex_lock(&priv->vm_lock); + list_add_tail(&vm->node, &priv->vms); + mutex_unlock(&priv->vm_lock); + return &vm->base; err_free_dummy: