From nobody Sun Feb 8 06:55:55 2026 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 685BC190057 for ; Wed, 7 May 2025 16:07: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=1746634072; cv=pass; b=VxSnfZp/zTsADuCxpe1COhv8DG3ZWq4v+sCDgwTiw3gjAXdJpcoM993eQCFViQovFYpU15Hj/pFvnooeHhhDzoQ6SJBpM+QoHItQcAN07YuwHNWYc7eHR3D/YMxCZU2wUpI8TJCH9HbrXowSxnYTGk+CwDwEYJC0mhUqV6no8pQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746634072; c=relaxed/simple; bh=BBR6qy/LQrrEBZovPZUu0b9lEWIg7nRziZqRnhTU1Ok=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VYqBdTFqmqllprO3M9mIYOFdwnhY1hdTyPuE57mbcmlVHDlpQZQfe60nFPT7gKKqW6QJvxfdJ9NvwuQa42RmdPlK1/5iWA2DRPlFk26Tbpz/L1iIH6P/Hok+5yL97P2twd5CyAxd9Xqv8eZImT3SccI47l/yxBOAEHB3gSlBmnE= 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=NjcXwgyj; 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="NjcXwgyj" ARC-Seal: i=1; a=rsa-sha256; t=1746634051; cv=none; d=zohomail.com; s=zohoarc; b=Rzd9BFgNj9vhGBLtiiw34XLbpocHGUekDyINuAjN26RKZskCH3jUK6p6rMdW0F/++CtfVRHnEDJ3Upgd7NZ4s/S58kF40chqOKcKBdpFEnSYq+hpBXRgI7F3ifpRpvsVGdZwZXoarAea/ApoJE3o9E9VQRqNJWYWqGS/1pFW6D0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746634051; 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=5hGgHfm9gUWZAq9fadCtGnwyYhdZQyxGLtv/ziBgvs8=; b=hGu1PXr2TpAyw2lMx0Vhsf3N7jOiSrG4fY0c/X0NYl+TX2RVLuj5weCMHtwU7r62ymZRyMn4wsc5VF3lDx8TTw+LXWLBnn/3cHi4NSpVQ6Tcr/iQjWml8o4UWfq9NaCTb+RQRaM+Z3rizx+/ItEf3pfBLH4dMBMHViw4dgDHK0U= 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= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1746634051; 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=5hGgHfm9gUWZAq9fadCtGnwyYhdZQyxGLtv/ziBgvs8=; b=NjcXwgyjweAyjbp1F/EGnmv9yddo+CLW596n1VOQYfpTuesssQo/5WaRlYw/V3nI QEU7ZoJSlV3ZJ48zhZh8yAlmgr882CGJHFcJMG2Cc+3kzyTXEcMReK9F52nz3bi6OHD yxQsaQEfHWfC7HxXoclSFonrF0CwrpYIo6ObNv/8= Received: by mx.zohomail.com with SMTPS id 174663405055819.910230509735243; Wed, 7 May 2025 09:07:30 -0700 (PDT) From: =?UTF-8?q?Adri=C3=A1n=20Larumbe?= To: linux-kernel@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, Boris Brezillon , kernel@collabora.com, =?UTF-8?q?Adri=C3=A1n=20Larumbe?= , Steven Price , Rob Herring , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Subject: [PATCH v2 1/3] drm/panfrost: Add BO labelling to Panfrost Date: Wed, 7 May 2025 17:07:07 +0100 Message-ID: <20250507160713.1363985-2-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250507160713.1363985-1-adrian.larumbe@collabora.com> References: <20250507160713.1363985-1-adrian.larumbe@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Unlike in Panthor, from where this change is based on, there is no need to support tagging of BO's other than UM-exposed ones, so all strings can be freed with kfree(). This commit is done in preparation of a following one that will allow UM to set BO labels through a new ioctl(). Signed-off-by: Adri=C3=A1n Larumbe Reviewed-by: Steven Price --- drivers/gpu/drm/panfrost/panfrost_gem.c | 19 +++++++++++++++++++ drivers/gpu/drm/panfrost/panfrost_gem.h | 16 ++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/drivers/gpu/drm/panfrost/panfrost_gem.c b/drivers/gpu/drm/panf= rost/panfrost_gem.c index 963f04ba2de6..a7a29974d8b1 100644 --- a/drivers/gpu/drm/panfrost/panfrost_gem.c +++ b/drivers/gpu/drm/panfrost/panfrost_gem.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright 2019 Linaro, Ltd, Rob Herring */ =20 +#include #include #include #include @@ -35,6 +36,9 @@ static void panfrost_gem_free_object(struct drm_gem_objec= t *obj) */ WARN_ON_ONCE(!list_empty(&bo->mappings.list)); =20 + kfree(bo->label.str); + mutex_destroy(&bo->label.lock); + if (bo->sgts) { int i; int n_sgt =3D bo->base.base.size / SZ_2M; @@ -260,6 +264,7 @@ struct drm_gem_object *panfrost_gem_create_object(struc= t drm_device *dev, size_t mutex_init(&obj->mappings.lock); obj->base.base.funcs =3D &panfrost_gem_funcs; obj->base.map_wc =3D !pfdev->coherent; + mutex_init(&obj->label.lock); =20 return &obj->base.base; } @@ -302,3 +307,17 @@ panfrost_gem_prime_import_sg_table(struct drm_device *= dev, =20 return obj; } + +void +panfrost_gem_set_label(struct drm_gem_object *obj, const char *label) +{ + struct panfrost_gem_object *bo =3D to_panfrost_bo(obj); + const char *old_label; + + scoped_guard(mutex, &bo->label.lock) { + old_label =3D bo->label.str; + bo->label.str =3D label; + } + + kfree(old_label); +} diff --git a/drivers/gpu/drm/panfrost/panfrost_gem.h b/drivers/gpu/drm/panf= rost/panfrost_gem.h index 7516b7ecf7fe..c0be2934f229 100644 --- a/drivers/gpu/drm/panfrost/panfrost_gem.h +++ b/drivers/gpu/drm/panfrost/panfrost_gem.h @@ -41,6 +41,20 @@ struct panfrost_gem_object { */ size_t heap_rss_size; =20 + /** + * @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; + bool noexec :1; bool is_heap :1; }; @@ -89,4 +103,6 @@ void panfrost_gem_teardown_mappings_locked(struct panfro= st_gem_object *bo); int panfrost_gem_shrinker_init(struct drm_device *dev); void panfrost_gem_shrinker_cleanup(struct drm_device *dev); =20 +void panfrost_gem_set_label(struct drm_gem_object *obj, const char *label); + #endif /* __PANFROST_GEM_H__ */ base-commit: 9ff4fdf4f44b69237c0afc1d3a8dac916ce66f3e --=20 2.48.1 From nobody Sun Feb 8 06:55:55 2026 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 7E02428BA86 for ; Wed, 7 May 2025 16:07:54 +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=1746634076; cv=pass; b=gFX+dGgXoPke22TM2cYqtGJD7XbxrezJWU682tO++uHQrM0NGboHUw6d0Ri2sMr4RsnJ5allpQxgbPR/L62ieyPjJzH99qOzUlL55on47X0VQ24+OXlwhP5ZfbbmcBcgcFYuyYyUq1dhliACggNjwKoBl+hekP/sJ4yIJgNfzSM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746634076; c=relaxed/simple; bh=2x7PszW/pQSQ4IVbICbVCgMJnvDK7QCCD6WWDIpkYxQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=BDtRChNWltZbzI+ayPycAxSa532ea/SmSvKMcDPpTPjK8sLQpNyg7wZPEQc5IXpFHG/aiuA+0YGPL11Zeqa7JHXcKJVr5apMl8myGkeib2AxOuHHPe4f+2EuTTPUasM5Y+33xWYHO9Pi/nmNCBDx7NjDrTf8gpLwwSt07+zFgIc= 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=GcIi/UKC; 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="GcIi/UKC" ARC-Seal: i=1; a=rsa-sha256; t=1746634055; cv=none; d=zohomail.com; s=zohoarc; b=PRFLpazlBOuxPblIYep0081aO1KVMbUbK/qUcNtzYCSjNeeVgUYTTPsdyrSpTv2LQ+2wpN05E8C5zArj0nFkVkeaAp6MVyh+Vp4NfOE6ETKQ1iIjsBYyEjdBAHi0e8V4N+5/YcTVhAY835ry1EiKGO8N5ZDZ/TggeUjYNaIt7R8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746634055; 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=gXIODK/rhiPltLY7+54X4OiClVO8qEgxo0bJPPT1Js8=; b=QlHJLKECTKvkn1m4wqIEdKW28pH8ysb9BUach5vg3y9won04unco1mH2V7DPYtfLdrLAmBrUEhvbloq55F2ht1wAufgiQRJNpNGXsdEmCutkNBXBHBF/Jxnwupy3FV1BTzDkMSp2asfczDVHz5gs3A6+XtFob4nuKvr3Dl4GyPU= 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= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1746634055; 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=gXIODK/rhiPltLY7+54X4OiClVO8qEgxo0bJPPT1Js8=; b=GcIi/UKCwLV70yx2I//4rwb+haaT1H4Juka6j8Mf7iUBXhFnm1w2BW63545U2TUv 8QFYyBXUtemU60ARRgkHO8YfmuZRJw5oh4WuNnaM5/scYdF3PxIqzijknbCs/KWr2P8 hgvXJEiWT3+MNkN6TXBkg+anC5TKepS7c4NnEw18= Received: by mx.zohomail.com with SMTPS id 1746634054041168.22768811150888; Wed, 7 May 2025 09:07:34 -0700 (PDT) From: =?UTF-8?q?Adri=C3=A1n=20Larumbe?= To: linux-kernel@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, Boris Brezillon , kernel@collabora.com, =?UTF-8?q?Adri=C3=A1n=20Larumbe?= , Steven Price , Rob Herring , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Subject: [PATCH v2 2/3] drm/panfrost: Add driver IOCTL for setting BO labels Date: Wed, 7 May 2025 17:07:08 +0100 Message-ID: <20250507160713.1363985-3-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250507160713.1363985-1-adrian.larumbe@collabora.com> References: <20250507160713.1363985-1-adrian.larumbe@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 Reviewed-by: Steven Price Reviewed-by: Boris Brezillon --- drivers/gpu/drm/panfrost/panfrost_drv.c | 44 ++++++++++++++++++++++++- drivers/gpu/drm/panfrost/panfrost_gem.h | 2 ++ include/uapi/drm/panfrost_drm.h | 21 ++++++++++++ 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panf= rost/panfrost_drv.c index f1ec3b02f15a..179fbaa1cd0c 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -495,6 +495,46 @@ static int panfrost_ioctl_madvise(struct drm_device *d= ev, void *data, return ret; } =20 +static int panfrost_ioctl_set_label_bo(struct drm_device *ddev, void *data, + struct drm_file *file) +{ + struct drm_panfrost_set_label_bo *args =3D data; + struct drm_gem_object *obj; + const char *label =3D NULL; + int ret =3D 0; + + if (args->pad) + return -EINVAL; + + obj =3D drm_gem_object_lookup(file, args->handle); + if (!obj) + return -ENOENT; + + if (args->label) { + label =3D strndup_user(u64_to_user_ptr(args->label), + PANFROST_BO_LABEL_MAXLEN); + if (IS_ERR(label)) { + ret =3D PTR_ERR(label); + if (ret =3D=3D -EINVAL) + ret =3D -E2BIG; + goto err_put_obj; + } + } + + /* + * We treat passing a label of length 0 and passing a NULL label + * differently, because even though they might seem conceptually + * similar, future uses of the BO label might expect a different + * behaviour in each case. + */ + panfrost_gem_set_label(obj, label); + +err_put_obj: + drm_gem_object_put(obj); + + return ret; +} + int panfrost_unstable_ioctl_check(void) { if (!unstable_ioctls) @@ -561,6 +601,7 @@ static const struct drm_ioctl_desc panfrost_drm_driver_= ioctls[] =3D { PANFROST_IOCTL(PERFCNT_ENABLE, perfcnt_enable, DRM_RENDER_ALLOW), PANFROST_IOCTL(PERFCNT_DUMP, perfcnt_dump, DRM_RENDER_ALLOW), PANFROST_IOCTL(MADVISE, madvise, DRM_RENDER_ALLOW), + PANFROST_IOCTL(SET_LABEL_BO, set_label_bo, DRM_RENDER_ALLOW), }; =20 static void panfrost_gpu_show_fdinfo(struct panfrost_device *pfdev, @@ -625,6 +666,7 @@ static const struct file_operations panfrost_drm_driver= _fops =3D { * - 1.2 - adds AFBC_FEATURES query * - 1.3 - adds JD_REQ_CYCLE_COUNT job requirement for SUBMIT * - adds SYSTEM_TIMESTAMP and SYSTEM_TIMESTAMP_FREQUENCY queries + * - 1.4 - adds SET_LABEL_BO */ static const struct drm_driver panfrost_drm_driver =3D { .driver_features =3D DRIVER_RENDER | DRIVER_GEM | DRIVER_SYNCOBJ, @@ -637,7 +679,7 @@ static const struct drm_driver panfrost_drm_driver =3D { .name =3D "panfrost", .desc =3D "panfrost DRM", .major =3D 1, - .minor =3D 3, + .minor =3D 4, =20 .gem_create_object =3D panfrost_gem_create_object, .gem_prime_import_sg_table =3D panfrost_gem_prime_import_sg_table, diff --git a/drivers/gpu/drm/panfrost/panfrost_gem.h b/drivers/gpu/drm/panf= rost/panfrost_gem.h index c0be2934f229..842e025b9bdc 100644 --- a/drivers/gpu/drm/panfrost/panfrost_gem.h +++ b/drivers/gpu/drm/panfrost/panfrost_gem.h @@ -9,6 +9,8 @@ =20 struct panfrost_mmu; =20 +#define PANFROST_BO_LABEL_MAXLEN 4096 + struct panfrost_gem_object { struct drm_gem_shmem_object base; struct sg_table *sgts; diff --git a/include/uapi/drm/panfrost_drm.h b/include/uapi/drm/panfrost_dr= m.h index 568724be6628..ed67510395bd 100644 --- a/include/uapi/drm/panfrost_drm.h +++ b/include/uapi/drm/panfrost_drm.h @@ -21,6 +21,7 @@ extern "C" { #define DRM_PANFROST_PERFCNT_ENABLE 0x06 #define DRM_PANFROST_PERFCNT_DUMP 0x07 #define DRM_PANFROST_MADVISE 0x08 +#define DRM_PANFROST_SET_LABEL_BO 0x09 =20 #define DRM_IOCTL_PANFROST_SUBMIT DRM_IOW(DRM_COMMAND_BASE + DRM_PANFROST= _SUBMIT, struct drm_panfrost_submit) #define DRM_IOCTL_PANFROST_WAIT_BO DRM_IOW(DRM_COMMAND_BASE + DRM_PANFROS= T_WAIT_BO, struct drm_panfrost_wait_bo) @@ -29,6 +30,7 @@ extern "C" { #define DRM_IOCTL_PANFROST_GET_PARAM DRM_IOWR(DRM_COMMAND_BASE + DRM_PANF= ROST_GET_PARAM, struct drm_panfrost_get_param) #define DRM_IOCTL_PANFROST_GET_BO_OFFSET DRM_IOWR(DRM_COMMAND_BASE + DRM_P= ANFROST_GET_BO_OFFSET, struct drm_panfrost_get_bo_offset) #define DRM_IOCTL_PANFROST_MADVISE DRM_IOWR(DRM_COMMAND_BASE + DRM_PANFRO= ST_MADVISE, struct drm_panfrost_madvise) +#define DRM_IOCTL_PANFROST_SET_LABEL_BO DRM_IOWR(DRM_COMMAND_BASE + DRM_P= ANFROST_SET_LABEL_BO, struct drm_panfrost_set_label_bo) =20 /* * Unstable ioctl(s): only exposed when the unsafe unstable_ioctls module @@ -227,6 +229,25 @@ struct drm_panfrost_madvise { __u32 retained; /* out, whether backing store still exists */ }; =20 +/** + * struct drm_panfrost_set_label_bo - ioctl argument for labelling Panfros= t BOs. + */ +struct drm_panfrost_set_label_bo { + /** @handle: Handle of the buffer object to label. */ + __u32 handle; + + /** @pad: MBZ. */ + __u32 pad; + + /** + * @label: User pointer to a NUL-terminated string + * + * Length cannot be greater than 4096. + * NULL is permitted and means clear the label. + */ + __u64 label; +}; + /* Definitions for coredump decoding in user space */ #define PANFROSTDUMP_MAJOR 1 #define PANFROSTDUMP_MINOR 0 --=20 2.48.1 From nobody Sun Feb 8 06:55:55 2026 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 E4E7B28BA8E; Wed, 7 May 2025 16:08:04 +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=1746634087; cv=pass; b=kPmn2iac7bAtzK0FxjkHG1Yifx0paGAqi670j5iq/WWLMWYf4M7RQn/80kXinlzncLDBFpufQBSBCrC0cN1m0T86Csa4WDOJNADFZjawyviWkreFbjlb6S8IJb7LI9XV4GS3tWWFD8F8LUvuhf71VepjFa6YO+V3wC88Vug6RV8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746634087; c=relaxed/simple; bh=F0jKJCSNF4RxHwFSqj/nZSGyIzkQimSicDXJ/B+T4ec=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=XDhT1eXrMkUhMK8RxSIKIXMnQW0CjU6o1SW602btZgkcF9szeXhtuyerDzWxPzfu2ukVZybLz2gers+TeRIXTjDMF4PTkhESVdVDdZbfvQtrXgP45UAFlJ0YHbzLK/W2Ig0aBjoxUxAGdI43JCWeMb8Cq/9+SoQPkilL40Bn2W4= 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=JqropFY3; 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="JqropFY3" ARC-Seal: i=1; a=rsa-sha256; t=1746634059; cv=none; d=zohomail.com; s=zohoarc; b=dg9d+9mZMHyo3t46xtmx2GEF81B9B5tFeuZWL1n6A4K2BmOv7riG+B7iOaETVnviZVJkMSkdBVHtUBChQp6m3jmkrsfoi5Kv8wGAOjVm7ntavqQyFDEIdKl6LQy9yrX3PhnsHlgEKnbr/MVId6LKTib8ldfQ3SPNipuaj4lYqPs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746634059; 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=BlzBK7znsr2G2iong/lvWEeFsEhttuskV0y2RifoxB8=; b=mjk/5itk8YBZ3mi+zSFaEOsYjCqktttodYfPXX8pLWsW5bJmnwjz2iEc8E0qfReoKKVhBATjKAEmFn3pg96X+za7/u0zC3jWoyhDfwgw9KubHHfwnzJfzUQDfYbJdYVoNjtbdtRAv63ITCX2OPoWFKCocPqAlD3/xwPQUxp/bj4= 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= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1746634059; 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=BlzBK7znsr2G2iong/lvWEeFsEhttuskV0y2RifoxB8=; b=JqropFY3lfw9tHcRuRQZgKlpjBveS6I9Mzw2BubvesUJ9v4X76HVyfWDtkHgo8js 441GmetFwcMDOsnZxL8tggP7r0kNV4n8qdiQ96uFNyVI01731KdU/H5UVRvx9NwHFyD fuT78RosTJYBdAE4CLBfN2Antjm3Vue0/zuYjfFA= Received: by mx.zohomail.com with SMTPS id 1746634058547887.5680781453062; Wed, 7 May 2025 09:07:38 -0700 (PDT) From: =?UTF-8?q?Adri=C3=A1n=20Larumbe?= To: linux-kernel@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, Boris Brezillon , kernel@collabora.com, =?UTF-8?q?Adri=C3=A1n=20Larumbe?= , Rob Herring , Steven Price , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH v2 3/3] drm/panfrost: show device-wide list of DRM GEM objects over DebugFS Date: Wed, 7 May 2025 17:07:09 +0100 Message-ID: <20250507160713.1363985-4-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250507160713.1363985-1-adrian.larumbe@collabora.com> References: <20250507160713.1363985-1-adrian.larumbe@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This change is essentially a Panfrost port of commit a3707f53eb3f ("drm/panthor: show device-wide list of DRM GEM objects over DebugFS"). The DebugFS file is almost the same as in Panthor, minus the GEM object usage flags, since Panfrost has no kernel-only BO's. Two additional GEM state flags which are displayed but aren't relevant to Panthor are 'Purged' and 'Purgeable', since Panfrost implements an explicit shrinker and a madvise ioctl to flag objects as reclaimable. Signed-off-by: Adri=C3=A1n Larumbe --- drivers/gpu/drm/panfrost/panfrost_device.c | 5 + drivers/gpu/drm/panfrost/panfrost_device.h | 15 +++ drivers/gpu/drm/panfrost/panfrost_drv.c | 35 ++++++ drivers/gpu/drm/panfrost/panfrost_gem.c | 135 +++++++++++++++++++++ drivers/gpu/drm/panfrost/panfrost_gem.h | 47 +++++++ 5 files changed, 237 insertions(+) diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/p= anfrost/panfrost_device.c index 5d35076b2e6d..04bec27449cb 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.c +++ b/drivers/gpu/drm/panfrost/panfrost_device.c @@ -209,6 +209,11 @@ int panfrost_device_init(struct panfrost_device *pfdev) =20 spin_lock_init(&pfdev->cycle_counter.lock); =20 +#ifdef CONFIG_DEBUG_FS + mutex_init(&pfdev->debugfs.gems_lock); + INIT_LIST_HEAD(&pfdev->debugfs.gems_list); +#endif + err =3D panfrost_pm_domain_init(pfdev); if (err) return err; diff --git a/drivers/gpu/drm/panfrost/panfrost_device.h b/drivers/gpu/drm/p= anfrost/panfrost_device.h index dcff70f905cd..077525a3ad68 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.h +++ b/drivers/gpu/drm/panfrost/panfrost_device.h @@ -111,6 +111,17 @@ struct panfrost_compatible { u8 gpu_quirks; }; =20 +/** + * struct panfrost_device_debugfs - Device-wide DebugFS tracking structures + */ +struct panfrost_device_debugfs { + /** @gems_list: Device-wide list of GEM objects owned by at least one fil= e. */ + struct list_head gems_list; + + /** @gems_lock: Serializes access to the device-wide list of GEM objects.= */ + struct mutex gems_lock; +}; + struct panfrost_device { struct device *dev; struct drm_device *ddev; @@ -164,6 +175,10 @@ struct panfrost_device { atomic_t use_count; spinlock_t lock; } cycle_counter; + +#ifdef CONFIG_DEBUG_FS + struct panfrost_device_debugfs debugfs; +#endif }; =20 struct panfrost_mmu { diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panf= rost/panfrost_drv.c index 179fbaa1cd0c..f576cb215898 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -659,6 +660,37 @@ static const struct file_operations panfrost_drm_drive= r_fops =3D { .show_fdinfo =3D drm_show_fdinfo, }; =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 panfrost_device *pfdev =3D dev->dev_private; + + panfrost_gem_debugfs_print_bos(pfdev, 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 panfrost_debugfs_init(struct drm_minor *minor) +{ + panthor_gems_debugfs_init(minor); +} +#endif + /* * Panfrost driver version: * - 1.0 - initial interface @@ -683,6 +715,9 @@ static const struct drm_driver panfrost_drm_driver =3D { =20 .gem_create_object =3D panfrost_gem_create_object, .gem_prime_import_sg_table =3D panfrost_gem_prime_import_sg_table, +#ifdef CONFIG_DEBUG_FS + .debugfs_init =3D panfrost_debugfs_init, +#endif }; =20 static int panfrost_probe(struct platform_device *pdev) diff --git a/drivers/gpu/drm/panfrost/panfrost_gem.c b/drivers/gpu/drm/panf= rost/panfrost_gem.c index a7a29974d8b1..fe2cdbe8baf0 100644 --- a/drivers/gpu/drm/panfrost/panfrost_gem.c +++ b/drivers/gpu/drm/panfrost/panfrost_gem.c @@ -12,6 +12,36 @@ #include "panfrost_gem.h" #include "panfrost_mmu.h" =20 +#ifdef CONFIG_DEBUG_FS +static void panfrost_gem_debugfs_bo_add(struct panfrost_device *ptdev, + struct panfrost_gem_object *bo) +{ + bo->debugfs.creator.tgid =3D current->group_leader->pid; + get_task_comm(bo->debugfs.creator.process_name, current->group_leader); + + mutex_lock(&ptdev->debugfs.gems_lock); + list_add_tail(&bo->debugfs.node, &ptdev->debugfs.gems_list); + mutex_unlock(&ptdev->debugfs.gems_lock); +} + +static void panfrost_gem_debugfs_bo_rm(struct panfrost_gem_object *bo) +{ + struct panfrost_device *ptdev =3D bo->base.base.dev->dev_private; + + if (list_empty(&bo->debugfs.node)) + return; + + mutex_lock(&ptdev->debugfs.gems_lock); + list_del_init(&bo->debugfs.node); + mutex_unlock(&ptdev->debugfs.gems_lock); +} +#else +static void panfrost_gem_debugfs_bo_add(struct panfrost_device *ptdev, + struct panfrost_gem_object *bo) +{} +static void panfrost_gem_debugfs_bo_rm(struct panfrost_gem_object *bo) {} +#endif + /* Called DRM core on the last userspace/kernel unreference of the * BO. */ @@ -36,6 +66,7 @@ static void panfrost_gem_free_object(struct drm_gem_objec= t *obj) */ WARN_ON_ONCE(!list_empty(&bo->mappings.list)); =20 + panfrost_gem_debugfs_bo_rm(bo); kfree(bo->label.str); mutex_destroy(&bo->label.lock); =20 @@ -272,6 +303,7 @@ struct drm_gem_object *panfrost_gem_create_object(struc= t drm_device *dev, size_t struct panfrost_gem_object * panfrost_gem_create(struct drm_device *dev, size_t size, u32 flags) { + struct panfrost_device *pfdev =3D dev->dev_private; struct drm_gem_shmem_object *shmem; struct panfrost_gem_object *bo; =20 @@ -287,6 +319,8 @@ panfrost_gem_create(struct drm_device *dev, size_t size= , u32 flags) bo->noexec =3D !!(flags & PANFROST_BO_NOEXEC); bo->is_heap =3D !!(flags & PANFROST_BO_HEAP); =20 + panfrost_gem_debugfs_bo_add(pfdev, bo); + return bo; } =20 @@ -321,3 +355,104 @@ panfrost_gem_set_label(struct drm_gem_object *obj, co= nst char *label) =20 kfree(old_label); } + +#ifdef CONFIG_DEBUG_FS +struct gem_size_totals { + size_t size; + size_t resident; + size_t reclaimable; +}; + +struct flag_def { + u32 flag; + const char *name; +}; + +static void panfrost_gem_debugfs_print_flag_names(struct seq_file *m) +{ + int len; + int i; + + static const struct flag_def gem_state_flags_names[] =3D { + {PANFROST_DEBUGFS_GEM_STATE_FLAG_IMPORTED, "imported"}, + {PANFROST_DEBUGFS_GEM_STATE_FLAG_EXPORTED, "exported"}, + {PANFROST_DEBUGFS_GEM_STATE_FLAG_PURGED, "purged"}, + {PANFROST_DEBUGFS_GEM_STATE_FLAG_PURGEABLE, "purgeable"}, + }; + + seq_puts(m, "GEM state flags: "); + for (i =3D 0, len =3D ARRAY_SIZE(gem_state_flags_names); i < len; i++) { + seq_printf(m, "%s (0x%x)%s", gem_state_flags_names[i].name, + gem_state_flags_names[i].flag, (i < len - 1) ? ", " : "\n\n"); + } +} + +static void panfrost_gem_debugfs_bo_print(struct panfrost_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 {}; + size_t resident_size; + u32 gem_state_flags =3D 0; + + /* Skip BOs being destroyed. */ + if (!refcount) + return; + + resident_size =3D bo->base.pages ? 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%-16zd0x%-16lx", + creator_info, + bo->base.base.name, + refcount, + bo->base.base.size, + resident_size, + drm_vma_node_start(&bo->base.base.vma_node)); + + if (bo->base.base.import_attach) + gem_state_flags |=3D PANFROST_DEBUGFS_GEM_STATE_FLAG_IMPORTED; + if (bo->base.base.dma_buf) + gem_state_flags |=3D PANFROST_DEBUGFS_GEM_STATE_FLAG_EXPORTED; + + if (bo->base.madv < 0) + gem_state_flags |=3D PANFROST_DEBUGFS_GEM_STATE_FLAG_PURGED; + else if (bo->base.madv > 0) + gem_state_flags |=3D PANFROST_DEBUGFS_GEM_STATE_FLAG_PURGEABLE; + + seq_printf(m, "0x%-10x", gem_state_flags); + + scoped_guard(mutex, &bo->label.lock) { + seq_printf(m, "%s\n", bo->label.str ? : ""); + } + + totals->size +=3D bo->base.base.size; + totals->resident +=3D resident_size; + if (bo->base.madv > 0) + totals->reclaimable +=3D resident_size; +} + +void panfrost_gem_debugfs_print_bos(struct panfrost_device *ptdev, + struct seq_file *m) +{ + struct gem_size_totals totals =3D {0}; + struct panfrost_gem_object *bo; + + panfrost_gem_debugfs_print_flag_names(m); + + seq_puts(m, "created-by global-name refcount = size resident-size file-offset state label\n"); + seq_puts(m, "------------------------------------------------------------= -----------------------------------------------------------------------\n"); + + scoped_guard(mutex, &ptdev->debugfs.gems_lock) { + list_for_each_entry(bo, &ptdev->debugfs.gems_list, debugfs.node) { + panfrost_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\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/panfrost/panfrost_gem.h b/drivers/gpu/drm/panf= rost/panfrost_gem.h index 842e025b9bdc..ce8ca7be2d66 100644 --- a/drivers/gpu/drm/panfrost/panfrost_gem.h +++ b/drivers/gpu/drm/panfrost/panfrost_gem.h @@ -8,9 +8,47 @@ #include =20 struct panfrost_mmu; +struct panfrost_device; =20 #define PANFROST_BO_LABEL_MAXLEN 4096 =20 +enum panfrost_debugfs_gem_state_flags { + /** @PANFROST_DEBUGFS_GEM_STATE_FLAG_IMPORTED: GEM BO is PRIME imported. = */ + PANFROST_DEBUGFS_GEM_STATE_FLAG_IMPORTED =3D BIT(0), + + /** @PANFROST_DEBUGFS_GEM_STATE_FLAG_EXPORTED: GEM BO is PRIME exported. = */ + PANFROST_DEBUGFS_GEM_STATE_FLAG_EXPORTED =3D BIT(1), + + /** @PANFROST_DEBUGFS_GEM_STATE_FLAG_PURGED: GEM BO was reclaimed by the = shrinker. */ + PANFROST_DEBUGFS_GEM_STATE_FLAG_PURGED =3D BIT(2), + + /** + * @PANFROST_DEBUGFS_GEM_STATE_FLAG_PURGEABLE: GEM BO pages were marked a= s no longer + * needed by UM and can be reclaimed by the shrinker. + */ + PANFROST_DEBUGFS_GEM_STATE_FLAG_PURGEABLE =3D BIT(3), +}; + +/** + * struct panfrost_gem_debugfs - GEM object's DebugFS list information + */ +struct panfrost_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; +}; + struct panfrost_gem_object { struct drm_gem_shmem_object base; struct sg_table *sgts; @@ -59,6 +97,10 @@ struct panfrost_gem_object { =20 bool noexec :1; bool is_heap :1; + +#ifdef CONFIG_DEBUG_FS + struct panfrost_gem_debugfs debugfs; +#endif }; =20 struct panfrost_gem_mapping { @@ -107,4 +149,9 @@ void panfrost_gem_shrinker_cleanup(struct drm_device *d= ev); =20 void panfrost_gem_set_label(struct drm_gem_object *obj, const char *label); =20 +#ifdef CONFIG_DEBUG_FS +void panfrost_gem_debugfs_print_bos(struct panfrost_device *pfdev, + struct seq_file *m); +#endif + #endif /* __PANFROST_GEM_H__ */ --=20 2.48.1