From nobody Sun Feb 8 08:49:03 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 3B6DD84FAD for ; Thu, 24 Apr 2025 02:22:12 +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=1745461334; cv=pass; b=aceAiHX+loOp4aF1DM60ngfs6aaoWw9V1wuMTn32FKrWwRqbiIVIe9v4fkddjkgOdNfYzVk752QUo5NF/hfXcLg/2H+9EpUjLlaZI1MUwOCRWhmFDsm+TcA+EgyEN4n38aa3hE//yq/3m2REuVmugWIPqfY5VG3pP6wK4YpOZNs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745461334; c=relaxed/simple; bh=NruXWNPuyGUPjhXkaPelHY7hF3ehpVSQIfAjRjmVlgE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=PDphXxmjGLZILtVWItZt7ZDUbEI/jmYT/KS57OmsI9vr+2FFcGONRwKP7NL/sP+lPMA9LKs0oYUXq18QY1gL2LOTu+kFQKez8cGFwnn8uXDd5m46ofoJ2ReVPobDBfbZCWqo61GWR+rK3EXLlHKi9IP93wflJU0i5iMaSj44hJg= 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=Q9gXzDlZ; 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="Q9gXzDlZ" ARC-Seal: i=1; a=rsa-sha256; t=1745461315; cv=none; d=zohomail.com; s=zohoarc; b=LOAGuQ3z24pLe/roGTdfJWBgqf42GXUqz7VsaThx3NwDRA9IxzjAgcVQhe5p3fFekXTeojlR3ukrYk0kjV+dOlV+DiS3kayWR8xFdH13U4oJCNwP/4BogZLu32oFIAGMV8n64QQO7zKQVjVwj5LnDBmVEH6KqtJAmfre0V9sO0E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745461315; 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=g9IobpGuuvB/dgl6xQ8rhNJU5JH9HoZYQPiz/QDc+LA=; b=cdagPpIXGw5qVXOXDTAiCpbpDaYr0knSRqmO5yH4PGKq2Ac26gpImW5C7c2ybjIwIOyC8hwUo6yh8dANFOWTM7JThT438NMfyC1ES1bw6vwRnm31HrjxQB/QzJkyNKREb1badcmKMcPqSsYUY86V68o6hbg/mGq0MYN+UZu9LBU= 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=1745461314; 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=g9IobpGuuvB/dgl6xQ8rhNJU5JH9HoZYQPiz/QDc+LA=; b=Q9gXzDlZhwTttdwjnMzadNb0PTAgPn9IP7SM8Du/4ZXe89g7L9+bj3hQM6TBcLhr vAoYheYLIDptm/bZaLkzqC/i0WFz3XZZpEpwmx7qgqFW82RlDZhuXJUNRhbaDa62r2/ KNemk3nraNjAAOWkd0Xjc7PLlnHhu35HvZV1uh+A= Received: by mx.zohomail.com with SMTPS id 17454613129331021.9890690851771; Wed, 23 Apr 2025 19:21:52 -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 Subject: [PATCH 1/3] drm/panfrost: Add BO labelling to Panfrost Date: Thu, 24 Apr 2025 03:21:30 +0100 Message-ID: <20250424022138.709303-2-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250424022138.709303-1-adrian.larumbe@collabora.com> References: <20250424022138.709303-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__ */ --=20 2.48.1 From nobody Sun Feb 8 08:49:03 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 005DD1CAB3 for ; Thu, 24 Apr 2025 02:22:13 +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=1745461335; cv=pass; b=osPyo4D6VKTi0MX0bzrzFz/p+onamIBL69//5keo4LnjopaKpQQYU0ZAP9SDquIoU611Iq8wkJudtJOZq9LHkfsiAfR9PeCr/tgquF2Aucd9acbuCXVUeCiI5r2ed1BLOQDt/czGxHIYpP4ysSodGpTdl013NqxO0KcTv3WBP6A= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745461335; c=relaxed/simple; bh=nXVPn3G/SZn6+C6nZ1e4QxQSW9TRpnDu1IbAYuhXDUk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=if6M/P3NVkk3kuEXWy5Us2eas7uVmF3DfWlU2+bBi/sALZv59mFPc6RHMDMfQDz6jQUqHUQfPS4jyO9sM6zClapI/EX1iwxCzvDVy37ReL5GqKwE9IQwRpE1o5AmXIXNKp3YMrS3TEnsutbwlhEiIkyWidbS/QaDZsi+Z8aad3s= 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=Np44YfqV; 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="Np44YfqV" ARC-Seal: i=1; a=rsa-sha256; t=1745461317; cv=none; d=zohomail.com; s=zohoarc; b=D9YKukOO06LFocYHXR+XuoED+pM5nxjnde5dAW1x+W/2EGGWxuFU96cED6QSZHhLQyQ0ALpZNb2bhgmRtGJUgf2hiP4wmTN8+AQNjDjB9nVsWg43+/Duzsk3wxTx0CHuJC1KRxuf3Dw/NkRs6uXrx4uPwFvmx5csYUnhIyC0OMA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745461317; 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=oPo5HC4f0VmWgzIL2d3M39qcNqxCcrq8Pb1HyzIZFG0=; b=bHFxYVdikCNdW8RJ7ViCasb4Y1xxAJ56PU09b3aZEcRJLFy6pc2ZuPMHcirh8pFumJYPOO1X8HLxw/hshVb0vabWsHRd5GZjEgq+jj5BqObI01W+/4jX3AL2kDOSS6iVeCh3AMHLYHdOunK/zceYyKeLk0s/5RqhHvsf7KT7alA= 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=1745461317; 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=oPo5HC4f0VmWgzIL2d3M39qcNqxCcrq8Pb1HyzIZFG0=; b=Np44YfqVU0o6SJ5VDdd2tNIMSq4H63jqYQWMfdxAzbW78AR2X74+3/WWjImSodmw 7cWL3QiV2QsPkDDVL5pQwXp22ah4eMSgzLKrmALWz05gtb0/rBxTseidJVvIA3L1ds8 KI/bt9dmgszeaUEOXXgo8Bf0ZjWvt/KPzpo0MZ9k= Received: by mx.zohomail.com with SMTPS id 1745461316314157.08780131295953; Wed, 23 Apr 2025 19:21:56 -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 Subject: [PATCH 2/3] drm/panfrost: Add driver IOCTL for setting BO labels Date: Thu, 24 Apr 2025 03:21:31 +0100 Message-ID: <20250424022138.709303-3-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250424022138.709303-1-adrian.larumbe@collabora.com> References: <20250424022138.709303-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: Boris Brezillon Reviewed-by: Steven Price --- drivers/gpu/drm/panfrost/panfrost_drv.c | 44 ++++++++++++++++++++++++- drivers/gpu/drm/panfrost/panfrost_gem.h | 2 ++ include/uapi/drm/panfrost_drm.h | 20 +++++++++++ 3 files changed, 65 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panf= rost/panfrost_drv.c index b87f83e94eda..b0ab76d67e96 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((const char __user *)(uintptr_t)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..b0445c5e514d 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,24 @@ 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 + */ + __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 08:49:03 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 7E45E17A2FF; Thu, 24 Apr 2025 02:22:24 +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=1745461346; cv=pass; b=JaWIzLdDcUfHQAuVKB2k3vAIHkBHZaIK7bWVlEIjVphW86Uiy6tfmhNsa06LC9aP/IB6XRBucF7vtqs+mAvjY7b/Se2SiIFl9DaS++C2PHHDqf3kxRrzz31bGiRzRblN/Npf0ovsH+djneKtlRh3DELcc0pHr/8fiRWGJFWBrfI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745461346; c=relaxed/simple; bh=VDcA+A2edSs3KTLZurQcKphMM0xzOlIsR1s3yQHWimY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=H7or7ofdfJIC8xd8udzuaGFP9CPRC1FBIM2MkAbZz4i0d00925xLlfgjCjbIZSBijN6yyA+yV76mSmWAl7+kuxgYrlOAdsuO4u8CZFCR/lbCMeudpoTBBrTa0opWUzSSm50hnpK3592pmJtPGS5PeeMON+2JojH/r5lKi0lIO/8= 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=Wm2R2PUm; 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="Wm2R2PUm" ARC-Seal: i=1; a=rsa-sha256; t=1745461321; cv=none; d=zohomail.com; s=zohoarc; b=EbsNCH3cKFxrSfecvmPM+wQp8kiq1RmwELXqLYKdWcanhB5sGaWb8elSCWck7DeIhHWtAL0cd2QaAafQOkyccsjRX6nyof4CwXDfAxYtbsrBWp1JCm9y2mu5BGnGyGkyjYLo9No+MgXHY3W8TuVDxhlbxen82XqfVHxS1yAAzG8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745461321; 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=4610HNpAr8lhhyh/YAuy/GQk/fTN2NlOR5POOrLX4So=; b=Tx2rsTSwr1tioYls2Xg1UpHU6gfQgMX2Y4C/oBoXJNEEDP/eHy1EdOw6XrBb8kiJcqybIIG8X8/377cuROP5GFcAEatIA+NGEZsFVLzQNUFA3yYl9jIZIuk1ZW2QoXCs28m4/2KkuJn+nkshgwdB26THWyIRK+k8U6S7CBDUjXk= 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=1745461321; 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=4610HNpAr8lhhyh/YAuy/GQk/fTN2NlOR5POOrLX4So=; b=Wm2R2PUm1TIF5aZxs/4yPB1DADgaVyfvt8jW2Ur8QfA0Ytlhhv+wMPGTrxzVFqty b5bZrUUpm/He54oF14s0cIa4gbD+WTU9TcUBBR7VK5wkTUnLvPU6u2OO2XDaHrLPJsK fs2KlIJoFihxfxeJZfCl79vHIb+kA3HbwU8eZ6Go= Received: by mx.zohomail.com with SMTPS id 1745461320158285.2215441334389; Wed, 23 Apr 2025 19:22:00 -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 3/3] drm/panfrost: show device-wide list of DRM GEM objects over DebugFS Date: Thu, 24 Apr 2025 03:21:32 +0100 Message-ID: <20250424022138.709303-4-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250424022138.709303-1-adrian.larumbe@collabora.com> References: <20250424022138.709303-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 | 4 + drivers/gpu/drm/panfrost/panfrost_device.h | 11 ++ drivers/gpu/drm/panfrost/panfrost_drv.c | 37 ++++++ drivers/gpu/drm/panfrost/panfrost_gem.c | 137 +++++++++++++++++++++ drivers/gpu/drm/panfrost/panfrost_gem.h | 58 +++++++++ 5 files changed, 247 insertions(+) diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/p= anfrost/panfrost_device.c index a45e4addcc19..7ba140aaf59d 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.c +++ b/drivers/gpu/drm/panfrost/panfrost_device.c @@ -209,6 +209,10 @@ int panfrost_device_init(struct panfrost_device *pfdev) =20 spin_lock_init(&pfdev->cycle_counter.lock); =20 +#ifdef CONFIG_DEBUG_FS + mutex_init(&pfdev->gems.lock); + INIT_LIST_HEAD(&pfdev->gems.node); +#endif err =3D panfrost_clk_init(pfdev); if (err) { dev_err(pfdev->dev, "clk init failed %d\n", err); diff --git a/drivers/gpu/drm/panfrost/panfrost_device.h b/drivers/gpu/drm/p= anfrost/panfrost_device.h index ad95f2ed31d9..395272a79306 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.h +++ b/drivers/gpu/drm/panfrost/panfrost_device.h @@ -161,6 +161,17 @@ struct panfrost_device { atomic_t use_count; spinlock_t lock; } cycle_counter; + + #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 panfrost_mmu { diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panf= rost/panfrost_drv.c index b0ab76d67e96..12dd9f311984 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 @@ -153,6 +154,8 @@ static int panfrost_ioctl_create_bo(struct drm_device *= dev, void *data, ret =3D -EINVAL; } =20 + panfrost_gem_debugfs_init_bo(bo); + out: drm_gem_object_put(&bo->base.base); return ret; @@ -659,6 +662,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 +717,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..8a0fd1abd05c 100644 --- a/drivers/gpu/drm/panfrost/panfrost_gem.c +++ b/drivers/gpu/drm/panfrost/panfrost_gem.c @@ -12,6 +12,38 @@ #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) +{ + INIT_LIST_HEAD(&bo->debugfs.node); + + bo->debugfs.creator.tgid =3D current->group_leader->pid; + get_task_comm(bo->debugfs.creator.process_name, current->group_leader); + + mutex_lock(&ptdev->gems.lock); + list_add_tail(&bo->debugfs.node, &ptdev->gems.node); + mutex_unlock(&ptdev->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->gems.lock); + list_del_init(&bo->debugfs.node); + mutex_unlock(&ptdev->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 +68,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 @@ -266,6 +299,8 @@ struct drm_gem_object *panfrost_gem_create_object(struc= t drm_device *dev, size_t obj->base.map_wc =3D !pfdev->coherent; mutex_init(&obj->label.lock); =20 + panfrost_gem_debugfs_bo_add(pfdev, obj); + return &obj->base.base; } =20 @@ -321,3 +356,105 @@ 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->gems.lock) { + list_for_each_entry(bo, &ptdev->gems.node, debugfs.node) { + if (bo->debugfs.initialised) + 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..bc60e0d74da9 100644 --- a/drivers/gpu/drm/panfrost/panfrost_gem.h +++ b/drivers/gpu/drm/panfrost/panfrost_gem.h @@ -8,9 +8,50 @@ #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; + + /** @initialised: GEM object is ready to be displayed in DebugFS file. */ + bool initialised; +}; + struct panfrost_gem_object { struct drm_gem_shmem_object base; struct sg_table *sgts; @@ -59,6 +100,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 +152,17 @@ void panfrost_gem_shrinker_cleanup(struct drm_device *= dev); =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); +static inline void +panfrost_gem_debugfs_init_bo(struct panfrost_gem_object *bo) +{ + bo->debugfs.initialised =3D true; +} +#else +static inline void +panfrost_gem_debugfs_init_bo(struct panfrost_gem_object *bo) {}; +#endif + #endif /* __PANFROST_GEM_H__ */ --=20 2.48.1