From nobody Mon May 12 20:57:37 2025
Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com
[136.143.188.112])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.subspace.kernel.org (Postfix) with ESMTPS id DAB2523645F;
Wed, 2 Apr 2025 11:55:40 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=pass smtp.client-ip=136.143.188.112
ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1743594942; cv=pass;
b=TRPcF0W/L00GjSQbMM966cNN44+4ztaWHq4qmkxlPKVaWVu0/zEYVGCtUWLnokI1FxIvboNrBQrhnoH7eWe4ZdAXGYcpaQzrDcrMcDbaFQlFxUVJCpXGNGL+UBZAXRSBzyImKd/7vluRUIcqzl2chvNSqAE6cffg93xdcqjXH/0=
ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1743594942; c=relaxed/simple;
bh=KFOX7j6dcsCjMm3XpoQ4xj9VhLpO5r0rtI8u4eTP0eU=;
h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:
MIME-Version:Content-Type;
b=sxecB9FKnxGjKYfBz2ygopeXt0Bvv1n+6jV5GFUGv/cj3DaWtrTKE+IL1QXZhVrnMcZJSYhBiVG0NNFLqrkWrkyFtK2RNnzm90OiEqLcN09LtbMnGHvDaymyRnPCRMZqCAZFKiEHvWwIn81zSlmRi0ph0HNXAtToaMMQKQIyaUo=
ARC-Authentication-Results: i=2; smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=collabora.com;
spf=pass smtp.mailfrom=collabora.com;
dkim=pass (1024-bit key) header.d=collabora.com
header.i=adrian.larumbe@collabora.com header.b=CRVcv6mf;
arc=pass smtp.client-ip=136.143.188.112
Authentication-Results: smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=collabora.com
Authentication-Results: smtp.subspace.kernel.org;
spf=pass smtp.mailfrom=collabora.com
Authentication-Results: smtp.subspace.kernel.org;
dkim=pass (1024-bit key) header.d=collabora.com
header.i=adrian.larumbe@collabora.com header.b="CRVcv6mf"
ARC-Seal: i=1; a=rsa-sha256; t=1743594918; cv=none;
d=zohomail.com; s=zohoarc;
b=liRtz9fpxscLhtIPo16rC5aPFIJmQYD80rWMURo0BwDLCD1R76AYfTEdvP3ZqJxayv+nnjGWK5caVMeGDmNZKFkWfAPW/ID2nT7uEykocbe/ix9bLpMBeiLXhj9VPmbeMpgcD7suW2QB0nGbtYXFBTCRll9bt+njjV3OqHxpHUU=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1743594918;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To;
bh=4UyPlXIDXdLEvKXdapaXy/kcMLyCFQnzUHF9J9uf/ds=;
b=jVDnwEMP+2F75oGqcV8hRlxfHfJ+v+BOKyZYj+LRnLIZ6ENOKeUzEOkza3DuywXJo5Pj5jPVRGconMnubNB2yP0f/LR1apN1j7Ob2pGEwv128hWKR6eAHbkmpeBnpCUAh7DFmu1SnXqu0g2mrIqw0N5uCNLt6Oe8jLGyrIswteU=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass header.i=collabora.com;
spf=pass smtp.mailfrom=adrian.larumbe@collabora.com;
dmarc=pass header.from=<adrian.larumbe@collabora.com>
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1743594918;
s=zohomail; d=collabora.com; i=adrian.larumbe@collabora.com;
h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To;
bh=4UyPlXIDXdLEvKXdapaXy/kcMLyCFQnzUHF9J9uf/ds=;
b=CRVcv6mfpZRXbcLyDEb0ZPtHuzzwLa7MPPup6rX7OcSGWJhDWtfC6J9HpZ2tslNd
+uddMehBYe65LFGwZpoMM1Jm/adnjUCtE/KIYYhHhcGSSbnlZs3uWXPgi41jpDoerem
WXNXC0gedU2vFktOrGpxCsMIzkDbbPeICxslxWso=
Received: by mx.zohomail.com with SMTPS id 1743594917588165.5700934336778;
Wed, 2 Apr 2025 04:55:17 -0700 (PDT)
From: =?UTF-8?q?Adri=C3=A1n=20Larumbe?= <adrian.larumbe@collabora.com>
To: Boris Brezillon <boris.brezillon@collabora.com>,
Steven Price <steven.price@arm.com>,
Liviu Dudau <liviu.dudau@arm.com>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
David Airlie <airlied@gmail.com>,
Simona Vetter <simona@ffwll.ch>,
Sumit Semwal <sumit.semwal@linaro.org>,
=?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
Cc: kernel@collabora.com,
=?UTF-8?q?Adri=C3=A1n=20Larumbe?= <adrian.larumbe@collabora.com>,
dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org,
linux-media@vger.kernel.org,
linaro-mm-sig@lists.linaro.org
Subject: [PATCH v4 1/4] drm/panthor: Introduce BO labeling
Date: Wed, 2 Apr 2025 12:54:26 +0100
Message-ID: <20250402115432.1469703-2-adrian.larumbe@collabora.com>
X-Mailer: git-send-email 2.48.1
In-Reply-To: <20250402115432.1469703-1-adrian.larumbe@collabora.com>
References: <20250402115432.1469703-1-adrian.larumbe@collabora.com>
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Add a new character string Panthor BO field, and a function that allows
setting it from within the driver.
Driver takes care of freeing the string when it's replaced or no longer
needed at object destruction time, but allocating it is the responsibility
of callers.
Signed-off-by: Adri=C3=A1n Larumbe <adrian.larumbe@collabora.com>
---
drivers/gpu/drm/panthor/panthor_gem.c | 38 +++++++++++++++++++++++++++
drivers/gpu/drm/panthor/panthor_gem.h | 17 ++++++++++++
2 files changed, 55 insertions(+)
diff --git a/drivers/gpu/drm/panthor/panthor_gem.c b/drivers/gpu/drm/pantho=
r/panthor_gem.c
index 8244a4e6c2a2..7d017f9d1d52 100644
--- a/drivers/gpu/drm/panthor/panthor_gem.c
+++ b/drivers/gpu/drm/panthor/panthor_gem.c
@@ -18,6 +18,14 @@ static void panthor_gem_free_object(struct drm_gem_objec=
t *obj)
struct panthor_gem_object *bo =3D to_panthor_bo(obj);
struct drm_gem_object *vm_root_gem =3D bo->exclusive_vm_root_gem;
=20
+ /*
+ * Label might have been allocated with kstrdup_const(),
+ * we need to take that into account when freeing the memory
+ */
+ kfree_const(bo->label.str);
+
+ mutex_destroy(&bo->label.lock);
+
drm_gem_free_mmap_offset(&bo->base.base);
mutex_destroy(&bo->gpuva_list_lock);
drm_gem_shmem_free(&bo->base);
@@ -196,6 +204,7 @@ struct drm_gem_object *panthor_gem_create_object(struct=
drm_device *ddev, size_t
obj->base.map_wc =3D !ptdev->coherent;
mutex_init(&obj->gpuva_list_lock);
drm_gem_gpuva_set_lock(&obj->base.base, &obj->gpuva_list_lock);
+ mutex_init(&obj->label.lock);
=20
return &obj->base.base;
}
@@ -247,3 +256,32 @@ panthor_gem_create_with_handle(struct drm_file *file,
=20
return ret;
}
+
+void
+panthor_gem_bo_set_label(struct drm_gem_object *obj, const char *label)
+{
+ struct panthor_gem_object *bo =3D to_panthor_bo(obj);
+ const char *old_label;
+
+ mutex_lock(&bo->label.lock);
+ old_label =3D bo->label.str;
+ bo->label.str =3D label;
+ mutex_unlock(&bo->label.lock);
+
+ kfree(old_label);
+}
+
+void
+panthor_gem_kernel_bo_set_label(struct panthor_kernel_bo *bo, const char *=
label)
+{
+ const char *str;
+
+ str =3D kstrdup_const(label, GFP_KERNEL);
+ if (!str) {
+ /* Failing to allocate memory for a label isn't a fatal condition */
+ drm_warn(bo->obj->dev, "Not enough memory to allocate BO label");
+ return;
+ }
+
+ panthor_gem_bo_set_label(bo->obj, kstrdup_const(str, GFP_KERNEL));
+}
diff --git a/drivers/gpu/drm/panthor/panthor_gem.h b/drivers/gpu/drm/pantho=
r/panthor_gem.h
index 5749ef2ebe03..0582826b341a 100644
--- a/drivers/gpu/drm/panthor/panthor_gem.h
+++ b/drivers/gpu/drm/panthor/panthor_gem.h
@@ -46,6 +46,20 @@ struct panthor_gem_object {
=20
/** @flags: Combination of drm_panthor_bo_flags flags. */
u32 flags;
+
+ /**
+ * @label: BO tagging fields. The label can be assigned within the
+ * driver itself or through a specific IOCTL.
+ */
+ struct {
+ /**
+ * @label.str: Pointer to NULL-terminated string,
+ */
+ const char *str;
+
+ /** @lock.str: Protects access to the @label.str field. */
+ struct mutex lock;
+ } label;
};
=20
/**
@@ -91,6 +105,9 @@ panthor_gem_create_with_handle(struct drm_file *file,
struct panthor_vm *exclusive_vm,
u64 *size, u32 flags, uint32_t *handle);
=20
+void panthor_gem_bo_set_label(struct drm_gem_object *obj, const char *labe=
l);
+void panthor_gem_kernel_bo_set_label(struct panthor_kernel_bo *bo, const c=
har *label);
+
static inline u64
panthor_kernel_bo_gpuva(struct panthor_kernel_bo *bo)
{
--=20
2.48.1
From nobody Mon May 12 20:57:37 2025
Received: from sender3-pp-f112.zoho.com (sender3-pp-f112.zoho.com
[136.143.184.112])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5E409235BFB;
Wed, 2 Apr 2025 11:55:49 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=pass smtp.client-ip=136.143.184.112
ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1743594951; cv=pass;
b=rXeoZvQ1UzJVuGvzR3+JZrzjfMdFMCT0ZW5jae/6svA/Jt4PSM0BJjjtCWvYlMQA9iyQG2xbKxIgwaTcKnfEdS/Kh2r11GuoP8PmWTutYpCT+lUvBhzd0JF/91+ZPbmYkcUFg4bAYlkTl/woVIObyArXASYBVLnB2AX2gb7wrVg=
ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1743594951; c=relaxed/simple;
bh=qs81naNaRzLP6Q+1JFRMrs7eUzZyQ/99hs3cWYDZo04=;
h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:
MIME-Version:Content-Type;
b=h7z1bNgRFlB2RRIf3QY9w8Qya8MOy4kV34/kQQX7tVb1Y21UWXOEP/F/YxoonSgUzBr6Io0Zoikwl5FQhUXuABMILrRLlON8BheDhqmQj7C+h0VNpV3N2PWX66gTNT4FoPcWfQftMLYLLyicmuAPTaZ7sYvuf7ZmrbzLFrPdXRQ=
ARC-Authentication-Results: i=2; smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=collabora.com;
spf=pass smtp.mailfrom=collabora.com;
dkim=pass (1024-bit key) header.d=collabora.com
header.i=adrian.larumbe@collabora.com header.b=T2WwwgGB;
arc=pass smtp.client-ip=136.143.184.112
Authentication-Results: smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=collabora.com
Authentication-Results: smtp.subspace.kernel.org;
spf=pass smtp.mailfrom=collabora.com
Authentication-Results: smtp.subspace.kernel.org;
dkim=pass (1024-bit key) header.d=collabora.com
header.i=adrian.larumbe@collabora.com header.b="T2WwwgGB"
ARC-Seal: i=1; a=rsa-sha256; t=1743594922; cv=none;
d=zohomail.com; s=zohoarc;
b=DiJ6MDYe7zzZtGh4wwrZI8Q+uJ5vkJWotSD9PNbqYv8YHOt1qXJrnRIBCB/8MeuOejaSu5XW6ZOIA2woRR/0RgGuGlQc/ZW7LRSmHUhQqlnGHM4AMcchbId/jwFU/fG5nBR3KqryH7f2i/8lvYpCYcfw/+x2RdsUa1FKQcCO/ME=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1743594922;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To;
bh=ZfIL757wzT3AriyUwfgq1gYwdR6dvXTgyX4RnPItMl4=;
b=COnTJBQozXCvuvok/446sBsBD4CNoxp9Fx/Y187RMGPbnYo10NlrCufTFZ4iRezVEJMpPG8KSmp7C6Mje746IYsF7gvCeK8xz4f8SEfIozH8XXJhKwLi5a2D0NMRs7UgZkf9X6AMXhoMCLhQBydMY0OJ6mq/dvNcEVHfMOabAF4=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass header.i=collabora.com;
spf=pass smtp.mailfrom=adrian.larumbe@collabora.com;
dmarc=pass header.from=<adrian.larumbe@collabora.com>
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1743594922;
s=zohomail; d=collabora.com; i=adrian.larumbe@collabora.com;
h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To;
bh=ZfIL757wzT3AriyUwfgq1gYwdR6dvXTgyX4RnPItMl4=;
b=T2WwwgGBmuUPfgNwVmKieunxBcpGkbHQVWVxSINvIVVtnKA8fs/a1+TiYqMWdxku
d36D7ZACNfxGY6VlV7gyyHkp4gQIHl1/cC3I9/llXrYSmsyGMXwZ0I652Iv90NUpAa3
trAI2r3e6bP+RJy/Dg9P7ZBJvkp7aJj7WALGkX2o=
Received: by mx.zohomail.com with SMTPS id 1743594920867215.66543802292108;
Wed, 2 Apr 2025 04:55:20 -0700 (PDT)
From: =?UTF-8?q?Adri=C3=A1n=20Larumbe?= <adrian.larumbe@collabora.com>
To: Boris Brezillon <boris.brezillon@collabora.com>,
Steven Price <steven.price@arm.com>,
Liviu Dudau <liviu.dudau@arm.com>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
David Airlie <airlied@gmail.com>,
Simona Vetter <simona@ffwll.ch>,
Sumit Semwal <sumit.semwal@linaro.org>,
=?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
Cc: kernel@collabora.com,
=?UTF-8?q?Adri=C3=A1n=20Larumbe?= <adrian.larumbe@collabora.com>,
dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org,
linux-media@vger.kernel.org,
linaro-mm-sig@lists.linaro.org
Subject: [PATCH v4 2/4] drm/panthor: Add driver IOCTL for setting BO labels
Date: Wed, 2 Apr 2025 12:54:27 +0100
Message-ID: <20250402115432.1469703-3-adrian.larumbe@collabora.com>
X-Mailer: git-send-email 2.48.1
In-Reply-To: <20250402115432.1469703-1-adrian.larumbe@collabora.com>
References: <20250402115432.1469703-1-adrian.larumbe@collabora.com>
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Allow UM to label a BO for which it possesses a DRM handle.
Signed-off-by: Adri=C3=A1n Larumbe <adrian.larumbe@collabora.com>
Reviewed-by: Liviu Dudau <liviu.dudau@arm.com>
---
drivers/gpu/drm/panthor/panthor_drv.c | 40 +++++++++++++++++++++++++++
drivers/gpu/drm/panthor/panthor_gem.h | 2 ++
include/uapi/drm/panthor_drm.h | 19 +++++++++++++
3 files changed, 61 insertions(+)
diff --git a/drivers/gpu/drm/panthor/panthor_drv.c b/drivers/gpu/drm/pantho=
r/panthor_drv.c
index 310bb44abe1a..d5277284fe27 100644
--- a/drivers/gpu/drm/panthor/panthor_drv.c
+++ b/drivers/gpu/drm/panthor/panthor_drv.c
@@ -1330,6 +1330,44 @@ static int panthor_ioctl_vm_get_state(struct drm_dev=
ice *ddev, void *data,
return 0;
}
=20
+static int panthor_ioctl_bo_set_label(struct drm_device *ddev, void *data,
+ struct drm_file *file)
+{
+ struct drm_panthor_bo_set_label *args =3D data;
+ struct drm_gem_object *obj;
+ const char *label;
+ int ret =3D 0;
+
+ obj =3D drm_gem_object_lookup(file, args->handle);
+ if (!obj)
+ return -ENOENT;
+
+ if (args->size && args->label) {
+ if (args->size > PANTHOR_BO_LABEL_MAXLEN) {
+ ret =3D -E2BIG;
+ goto err_label;
+ }
+
+ label =3D strndup_user(u64_to_user_ptr(args->label), args->size);
+ if (IS_ERR(label)) {
+ ret =3D PTR_ERR(label);
+ goto err_label;
+ }
+ } else if (args->size && !args->label) {
+ ret =3D -EINVAL;
+ goto err_label;
+ } else {
+ label =3D NULL;
+ }
+
+ panthor_gem_bo_set_label(obj, label);
+
+err_label:
+ drm_gem_object_put(obj);
+
+ return ret;
+}
+
static int
panthor_open(struct drm_device *ddev, struct drm_file *file)
{
@@ -1399,6 +1437,7 @@ static const struct drm_ioctl_desc panthor_drm_driver=
_ioctls[] =3D {
PANTHOR_IOCTL(TILER_HEAP_CREATE, tiler_heap_create, DRM_RENDER_ALLOW),
PANTHOR_IOCTL(TILER_HEAP_DESTROY, tiler_heap_destroy, DRM_RENDER_ALLOW),
PANTHOR_IOCTL(GROUP_SUBMIT, group_submit, DRM_RENDER_ALLOW),
+ PANTHOR_IOCTL(BO_SET_LABEL, bo_set_label, DRM_RENDER_ALLOW),
};
=20
static int panthor_mmap(struct file *filp, struct vm_area_struct *vma)
@@ -1508,6 +1547,7 @@ static void panthor_debugfs_init(struct drm_minor *mi=
nor)
* - 1.2 - adds DEV_QUERY_GROUP_PRIORITIES_INFO query
* - adds PANTHOR_GROUP_PRIORITY_REALTIME priority
* - 1.3 - adds DRM_PANTHOR_GROUP_STATE_INNOCENT flag
+ * - 1.4 - adds DRM_IOCTL_PANTHOR_BO_SET_LABEL ioctl
*/
static const struct drm_driver panthor_drm_driver =3D {
.driver_features =3D DRIVER_RENDER | DRIVER_GEM | DRIVER_SYNCOBJ |
diff --git a/drivers/gpu/drm/panthor/panthor_gem.h b/drivers/gpu/drm/pantho=
r/panthor_gem.h
index 0582826b341a..e18fbc093abd 100644
--- a/drivers/gpu/drm/panthor/panthor_gem.h
+++ b/drivers/gpu/drm/panthor/panthor_gem.h
@@ -13,6 +13,8 @@
=20
struct panthor_vm;
=20
+#define PANTHOR_BO_LABEL_MAXLEN PAGE_SIZE
+
/**
* struct panthor_gem_object - Driver specific GEM object.
*/
diff --git a/include/uapi/drm/panthor_drm.h b/include/uapi/drm/panthor_drm.h
index 97e2c4510e69..26b52f147360 100644
--- a/include/uapi/drm/panthor_drm.h
+++ b/include/uapi/drm/panthor_drm.h
@@ -127,6 +127,9 @@ enum drm_panthor_ioctl_id {
=20
/** @DRM_PANTHOR_TILER_HEAP_DESTROY: Destroy a tiler heap. */
DRM_PANTHOR_TILER_HEAP_DESTROY,
+
+ /** @DRM_PANTHOR_BO_SET_LABEL: Label a BO. */
+ DRM_PANTHOR_BO_SET_LABEL,
};
=20
/**
@@ -977,6 +980,20 @@ struct drm_panthor_tiler_heap_destroy {
__u32 pad;
};
=20
+/**
+ * struct drm_panthor_bo_set_label - Arguments passed to DRM_IOCTL_PANTHOR=
_BO_SET_LABEL
+ */
+struct drm_panthor_bo_set_label {
+ /** @handle: Handle of the buffer object to label. */
+ __u32 handle;
+
+ /** @size: Length of the label, including the NULL terminator. */
+ __u32 size;
+
+ /** @label: User pointer to a NULL-terminated string */
+ __u64 label;
+};
+
/**
* DRM_IOCTL_PANTHOR() - Build a Panthor IOCTL number
* @__access: Access type. Must be R, W or RW.
@@ -1019,6 +1036,8 @@ enum {
DRM_IOCTL_PANTHOR(WR, TILER_HEAP_CREATE, tiler_heap_create),
DRM_IOCTL_PANTHOR_TILER_HEAP_DESTROY =3D
DRM_IOCTL_PANTHOR(WR, TILER_HEAP_DESTROY, tiler_heap_destroy),
+ DRM_IOCTL_PANTHOR_BO_SET_LABEL =3D
+ DRM_IOCTL_PANTHOR(WR, BO_SET_LABEL, bo_set_label),
};
=20
#if defined(__cplusplus)
--=20
2.48.1
From nobody Mon May 12 20:57:37 2025
Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com
[136.143.188.112])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.subspace.kernel.org (Postfix) with ESMTPS id BDB59237706;
Wed, 2 Apr 2025 11:55:49 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=pass smtp.client-ip=136.143.188.112
ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1743594951; cv=pass;
b=QqNyAP9b5b48LOImk8TZ3iIxhFNun2/PSupXL+hSWTYgHwUMUOV9TmFNKZLyHqCrS1yvd4r8XicnvmxfYlqesQwrRm1ovOSZjrc7gQAFNx0/IqGw1F5mewVkySNoIBkUo7jpcYOKrQw9eQ+MFhUxBurASfG28VYkyU8QMjpzaZM=
ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1743594951; c=relaxed/simple;
bh=+QkdgKhzxoUAsrm+aSkR1M9D+DW2WcMKtlN5deizNqU=;
h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:
MIME-Version:Content-Type;
b=QYxjXvjVHUM9QDc1NjG2I4tx1DPm4bXC8OzxhdiqYiWy2EtZrR2u1sOhHxK9qRZzs0aS+o7X7uo/LzbUA1L+03gcCM1J+2L4N0i7CRhJ2qxmzZBSocaXMmgue6BFBjZyEECNx2WLk4YifYPWqs1bnmx4eLy5jCd8tU1nNNjC6GU=
ARC-Authentication-Results: i=2; smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=collabora.com;
spf=pass smtp.mailfrom=collabora.com;
dkim=pass (1024-bit key) header.d=collabora.com
header.i=adrian.larumbe@collabora.com header.b=YKi4GyeR;
arc=pass smtp.client-ip=136.143.188.112
Authentication-Results: smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=collabora.com
Authentication-Results: smtp.subspace.kernel.org;
spf=pass smtp.mailfrom=collabora.com
Authentication-Results: smtp.subspace.kernel.org;
dkim=pass (1024-bit key) header.d=collabora.com
header.i=adrian.larumbe@collabora.com header.b="YKi4GyeR"
ARC-Seal: i=1; a=rsa-sha256; t=1743594926; cv=none;
d=zohomail.com; s=zohoarc;
b=Y6TNJpRqAUyc3u6j6PJimXCmbhX1JByFkHekbus1Ng0Eb+LCDwZ9uYme8ymMlxNnJtw3A8imVlOO46csaMEDFJwhKq/qoDnGwbn7y74m3NfnSZy6q6BbEzb7Jro7xalCBxlMMHPMZB573xBt7DsO+Nrydvru36pG2eJhwMcSqm8=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1743594926;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To;
bh=JCqFvWGJBxqcr+vad6jtOUkAHpuceWAfMseZUqdibaw=;
b=JLQfwDRN/K0V4jWEqPNvhvWd6o+/4/RdO0ZSVmrSj7dzTVAsLXm41FKwPA8/rlbLe2t8/AgEBy/LadGXrN5Kdm+09TXSoBoKtNuWzB4TmmmrH3/KELZ0NoS9isAt/ca8RW4eJP+XaE9IWZ509DIk/LO2tZiYFlK2YgzRQcSSpBk=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass header.i=collabora.com;
spf=pass smtp.mailfrom=adrian.larumbe@collabora.com;
dmarc=pass header.from=<adrian.larumbe@collabora.com>
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1743594926;
s=zohomail; d=collabora.com; i=adrian.larumbe@collabora.com;
h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To;
bh=JCqFvWGJBxqcr+vad6jtOUkAHpuceWAfMseZUqdibaw=;
b=YKi4GyeRBYprJp8AfIy75rs3n6NcNqF/ZxCnq0OHepuSsR6CrJyBj92Q5q8lAQcw
H8OQtJKoSgcBR/bL1y8gxaqeUuS6vM7Q25hhEhBQAcCXycR5YtYTtSbAKlBmEERvxjq
O7rWOYNPFLH7j1FX9CDYqUfuUwvwxkhSNFYVEIeA=
Received: by mx.zohomail.com with SMTPS id 1743594924312158.54123714197203;
Wed, 2 Apr 2025 04:55:24 -0700 (PDT)
From: =?UTF-8?q?Adri=C3=A1n=20Larumbe?= <adrian.larumbe@collabora.com>
To: Boris Brezillon <boris.brezillon@collabora.com>,
Steven Price <steven.price@arm.com>,
Liviu Dudau <liviu.dudau@arm.com>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
David Airlie <airlied@gmail.com>,
Simona Vetter <simona@ffwll.ch>,
Sumit Semwal <sumit.semwal@linaro.org>,
=?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
Cc: kernel@collabora.com,
=?UTF-8?q?Adri=C3=A1n=20Larumbe?= <adrian.larumbe@collabora.com>,
dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org,
linux-media@vger.kernel.org,
linaro-mm-sig@lists.linaro.org
Subject: [PATCH v4 3/4] drm/panthor: Label all kernel BO's
Date: Wed, 2 Apr 2025 12:54:28 +0100
Message-ID: <20250402115432.1469703-4-adrian.larumbe@collabora.com>
X-Mailer: git-send-email 2.48.1
In-Reply-To: <20250402115432.1469703-1-adrian.larumbe@collabora.com>
References: <20250402115432.1469703-1-adrian.larumbe@collabora.com>
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Kernel BO's aren't exposed to UM, so labelling them is the responsibility
of the driver itself. This kind of tagging will prove useful in further
commits when want to expose these objects through DebugFS.
Expand panthor_kernel_bo_create() interface to take a NULL-terminated
string. No bounds checking is done because all label strings are given
as statically-allocated literals, but if a more complex kernel BO naming
scheme with explicit memory allocation and formatting was desired in the
future, this would have to change.
Signed-off-by: Adri=C3=A1n Larumbe <adrian.larumbe@collabora.com>
---
drivers/gpu/drm/panthor/panthor_fw.c | 8 +++++---
drivers/gpu/drm/panthor/panthor_gem.c | 3 ++-
drivers/gpu/drm/panthor/panthor_gem.h | 2 +-
drivers/gpu/drm/panthor/panthor_heap.c | 6 ++++--
drivers/gpu/drm/panthor/panthor_sched.c | 9 ++++++---
5 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/panthor/panthor_fw.c b/drivers/gpu/drm/panthor=
/panthor_fw.c
index 4a9c4afa9ad7..36e60bb2dcc5 100644
--- a/drivers/gpu/drm/panthor/panthor_fw.c
+++ b/drivers/gpu/drm/panthor/panthor_fw.c
@@ -449,7 +449,8 @@ panthor_fw_alloc_queue_iface_mem(struct panthor_device =
*ptdev,
DRM_PANTHOR_BO_NO_MMAP,
DRM_PANTHOR_VM_BIND_OP_MAP_NOEXEC |
DRM_PANTHOR_VM_BIND_OP_MAP_UNCACHED,
- PANTHOR_VM_KERNEL_AUTO_VA);
+ PANTHOR_VM_KERNEL_AUTO_VA,
+ "Queue FW interface");
if (IS_ERR(mem))
return mem;
=20
@@ -481,7 +482,8 @@ panthor_fw_alloc_suspend_buf_mem(struct panthor_device =
*ptdev, size_t size)
return panthor_kernel_bo_create(ptdev, panthor_fw_vm(ptdev), size,
DRM_PANTHOR_BO_NO_MMAP,
DRM_PANTHOR_VM_BIND_OP_MAP_NOEXEC,
- PANTHOR_VM_KERNEL_AUTO_VA);
+ PANTHOR_VM_KERNEL_AUTO_VA,
+ "FW suspend buffer");
}
=20
static int panthor_fw_load_section_entry(struct panthor_device *ptdev,
@@ -601,7 +603,7 @@ static int panthor_fw_load_section_entry(struct panthor=
_device *ptdev,
section->mem =3D panthor_kernel_bo_create(ptdev, panthor_fw_vm(ptdev),
section_size,
DRM_PANTHOR_BO_NO_MMAP,
- vm_map_flags, va);
+ vm_map_flags, va, "FW Section");
if (IS_ERR(section->mem))
return PTR_ERR(section->mem);
=20
diff --git a/drivers/gpu/drm/panthor/panthor_gem.c b/drivers/gpu/drm/pantho=
r/panthor_gem.c
index 7d017f9d1d52..44d027e6d664 100644
--- a/drivers/gpu/drm/panthor/panthor_gem.c
+++ b/drivers/gpu/drm/panthor/panthor_gem.c
@@ -81,7 +81,7 @@ void panthor_kernel_bo_destroy(struct panthor_kernel_bo *=
bo)
struct panthor_kernel_bo *
panthor_kernel_bo_create(struct panthor_device *ptdev, struct panthor_vm *=
vm,
size_t size, u32 bo_flags, u32 vm_map_flags,
- u64 gpu_va)
+ u64 gpu_va, const char *name)
{
struct drm_gem_shmem_object *obj;
struct panthor_kernel_bo *kbo;
@@ -105,6 +105,7 @@ panthor_kernel_bo_create(struct panthor_device *ptdev, =
struct panthor_vm *vm,
kbo->obj =3D &obj->base;
bo->flags =3D bo_flags;
=20
+ panthor_gem_kernel_bo_set_label(kbo, name);
/* The system and GPU MMU page size might differ, which becomes a
* problem for FW sections that need to be mapped at explicit address
* since our PAGE_SIZE alignment might cover a VA range that's
diff --git a/drivers/gpu/drm/panthor/panthor_gem.h b/drivers/gpu/drm/pantho=
r/panthor_gem.h
index e18fbc093abd..49daa5088a0d 100644
--- a/drivers/gpu/drm/panthor/panthor_gem.h
+++ b/drivers/gpu/drm/panthor/panthor_gem.h
@@ -153,7 +153,7 @@ panthor_kernel_bo_vunmap(struct panthor_kernel_bo *bo)
struct panthor_kernel_bo *
panthor_kernel_bo_create(struct panthor_device *ptdev, struct panthor_vm *=
vm,
size_t size, u32 bo_flags, u32 vm_map_flags,
- u64 gpu_va);
+ u64 gpu_va, const char *name);
=20
void panthor_kernel_bo_destroy(struct panthor_kernel_bo *bo);
=20
diff --git a/drivers/gpu/drm/panthor/panthor_heap.c b/drivers/gpu/drm/panth=
or/panthor_heap.c
index db0285ce5812..ad122bd37ac2 100644
--- a/drivers/gpu/drm/panthor/panthor_heap.c
+++ b/drivers/gpu/drm/panthor/panthor_heap.c
@@ -147,7 +147,8 @@ static int panthor_alloc_heap_chunk(struct panthor_devi=
ce *ptdev,
chunk->bo =3D panthor_kernel_bo_create(ptdev, vm, heap->chunk_size,
DRM_PANTHOR_BO_NO_MMAP,
DRM_PANTHOR_VM_BIND_OP_MAP_NOEXEC,
- PANTHOR_VM_KERNEL_AUTO_VA);
+ PANTHOR_VM_KERNEL_AUTO_VA,
+ "Tiler heap chunk");
if (IS_ERR(chunk->bo)) {
ret =3D PTR_ERR(chunk->bo);
goto err_free_chunk;
@@ -550,7 +551,8 @@ panthor_heap_pool_create(struct panthor_device *ptdev, =
struct panthor_vm *vm)
pool->gpu_contexts =3D panthor_kernel_bo_create(ptdev, vm, bosize,
DRM_PANTHOR_BO_NO_MMAP,
DRM_PANTHOR_VM_BIND_OP_MAP_NOEXEC,
- PANTHOR_VM_KERNEL_AUTO_VA);
+ PANTHOR_VM_KERNEL_AUTO_VA,
+ "Heap pool");
if (IS_ERR(pool->gpu_contexts)) {
ret =3D PTR_ERR(pool->gpu_contexts);
goto err_destroy_pool;
diff --git a/drivers/gpu/drm/panthor/panthor_sched.c b/drivers/gpu/drm/pant=
hor/panthor_sched.c
index 1a276db095ff..a0b8f1ba4ea8 100644
--- a/drivers/gpu/drm/panthor/panthor_sched.c
+++ b/drivers/gpu/drm/panthor/panthor_sched.c
@@ -3334,7 +3334,8 @@ group_create_queue(struct panthor_group *group,
DRM_PANTHOR_BO_NO_MMAP,
DRM_PANTHOR_VM_BIND_OP_MAP_NOEXEC |
DRM_PANTHOR_VM_BIND_OP_MAP_UNCACHED,
- PANTHOR_VM_KERNEL_AUTO_VA);
+ PANTHOR_VM_KERNEL_AUTO_VA,
+ "Ring buffer");
if (IS_ERR(queue->ringbuf)) {
ret =3D PTR_ERR(queue->ringbuf);
goto err_free_queue;
@@ -3364,7 +3365,8 @@ group_create_queue(struct panthor_group *group,
DRM_PANTHOR_BO_NO_MMAP,
DRM_PANTHOR_VM_BIND_OP_MAP_NOEXEC |
DRM_PANTHOR_VM_BIND_OP_MAP_UNCACHED,
- PANTHOR_VM_KERNEL_AUTO_VA);
+ PANTHOR_VM_KERNEL_AUTO_VA,
+ "fdinfo slots");
=20
if (IS_ERR(queue->profiling.slots)) {
ret =3D PTR_ERR(queue->profiling.slots);
@@ -3495,7 +3497,8 @@ int panthor_group_create(struct panthor_file *pfile,
DRM_PANTHOR_BO_NO_MMAP,
DRM_PANTHOR_VM_BIND_OP_MAP_NOEXEC |
DRM_PANTHOR_VM_BIND_OP_MAP_UNCACHED,
- PANTHOR_VM_KERNEL_AUTO_VA);
+ PANTHOR_VM_KERNEL_AUTO_VA,
+ "Group sync objects");
if (IS_ERR(group->syncobjs)) {
ret =3D PTR_ERR(group->syncobjs);
goto err_put_group;
--=20
2.48.1
From nobody Mon May 12 20:57:37 2025
Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com
[136.143.188.112])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.subspace.kernel.org (Postfix) with ESMTPS id C6519238155;
Wed, 2 Apr 2025 11:55:50 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=pass smtp.client-ip=136.143.188.112
ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1743594952; cv=pass;
b=l9FXLCDN6crzwccRrDThdSLUqzkdaQvBF49k3nDMDPjBeuSeh8sGG88jaBQPrwNFc9lLahKhqScW/rBMghH5s0Pnr4syXLCjs3NV98CEOtQPwUXDoOK7wAEJvRJB8Mk8KbMB0kut+i9FSbBGNt3mB23oJSHSLDReMCoitg9LAww=
ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1743594952; c=relaxed/simple;
bh=ZliQEQ5MDKE1UHvz+kS+sUp/Edmq+KHb3ITaqhQ12Mg=;
h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:
MIME-Version:Content-Type;
b=p25yJS/hZguH7OZMltrPgbqQsEsnFCok2PZxP5jy4QH0OVFYWphKlrCoCheh1QtvJsvMubjnvwLjhJ0a46navcPq1lobngLgsD2q7/ZXAAhEyzFPwPYYvm/G1szPWh1nhfcRe6CpFYTcbJ/i8cajXSlLkqMFPHvS3BKNoJ5dmjA=
ARC-Authentication-Results: i=2; smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=collabora.com;
spf=pass smtp.mailfrom=collabora.com;
dkim=pass (1024-bit key) header.d=collabora.com
header.i=adrian.larumbe@collabora.com header.b=ZvWZ78O3;
arc=pass smtp.client-ip=136.143.188.112
Authentication-Results: smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=collabora.com
Authentication-Results: smtp.subspace.kernel.org;
spf=pass smtp.mailfrom=collabora.com
Authentication-Results: smtp.subspace.kernel.org;
dkim=pass (1024-bit key) header.d=collabora.com
header.i=adrian.larumbe@collabora.com header.b="ZvWZ78O3"
ARC-Seal: i=1; a=rsa-sha256; t=1743594928; cv=none;
d=zohomail.com; s=zohoarc;
b=gIdELIu2oH6rWtoD7RRhXDcZNqvqgBf/6A7zEwEEDRzjv55ok1485yYUk4oLQuuV3zzYt2aUhVWAD4PBacTfoO0Z2fWy55jkc0Vm2Mc8tA0Ot7IvxJTX02jjoAzqmufS/x/FERuZOaRIYwgjivHyIKtEHrpNl01pcURJYpOLi5g=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1743594928;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To;
bh=28zoQNIUgCZu0LlUCPB+bP4VLF9hlNu1vegcPOiq66w=;
b=DCaa71ZV/s0qKoN/Bhq4xXjuqJx6LbtN51e1VUsQycddM7AeJkPhCOsZAL52H5WYLoVBFdiaITza4uQX2YQScYf7ILDlAEGQRSLE1w61uymznAT7d1VCSr0hJ8jzNJwqS3qeO5+0+ES7/6FJtJNkA7FuzCjfQhSMlJY9wTKhvD0=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass header.i=collabora.com;
spf=pass smtp.mailfrom=adrian.larumbe@collabora.com;
dmarc=pass header.from=<adrian.larumbe@collabora.com>
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1743594928;
s=zohomail; d=collabora.com; i=adrian.larumbe@collabora.com;
h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To;
bh=28zoQNIUgCZu0LlUCPB+bP4VLF9hlNu1vegcPOiq66w=;
b=ZvWZ78O3e9/9++iRCytCp8n3jhjCWoWR4QYhT1K1EQurE0VA4N4gVcxqXjC5bJju
WX0Uy+9G0ei/gry17gz+eBLCW32f2HPok4b793Ds88uqYXeBYT3M5rQ8hZRDgmaRwgh
ZAVtkOYg2U8QnhFTLjI3ULvWJuewDctNcQAx70Uo=
Received: by mx.zohomail.com with SMTPS id 1743594927465770.172508827981;
Wed, 2 Apr 2025 04:55:27 -0700 (PDT)
From: =?UTF-8?q?Adri=C3=A1n=20Larumbe?= <adrian.larumbe@collabora.com>
To: Boris Brezillon <boris.brezillon@collabora.com>,
Steven Price <steven.price@arm.com>,
Liviu Dudau <liviu.dudau@arm.com>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
David Airlie <airlied@gmail.com>,
Simona Vetter <simona@ffwll.ch>,
Sumit Semwal <sumit.semwal@linaro.org>,
=?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
Cc: kernel@collabora.com,
=?UTF-8?q?Adri=C3=A1n=20Larumbe?= <adrian.larumbe@collabora.com>,
dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org,
linux-media@vger.kernel.org,
linaro-mm-sig@lists.linaro.org
Subject: [PATCH v4 4/4] drm/panthor: show device-wide list of DRM GEM objects
over DebugFS
Date: Wed, 2 Apr 2025 12:54:29 +0100
Message-ID: <20250402115432.1469703-5-adrian.larumbe@collabora.com>
X-Mailer: git-send-email 2.48.1
In-Reply-To: <20250402115432.1469703-1-adrian.larumbe@collabora.com>
References: <20250402115432.1469703-1-adrian.larumbe@collabora.com>
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Add a device DebugFS file that displays a complete list of all the DRM
GEM objects that are exposed to UM through a DRM handle.
Since leaking object identifiers that might belong to a different NS is
inadmissible, this functionality is only made available in debug builds
with DEBUGFS support enabled.
File format is that of a table, with each entry displaying a variety of
fields with information about each GEM object.
Each GEM object entry in the file displays the following information
fields: Client PID, BO's global name, reference count, BO virtual size,
BO resize size, VM address in its DRM-managed range, BO label and a flag
bitmask.
There's also a kflags field for the type of BO. Bit 0 tells us whether
it's a kernel BO, and bit 1 means the BO is mapped onto the FW's address
space.
Signed-off-by: Adri=C3=A1n Larumbe <adrian.larumbe@collabora.com>
---
drivers/gpu/drm/panthor/panthor_device.c | 5 +
drivers/gpu/drm/panthor/panthor_device.h | 11 ++
drivers/gpu/drm/panthor/panthor_drv.c | 26 ++++
drivers/gpu/drm/panthor/panthor_gem.c | 149 +++++++++++++++++++++++
drivers/gpu/drm/panthor/panthor_gem.h | 35 ++++++
5 files changed, 226 insertions(+)
diff --git a/drivers/gpu/drm/panthor/panthor_device.c b/drivers/gpu/drm/pan=
thor/panthor_device.c
index a9da1d1eeb70..b776e1a2e4f3 100644
--- a/drivers/gpu/drm/panthor/panthor_device.c
+++ b/drivers/gpu/drm/panthor/panthor_device.c
@@ -184,6 +184,11 @@ int panthor_device_init(struct panthor_device *ptdev)
if (ret)
return ret;
=20
+#ifdef CONFIG_DEBUG_FS
+ drmm_mutex_init(&ptdev->base, &ptdev->gems.lock);
+ INIT_LIST_HEAD(&ptdev->gems.node);
+#endif
+
atomic_set(&ptdev->pm.state, PANTHOR_DEVICE_PM_STATE_SUSPENDED);
p =3D alloc_page(GFP_KERNEL | __GFP_ZERO);
if (!p)
diff --git a/drivers/gpu/drm/panthor/panthor_device.h b/drivers/gpu/drm/pan=
thor/panthor_device.h
index da6574021664..86206a961b38 100644
--- a/drivers/gpu/drm/panthor/panthor_device.h
+++ b/drivers/gpu/drm/panthor/panthor_device.h
@@ -205,6 +205,17 @@ struct panthor_device {
=20
/** @fast_rate: Maximum device clock frequency. Set by DVFS */
unsigned long fast_rate;
+
+#ifdef CONFIG_DEBUG_FS
+ /** @gems: Device-wide list of GEM objects owned by at least one file. */
+ struct {
+ /** @gems.lock: Protects the device-wide list of GEM objects. */
+ struct mutex lock;
+
+ /** @node: Used to keep track of all the device's DRM objects */
+ struct list_head node;
+ } gems;
+#endif
};
=20
struct panthor_gpu_usage {
diff --git a/drivers/gpu/drm/panthor/panthor_drv.c b/drivers/gpu/drm/pantho=
r/panthor_drv.c
index d5277284fe27..3e870ed2ad90 100644
--- a/drivers/gpu/drm/panthor/panthor_drv.c
+++ b/drivers/gpu/drm/panthor/panthor_drv.c
@@ -1534,9 +1534,35 @@ static const struct file_operations panthor_drm_driv=
er_fops =3D {
};
=20
#ifdef CONFIG_DEBUG_FS
+static int panthor_gems_show(struct seq_file *m, void *data)
+{
+ struct drm_info_node *node =3D m->private;
+ struct drm_device *dev =3D node->minor->dev;
+ struct panthor_device *ptdev =3D container_of(dev, struct panthor_device,=
base);
+
+ panthor_gem_debugfs_print_bos(ptdev, m);
+
+ return 0;
+}
+
+
+static struct drm_info_list panthor_debugfs_list[] =3D {
+ {"gems", panthor_gems_show, 0, NULL},
+};
+
+static int panthor_gems_debugfs_init(struct drm_minor *minor)
+{
+ drm_debugfs_create_files(panthor_debugfs_list,
+ ARRAY_SIZE(panthor_debugfs_list),
+ minor->debugfs_root, minor);
+
+ return 0;
+}
+
static void panthor_debugfs_init(struct drm_minor *minor)
{
panthor_mmu_debugfs_init(minor);
+ panthor_gems_debugfs_init(minor);
}
#endif
=20
diff --git a/drivers/gpu/drm/panthor/panthor_gem.c b/drivers/gpu/drm/pantho=
r/panthor_gem.c
index 44d027e6d664..2fc87be9b700 100644
--- a/drivers/gpu/drm/panthor/panthor_gem.c
+++ b/drivers/gpu/drm/panthor/panthor_gem.c
@@ -2,6 +2,7 @@
/* Copyright 2019 Linaro, Ltd, Rob Herring <robh@kernel.org> */
/* Copyright 2023 Collabora ltd. */
=20
+#include <linux/cleanup.h>
#include <linux/dma-buf.h>
#include <linux/dma-mapping.h>
#include <linux/err.h>
@@ -10,14 +11,65 @@
#include <drm/panthor_drm.h>
=20
#include "panthor_device.h"
+#include "panthor_fw.h"
#include "panthor_gem.h"
#include "panthor_mmu.h"
=20
+#ifdef CONFIG_DEBUG_FS
+static void panthor_gem_debugfs_bo_init(struct panthor_gem_object *bo, u32=
type_mask)
+{
+ INIT_LIST_HEAD(&bo->debugfs.node);
+
+ if (!(type_mask & PANTHOR_BO_FW_MAPPED)) {
+ bo->debugfs.creator.tgid =3D current->group_leader->pid;
+ get_task_comm(bo->debugfs.creator.process_name, current->group_leader);
+ } else {
+ bo->debugfs.creator.tgid =3D 0;
+ snprintf(bo->debugfs.creator.process_name,
+ sizeof(bo->debugfs.creator.process_name),
+ "kernel");
+ }
+
+ bo->debugfs.bo_mask =3D type_mask;
+}
+
+static void panthor_gem_debugfs_bo_add(struct panthor_gem_object *bo, u32 =
type_mask)
+{
+ struct panthor_device *ptdev =3D container_of(bo->base.base.dev,
+ struct panthor_device, base);
+
+ panthor_gem_debugfs_bo_init(bo, type_mask);
+
+ mutex_lock(&ptdev->gems.lock);
+ list_add_tail(&bo->debugfs.node, &ptdev->gems.node);
+ mutex_unlock(&ptdev->gems.lock);
+}
+
+static void panthor_gem_debugfs_bo_rm(struct panthor_gem_object *bo)
+{
+ struct panthor_device *ptdev =3D container_of(bo->base.base.dev,
+ struct panthor_device, base);
+
+ if (list_empty(&bo->debugfs.node))
+ return;
+
+ mutex_lock(&ptdev->gems.lock);
+ list_del_init(&bo->debugfs.node);
+ mutex_unlock(&ptdev->gems.lock);
+}
+
+#else
+static void panthor_gem_debugfs_bo_add(struct panthor_gem_object *bo, u32 =
type_mask) {}
+static void panthor_gem_debugfs_bo_rm(struct panthor_gem_object *bo) {}
+#endif
+
static void panthor_gem_free_object(struct drm_gem_object *obj)
{
struct panthor_gem_object *bo =3D to_panthor_bo(obj);
struct drm_gem_object *vm_root_gem =3D bo->exclusive_vm_root_gem;
=20
+ panthor_gem_debugfs_bo_rm(bo);
+
/*
* Label might have been allocated with kstrdup_const(),
* we need to take that into account when freeing the memory
@@ -86,6 +138,7 @@ panthor_kernel_bo_create(struct panthor_device *ptdev, s=
truct panthor_vm *vm,
struct drm_gem_shmem_object *obj;
struct panthor_kernel_bo *kbo;
struct panthor_gem_object *bo;
+ u32 type_mask =3D PANTHOR_BO_KERNEL;
int ret;
=20
if (drm_WARN_ON(&ptdev->base, !vm))
@@ -105,7 +158,12 @@ panthor_kernel_bo_create(struct panthor_device *ptdev,=
struct panthor_vm *vm,
kbo->obj =3D &obj->base;
bo->flags =3D bo_flags;
=20
+ if (vm =3D=3D panthor_fw_vm(ptdev))
+ type_mask |=3D PANTHOR_BO_FW_MAPPED;
+
panthor_gem_kernel_bo_set_label(kbo, name);
+ panthor_gem_debugfs_bo_add(to_panthor_bo(kbo->obj), type_mask);
+
/* The system and GPU MMU page size might differ, which becomes a
* problem for FW sections that need to be mapped at explicit address
* since our PAGE_SIZE alignment might cover a VA range that's
@@ -255,6 +313,8 @@ panthor_gem_create_with_handle(struct drm_file *file,
/* drop reference from allocate - handle holds it now. */
drm_gem_object_put(&shmem->base);
=20
+ panthor_gem_debugfs_bo_add(bo, 0);
+
return ret;
}
=20
@@ -286,3 +346,92 @@ panthor_gem_kernel_bo_set_label(struct panthor_kernel_=
bo *bo, const char *label)
=20
panthor_gem_bo_set_label(bo->obj, kstrdup_const(str, GFP_KERNEL));
}
+
+#ifdef CONFIG_DEBUG_FS
+static bool panfrost_gem_print_flag(const char *name,
+ bool is_set,
+ bool other_flags_printed,
+ struct seq_file *m)
+{
+ if (is_set)
+ seq_printf(m, "%s%s", other_flags_printed ? "," : "", name);
+
+ return is_set | other_flags_printed;
+}
+
+struct gem_size_totals {
+ size_t size;
+ size_t resident;
+ size_t reclaimable;
+};
+
+static void panthor_gem_debugfs_bo_print(struct panthor_gem_object *bo,
+ struct seq_file *m,
+ struct gem_size_totals *totals)
+{
+ unsigned int refcount =3D kref_read(&bo->base.base.refcount);
+ char creator_info[32] =3D {};
+ bool has_flags =3D false;
+ size_t resident_size;
+
+ /* Skip BOs being destroyed. */
+ if (!refcount)
+ return;
+
+ resident_size =3D bo->base.pages !=3D NULL ? bo->base.base.size : 0;
+
+ snprintf(creator_info, sizeof(creator_info),
+ "%s/%d", bo->debugfs.creator.process_name, bo->debugfs.creator.tgid);
+ seq_printf(m, "%-32s%-16d%-16d%-16zd%-16zd%-16lx",
+ creator_info,
+ bo->base.base.name,
+ refcount,
+ bo->base.base.size,
+ resident_size,
+ drm_vma_node_start(&bo->base.base.vma_node));
+
+ seq_puts(m, "(");
+ has_flags =3D panfrost_gem_print_flag("imported", bo->base.base.import_at=
tach !=3D NULL,
+ has_flags, m);
+ has_flags =3D panfrost_gem_print_flag("exported", bo->base.base.dma_buf !=
=3D NULL,
+ has_flags, m);
+ if (bo->base.madv < 0)
+ has_flags =3D panfrost_gem_print_flag("purged", true, has_flags, m);
+ else if (bo->base.madv > 0)
+ has_flags =3D panfrost_gem_print_flag("purgeable", true, has_flags, m);
+ if (!has_flags)
+ seq_puts(m, "none");
+ seq_puts(m, ")");
+
+ seq_printf(m, "%-6s0x%-2x", "", bo->debugfs.bo_mask);
+
+ mutex_lock(&bo->label.lock);
+ seq_printf(m, "%-6s%-60s", "", bo->label.str ? : NULL);
+ mutex_unlock(&bo->label.lock);
+ seq_puts(m, "\n");
+
+ totals->size +=3D bo->base.base.size;
+ totals->resident +=3D resident_size;
+ if (bo->base.madv > 0)
+ totals->reclaimable +=3D resident_size;
+}
+
+void panthor_gem_debugfs_print_bos(struct panthor_device *ptdev,
+ struct seq_file *m)
+{
+ struct gem_size_totals totals =3D {0};
+ struct panthor_gem_object *bo;
+
+ seq_puts(m, "created-by global-name refcount =
size resident-size file-offset flags kflags la=
bel\n");
+ seq_puts(m, "------------------------------------------------------------=
---------------------------------------------------------------------------=
---------\n");
+
+ scoped_guard(mutex, &ptdev->gems.lock) {
+ list_for_each_entry(bo, &ptdev->gems.node, debugfs.node)
+ panthor_gem_debugfs_bo_print(bo, m, &totals);
+ }
+
+ seq_puts(m, "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D\n");
+ seq_printf(m, "Total size: %zd, Total resident: %zd, Total reclaimable: %=
zd\n",
+ totals.size, totals.resident, totals.reclaimable);
+}
+#endif
diff --git a/drivers/gpu/drm/panthor/panthor_gem.h b/drivers/gpu/drm/pantho=
r/panthor_gem.h
index 49daa5088a0d..22ecc0d39d5e 100644
--- a/drivers/gpu/drm/panthor/panthor_gem.h
+++ b/drivers/gpu/drm/panthor/panthor_gem.h
@@ -15,6 +15,32 @@ struct panthor_vm;
=20
#define PANTHOR_BO_LABEL_MAXLEN PAGE_SIZE
=20
+#define PANTHOR_BO_KERNEL BIT(0)
+#define PANTHOR_BO_FW_MAPPED BIT(1)
+
+/**
+ * struct panthor_gem_debugfs - GEM object's DebugFS list information
+ */
+struct panthor_gem_debugfs {
+ /**
+ * @node: Node used to insert the object in the device-wide list of
+ * GEM objects, to display information about it through a DebugFS file.
+ */
+ struct list_head node;
+
+ /** @creator: Information about the UM process which created the GEM. */
+ struct {
+ /** @creator.process_name: Group leader name in owning thread's process =
*/
+ char process_name[TASK_COMM_LEN];
+
+ /** @creator.tgid: PID of the thread's group leader within its process */
+ pid_t tgid;
+ } creator;
+
+ /** @bo_mask: Bitmask encoding BO type as {USER, KERNEL} x {GPU, FW} */
+ u32 bo_mask;
+};
+
/**
* struct panthor_gem_object - Driver specific GEM object.
*/
@@ -62,6 +88,10 @@ struct panthor_gem_object {
/** @lock.str: Protects access to the @label.str field. */
struct mutex lock;
} label;
+
+#ifdef CONFIG_DEBUG_FS
+ struct panthor_gem_debugfs debugfs;
+#endif
};
=20
/**
@@ -157,4 +187,9 @@ panthor_kernel_bo_create(struct panthor_device *ptdev, =
struct panthor_vm *vm,
=20
void panthor_kernel_bo_destroy(struct panthor_kernel_bo *bo);
=20
+#ifdef CONFIG_DEBUG_FS
+void panthor_gem_debugfs_print_bos(struct panthor_device *pfdev,
+ struct seq_file *m);
+#endif
+
#endif /* __PANTHOR_GEM_H__ */
--=20
2.48.1