From patchwork Wed Mar 19 15:03:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Adri=C3=A1n_Larumbe?= X-Patchwork-Id: 14022765 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 907FEC35FFC for ; Wed, 19 Mar 2025 15:16:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 040B510E523; Wed, 19 Mar 2025 15:16:30 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b="IOdPz4e/"; dkim-atps=neutral Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) by gabe.freedesktop.org (Postfix) with ESMTPS id DEC2D10E523 for ; Wed, 19 Mar 2025 15:16:28 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; t=1742397377; cv=none; d=zohomail.com; s=zohoarc; b=M9S7NQWgUT7zE1cmhru5+2AxI8x0LVEZQ1lKwcIzfINTqrO4WL9Hfij8Ic0Gxvk98nGjING94OiOfP9vYIxwNUyLyA2lhOmTv/54L+sUVCiwE9nLF53WVb11xIf3RvjiFxOPNHvUu88sWabZ8FKnCwA++UzM7WUcWkVwAS145Dk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742397377; 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=vIPJQom7r4A3GWtfSUhf1tVdtm3CdKHcA/I1Ss7gdmA=; b=ITCYTex6Ue9uk5+Mc/C9iKXRFCE76ZKHiBfQvoJ+jrYOAHP5eoFyVM99+gQ6AgVdn2yLY/9Qb/EUU8KKJmoEYcv2zQ+2WceiSC236ATLORcos8QYoozPyNpmi2wF18/MwqdxxMGPEZJKTMjafhXvVhDS0k0TawKU8jCQNGe8cHo= 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=1742397377; 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=vIPJQom7r4A3GWtfSUhf1tVdtm3CdKHcA/I1Ss7gdmA=; b=IOdPz4e/WNj+yEQDGCsU/RNKd0WTBA1/glY3kJu5167yVhi1Gnnf4/YgkED1iCxp 4kLSfdaOWAbiAP/0j3sWuHHCQWOy5Ohhvjr+w5Vu2pwF6OtfI6lAYPmUzYOu4bwPyiz BBU11U8YXF033vRURgFXYIj3NqRmyQF4JqimYFbQ= Received: by mx.zohomail.com with SMTPS id 1742397375095815.980850775402; Wed, 19 Mar 2025 08:16:15 -0700 (PDT) From: =?utf-8?q?Adri=C3=A1n_Larumbe?= To: Boris Brezillon , Steven Price , Liviu Dudau , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Cc: kernel@collabora.com, =?utf-8?q?Adri=C3=A1n_Larumbe?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/4] drm/panthor: Introduce BO labeling Date: Wed, 19 Mar 2025 15:03:16 +0000 Message-ID: <20250319150953.1634322-2-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250319150953.1634322-1-adrian.larumbe@collabora.com> References: <20250319150953.1634322-1-adrian.larumbe@collabora.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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án Larumbe --- drivers/gpu/drm/panthor/panthor_gem.c | 24 ++++++++++++++++++++++++ drivers/gpu/drm/panthor/panthor_gem.h | 17 +++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/drivers/gpu/drm/panthor/panthor_gem.c b/drivers/gpu/drm/panthor/panthor_gem.c index 8244a4e6c2a2..165c7f4eb920 100644 --- a/drivers/gpu/drm/panthor/panthor_gem.c +++ b/drivers/gpu/drm/panthor/panthor_gem.c @@ -18,6 +18,9 @@ static void panthor_gem_free_object(struct drm_gem_object *obj) struct panthor_gem_object *bo = to_panthor_bo(obj); struct drm_gem_object *vm_root_gem = bo->exclusive_vm_root_gem; + kfree(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 +199,7 @@ struct drm_gem_object *panthor_gem_create_object(struct drm_device *ddev, size_t obj->base.map_wc = !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); return &obj->base.base; } @@ -247,3 +251,23 @@ panthor_gem_create_with_handle(struct drm_file *file, return ret; } + +void +panthor_gem_bo_set_label(struct drm_gem_object *obj, const char *label) +{ + struct panthor_gem_object *bo = to_panthor_bo(obj); + const char *old_label; + + mutex_lock(&bo->label.lock); + old_label = bo->label.str; + bo->label.str = label; + mutex_unlock(&bo->label.lock); + + kfree(old_label); +} + +void +panthor_gem_kernel_bo_set_label(struct panthor_kernel_bo *bo, const char *label) +{ + panthor_gem_bo_set_label(bo->obj, kstrdup_const(label, GFP_KERNEL)); +} diff --git a/drivers/gpu/drm/panthor/panthor_gem.h b/drivers/gpu/drm/panthor/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 { /** @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; }; /** @@ -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); +void panthor_gem_bo_set_label(struct drm_gem_object *obj, const char *label); +void panthor_gem_kernel_bo_set_label(struct panthor_kernel_bo *bo, const char *label); + static inline u64 panthor_kernel_bo_gpuva(struct panthor_kernel_bo *bo) { From patchwork Wed Mar 19 15:03:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Adri=C3=A1n_Larumbe?= X-Patchwork-Id: 14022766 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 47C79C35FFA for ; Wed, 19 Mar 2025 15:16:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AF06F10E527; Wed, 19 Mar 2025 15:16:33 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b="ObX5q6F9"; dkim-atps=neutral Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) by gabe.freedesktop.org (Postfix) with ESMTPS id E4B3510E527 for ; Wed, 19 Mar 2025 15:16:30 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; t=1742397379; cv=none; d=zohomail.com; s=zohoarc; b=eu0rv4tVPUrtP+5EEe3p2fo8tvp0O/7vZXdpjlAl488eHHgiK4C8xgkZtf6MYQMEbqTjeru71pAz4PiUVVJrWoF1BjV8zSqaaZXzOQegpxD8ITJJHJGvxsUts3hEB4IkyO8zMBoI11H+5Gm+HKxu9mZwRDp7/D+lsrifMmnHFoY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742397379; 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=48Ec4RxmwV2a0OviL7nO3T3BPBKv2DmHc38eUVg14bk=; b=IuBcCkOChBLh7IGJEOipswkOEhKgnFRDMDZvHyQ2ZM33ElyaQki17hzl1TI9KCw/ykYrzyxs3OmP2GAyDhVgkTXgn25UpNuUAdcBNRGSTY3UU9daJvlBGfrbYKsz3GMdpA9dQDtKCXpSZqqhV5kRtG7CYY3zaaz+ndVjcqrb13Q= 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=1742397379; 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=48Ec4RxmwV2a0OviL7nO3T3BPBKv2DmHc38eUVg14bk=; b=ObX5q6F9gXiMAeCJhn2Bk6Hz56oP8SP24s4qYGdGPjGLezO4U6ffzajQGZwZxv/a BkWpz1VwHT4kJK51sW41maxa+Yoapcakbz/iGGAOraB3TO/GLGxqn6H4EMNQWHTkqQ9 EUQXXozX1GRum+xJzazDAKGN42mW1aUaOqTW9LLc= Received: by mx.zohomail.com with SMTPS id 1742397378120852.8015031278226; Wed, 19 Mar 2025 08:16:18 -0700 (PDT) From: =?utf-8?q?Adri=C3=A1n_Larumbe?= To: Boris Brezillon , Steven Price , Liviu Dudau , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Cc: kernel@collabora.com, =?utf-8?q?Adri=C3=A1n_Larumbe?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/4] drm/panthor: Add driver IOCTL for setting BO labels Date: Wed, 19 Mar 2025 15:03:17 +0000 Message-ID: <20250319150953.1634322-3-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250319150953.1634322-1-adrian.larumbe@collabora.com> References: <20250319150953.1634322-1-adrian.larumbe@collabora.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Allow UM to label a BO for which it possesses a DRM handle. Signed-off-by: Adrián Larumbe --- drivers/gpu/drm/panthor/panthor_drv.c | 37 +++++++++++++++++++++++++++ include/uapi/drm/panthor_drm.h | 19 ++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/drivers/gpu/drm/panthor/panthor_drv.c b/drivers/gpu/drm/panthor/panthor_drv.c index 310bb44abe1a..e91acf132e06 100644 --- a/drivers/gpu/drm/panthor/panthor_drv.c +++ b/drivers/gpu/drm/panthor/panthor_drv.c @@ -1330,6 +1330,41 @@ static int panthor_ioctl_vm_get_state(struct drm_device *ddev, void *data, return 0; } +static int panthor_ioctl_bo_set_label(struct drm_device *ddev, void *data, + struct drm_file *file) +{ + struct drm_panthor_bo_set_label *args = data; + struct drm_gem_object *obj; + const char *label; + unsigned long len; + int ret = 0; + + obj = drm_gem_object_lookup(file, args->handle); + if (!obj) + return -ENOENT; + + if (args->size && args->label) { + len = (args->size < PAGE_SIZE) ? args->size : PAGE_SIZE; + label = strndup_user(u64_to_user_ptr(args->label), len); + if (IS_ERR(label)) { + ret = PTR_ERR(label); + goto err_label; + } + } else if (args->size && !args->label) { + ret = -EINVAL; + goto err_label; + } else { + label = 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 +1434,7 @@ static const struct drm_ioctl_desc panthor_drm_driver_ioctls[] = { 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), }; static int panthor_mmap(struct file *filp, struct vm_area_struct *vma) @@ -1508,6 +1544,7 @@ static void panthor_debugfs_init(struct drm_minor *minor) * - 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 = { .driver_features = DRIVER_RENDER | DRIVER_GEM | DRIVER_SYNCOBJ | 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 { /** @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, }; /** @@ -977,6 +980,20 @@ struct drm_panthor_tiler_heap_destroy { __u32 pad; }; +/** + * 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 = DRM_IOCTL_PANTHOR(WR, TILER_HEAP_DESTROY, tiler_heap_destroy), + DRM_IOCTL_PANTHOR_BO_SET_LABEL = + DRM_IOCTL_PANTHOR(WR, BO_SET_LABEL, bo_set_label), }; #if defined(__cplusplus) From patchwork Wed Mar 19 15:03:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Adri=C3=A1n_Larumbe?= X-Patchwork-Id: 14022767 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4F7E3C35FFA for ; Wed, 19 Mar 2025 15:16:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B6E0510E52C; Wed, 19 Mar 2025 15:16:37 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b="GWKs+EmC"; dkim-atps=neutral Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0FF2210E52C for ; Wed, 19 Mar 2025 15:16:37 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; t=1742397383; cv=none; d=zohomail.com; s=zohoarc; b=WF8kYicq5QXfMyEne+xw9jD/sqBXmU8RYOzeIk+0t1nI6nKxtQew11TpQp8sz0Fbq4SQ7e3hhucO7PQxVMCeuU04BJMhRcppNNknKOYASu9T/pQ+l+fxRshes9XOF6kmHRViy8v1Hv78wWaL3mAgjnF12lfLIc04xJE3i6KAkXE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742397383; 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=nfH6v6lfdIk1blzio1DZSnW0EW8C4O+mBkMFo1dv7xo=; b=guAGeEsd3B11/DrsXkYsKA8Iyd7jW4n3mnFgiC4IPBY23hR9Hi76x9o80qL58M5OHNrNZZXdfBl6hKPgHRPTG5J7mktLncuNCuAn23QVhDtMRo1UmYEgz3/e/V+aSVp8DIZb9ieZivEyDkml66aU4lM4+0ujRlv7zWegURrMiTU= 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=1742397383; 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=nfH6v6lfdIk1blzio1DZSnW0EW8C4O+mBkMFo1dv7xo=; b=GWKs+EmCpXADzEG1BrwLH0kagdStuQNbiNN3okzZ1kfj/LDgLaA0ihIqt84rc9oA 1xcBrPSMp2GxHiqaZBurrUmAhnISxn2iXD6AYokdav/QFs/dL3HPV9R+Wd72z8Bgxw9 tFyVi39j9NIpaS6du5KnHlgFcQHNsnTGnyxzktGQ= Received: by mx.zohomail.com with SMTPS id 1742397381956855.6215348499818; Wed, 19 Mar 2025 08:16:21 -0700 (PDT) From: =?utf-8?q?Adri=C3=A1n_Larumbe?= To: Boris Brezillon , Steven Price , Liviu Dudau , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Sumit Semwal , =?utf-8?q?Christian_K=C3=B6nig?= Cc: kernel@collabora.com, =?utf-8?q?Adri=C3=A1n_Larumbe?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH v2 3/4] drm/panthor: show device-wide list of DRM GEM objects over DebugFS Date: Wed, 19 Mar 2025 15:03:18 +0000 Message-ID: <20250319150953.1634322-4-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250319150953.1634322-1-adrian.larumbe@collabora.com> References: <20250319150953.1634322-1-adrian.larumbe@collabora.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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. Signed-off-by: Adrián Larumbe --- 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 | 130 +++++++++++++++++++++++ drivers/gpu/drm/panthor/panthor_gem.h | 29 +++++ 5 files changed, 201 insertions(+) diff --git a/drivers/gpu/drm/panthor/panthor_device.c b/drivers/gpu/drm/panthor/panthor_device.c index a9da1d1eeb70..bae1a74d7111 100644 --- a/drivers/gpu/drm/panthor/panthor_device.c +++ b/drivers/gpu/drm/panthor/panthor_device.c @@ -263,6 +263,11 @@ int panthor_device_init(struct panthor_device *ptdev) pm_runtime_set_autosuspend_delay(ptdev->base.dev, 50); pm_runtime_use_autosuspend(ptdev->base.dev); +#ifdef CONFIG_DEBUG_FS + drmm_mutex_init(&ptdev->base, &ptdev->gems.lock); + INIT_LIST_HEAD(&ptdev->gems.node); +#endif + ret = drm_dev_register(&ptdev->base, 0); if (ret) goto err_disable_autosuspend; diff --git a/drivers/gpu/drm/panthor/panthor_device.h b/drivers/gpu/drm/panthor/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 { /** @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 }; struct panthor_gpu_usage { diff --git a/drivers/gpu/drm/panthor/panthor_drv.c b/drivers/gpu/drm/panthor/panthor_drv.c index e91acf132e06..61ebf87f2946 100644 --- a/drivers/gpu/drm/panthor/panthor_drv.c +++ b/drivers/gpu/drm/panthor/panthor_drv.c @@ -1531,9 +1531,35 @@ static const struct file_operations panthor_drm_driver_fops = { }; #ifdef CONFIG_DEBUG_FS +static int panthor_gems_show(struct seq_file *m, void *data) +{ + struct drm_info_node *node = m->private; + struct drm_device *dev = node->minor->dev; + struct panthor_device *ptdev = container_of(dev, struct panthor_device, base); + + panthor_gem_debugfs_print_bos(ptdev, m); + + return 0; +} + + +static struct drm_info_list panthor_debugfs_list[] = { + {"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 diff --git a/drivers/gpu/drm/panthor/panthor_gem.c b/drivers/gpu/drm/panthor/panthor_gem.c index 165c7f4eb920..f7eb413d88e7 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 */ /* Copyright 2023 Collabora ltd. */ +#include #include #include #include @@ -13,11 +14,49 @@ #include "panthor_gem.h" #include "panthor_mmu.h" +#ifdef CONFIG_DEBUG_FS +static void panthor_gem_debugfs_bo_init(struct panthor_gem_object *bo) +{ + INIT_LIST_HEAD(&bo->gems.node); + bo->gems.creator.tgid = current->group_leader->pid; + get_task_comm(bo->gems.creator.process_name, current->group_leader); +} + +static void panthor_gem_debugfs_bo_add(struct panthor_gem_object *bo) +{ + struct panthor_device *ptdev = container_of(bo->base.base.dev, + struct panthor_device, base); + + mutex_lock(&ptdev->gems.lock); + list_add_tail(&bo->gems.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 = container_of(bo->base.base.dev, + struct panthor_device, base); + + if (list_empty(&bo->gems.node)) + return; + + mutex_lock(&ptdev->gems.lock); + list_del_init(&bo->gems.node); + mutex_unlock(&ptdev->gems.lock); +} +#else +static void panthor_gem_debugfs_bo_init(struct panthor_gem_object *bo) {} +static void panthor_gem_debugfs_bo_add(struct panthor_gem_object *bo) {} +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 = to_panthor_bo(obj); struct drm_gem_object *vm_root_gem = bo->exclusive_vm_root_gem; + panthor_gem_debugfs_bo_rm(bo); + kfree(bo->label.str); mutex_destroy(&bo->label.lock); @@ -201,6 +240,8 @@ struct drm_gem_object *panthor_gem_create_object(struct drm_device *ddev, size_t drm_gem_gpuva_set_lock(&obj->base.base, &obj->gpuva_list_lock); mutex_init(&obj->label.lock); + panthor_gem_debugfs_bo_init(obj); + return &obj->base.base; } @@ -249,6 +290,8 @@ panthor_gem_create_with_handle(struct drm_file *file, /* drop reference from allocate - handle holds it now. */ drm_gem_object_put(&shmem->base); + panthor_gem_debugfs_bo_add(bo); + return ret; } @@ -271,3 +314,90 @@ panthor_gem_kernel_bo_set_label(struct panthor_kernel_bo *bo, const char *label) { panthor_gem_bo_set_label(bo->obj, kstrdup_const(label, 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 = kref_read(&bo->base.base.refcount); + char creator_info[32] = {}; + bool has_flags = false; + size_t resident_size; + + /* Skip BOs being destroyed. */ + if (!refcount) + return; + + resident_size = bo->base.pages != NULL ? bo->base.base.size : 0; + + snprintf(creator_info, sizeof(creator_info), + "%s/%d", bo->gems.creator.process_name, bo->gems.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 = panfrost_gem_print_flag("imported", bo->base.base.import_attach != NULL, + has_flags, m); + has_flags = panfrost_gem_print_flag("exported", bo->base.base.dma_buf != NULL, + has_flags, m); + if (bo->base.madv < 0) + has_flags = panfrost_gem_print_flag("purged", true, has_flags, m); + else if (bo->base.madv > 0) + has_flags = panfrost_gem_print_flag("purgeable", true, has_flags, m); + if (!has_flags) + seq_puts(m, "none"); + seq_puts(m, ")"); + + mutex_lock(&bo->label.lock); + seq_printf(m, "%-16s%-60s", "", bo->label.str ? : NULL); + mutex_unlock(&bo->label.lock); + seq_puts(m, "\n"); + + totals->size += bo->base.base.size; + totals->resident += resident_size; + if (bo->base.madv > 0) + totals->reclaimable += resident_size; +} + +void panthor_gem_debugfs_print_bos(struct panthor_device *ptdev, + struct seq_file *m) +{ + struct gem_size_totals totals = {0}; + struct panthor_gem_object *bo; + + seq_puts(m, "created-by global-name refcount size resident-size file-offset flags label\n"); + seq_puts(m, "------------------------------------------------------------------------------------------------------------------------------------------------\n"); + + scoped_guard(mutex, &ptdev->gems.lock) { + list_for_each_entry(bo, &ptdev->gems.node, gems.node) + panthor_gem_debugfs_bo_print(bo, m, &totals); + } + + seq_puts(m, "================================================================================================================================================\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/panthor/panthor_gem.h index 0582826b341a..7c896ec35801 100644 --- a/drivers/gpu/drm/panthor/panthor_gem.h +++ b/drivers/gpu/drm/panthor/panthor_gem.h @@ -13,6 +13,26 @@ struct panthor_vm; +/** + * 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; +}; + /** * struct panthor_gem_object - Driver specific GEM object. */ @@ -60,6 +80,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 gems; +#endif }; /** @@ -155,4 +179,9 @@ panthor_kernel_bo_create(struct panthor_device *ptdev, struct panthor_vm *vm, void panthor_kernel_bo_destroy(struct panthor_kernel_bo *bo); +#ifdef CONFIG_DEBUG_FS +void panthor_gem_debugfs_print_bos(struct panthor_device *pfdev, + struct seq_file *m); +#endif + #endif /* __PANTHOR_GEM_H__ */ From patchwork Wed Mar 19 15:03:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Adri=C3=A1n_Larumbe?= X-Patchwork-Id: 14022768 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2ADF6C35FFC for ; Wed, 19 Mar 2025 15:16:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8B00410E534; Wed, 19 Mar 2025 15:16:42 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b="FX5Die6z"; dkim-atps=neutral Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2101110E534 for ; Wed, 19 Mar 2025 15:16:39 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; t=1742397387; cv=none; d=zohomail.com; s=zohoarc; b=ntFeWacIa8Pm5kBFyE9gDw3v520b38EyCPJz1PEWj1GHDtxq6c6tNkqBJL5A7cLFUZbZecXqTif0Ycp870+8YRyOLldFzLj7jqLbZJW/Wux4Uo1YlbkkdBCzMw0F61lNm9iyRKRLCZ2nb5AjuEE3UM8/vUcnrxLdUKH3svYRyn4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742397387; 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=OoIHyEJ5O0a0xme8HtC057nmgMH3xihc2B6OzxWGjfE=; b=JycvFkmuUFsnxqSUFtlLhzaP6YSc2jRsdiTwh1R0xCexdfJdzaNoyVUZoqjZJ+tQGtiNwJTojh4DE0Gldt5OdbU+5RIp4x9z13ZAWqzz7UxSbUgEwcvqX37SCvpRU4q4MDFJAC/26vKXBV0I/r6Wg+6FVZjDtTFH6jA/h5i2dHc= 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=1742397387; 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=OoIHyEJ5O0a0xme8HtC057nmgMH3xihc2B6OzxWGjfE=; b=FX5Die6z2YofTaMsB+hrV171mcc66RGPrTlMeiT5OKfVTZn8G0vvObF5YPDckoAv a0aoOxXcCEuzaT9Y++RUKhQGrd9otLAN9d9zy9UWYnqYX6Njh1W8M2+Bo3JjL//41Fc spYz9Vn8sy2Qkao6dlLIddEpcQ/1vbL8NyeVfk8Y= Received: by mx.zohomail.com with SMTPS id 17423973850171005.418058365657; Wed, 19 Mar 2025 08:16:25 -0700 (PDT) From: =?utf-8?q?Adri=C3=A1n_Larumbe?= To: Boris Brezillon , Steven Price , Liviu Dudau , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Cc: kernel@collabora.com, =?utf-8?q?Adri=C3=A1n_Larumbe?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/4] drm/panthor: Display heap chunk entries in DebugFS GEMS file Date: Wed, 19 Mar 2025 15:03:19 +0000 Message-ID: <20250319150953.1634322-5-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250319150953.1634322-1-adrian.larumbe@collabora.com> References: <20250319150953.1634322-1-adrian.larumbe@collabora.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Expand the driver's DebugFS GEMS file to display entries for the heap chunks' GEM objects, both those allocated at heap creation time through an ioctl(), or in response to a tiler OOM event. Signed-off-by: Adrián Larumbe --- drivers/gpu/drm/panthor/panthor_gem.c | 22 +++++++++++----------- drivers/gpu/drm/panthor/panthor_gem.h | 2 ++ drivers/gpu/drm/panthor/panthor_heap.c | 3 +++ 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/panthor/panthor_gem.c b/drivers/gpu/drm/panthor/panthor_gem.c index f7eb413d88e7..252979473fdf 100644 --- a/drivers/gpu/drm/panthor/panthor_gem.c +++ b/drivers/gpu/drm/panthor/panthor_gem.c @@ -22,16 +22,6 @@ static void panthor_gem_debugfs_bo_init(struct panthor_gem_object *bo) get_task_comm(bo->gems.creator.process_name, current->group_leader); } -static void panthor_gem_debugfs_bo_add(struct panthor_gem_object *bo) -{ - struct panthor_device *ptdev = container_of(bo->base.base.dev, - struct panthor_device, base); - - mutex_lock(&ptdev->gems.lock); - list_add_tail(&bo->gems.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 = container_of(bo->base.base.dev, @@ -44,10 +34,20 @@ static void panthor_gem_debugfs_bo_rm(struct panthor_gem_object *bo) list_del_init(&bo->gems.node); mutex_unlock(&ptdev->gems.lock); } + +void panthor_gem_debugfs_bo_add(struct panthor_gem_object *bo) +{ + struct panthor_device *ptdev = container_of(bo->base.base.dev, + struct panthor_device, base); + + mutex_lock(&ptdev->gems.lock); + list_add_tail(&bo->gems.node, &ptdev->gems.node); + mutex_unlock(&ptdev->gems.lock); +} #else static void panthor_gem_debugfs_bo_init(struct panthor_gem_object *bo) {} -static void panthor_gem_debugfs_bo_add(struct panthor_gem_object *bo) {} static void panthor_gem_debugfs_bo_rm(struct panthor_gem_object *bo) {} +void panthor_gem_debugfs_bo_add(struct panthor_gem_object *bo) {} #endif static void panthor_gem_free_object(struct drm_gem_object *obj) diff --git a/drivers/gpu/drm/panthor/panthor_gem.h b/drivers/gpu/drm/panthor/panthor_gem.h index 7c896ec35801..e132f14bbef8 100644 --- a/drivers/gpu/drm/panthor/panthor_gem.h +++ b/drivers/gpu/drm/panthor/panthor_gem.h @@ -132,6 +132,8 @@ panthor_gem_create_with_handle(struct drm_file *file, void panthor_gem_bo_set_label(struct drm_gem_object *obj, const char *label); void panthor_gem_kernel_bo_set_label(struct panthor_kernel_bo *bo, const char *label); +void panthor_gem_debugfs_bo_add(struct panthor_gem_object *bo); + static inline u64 panthor_kernel_bo_gpuva(struct panthor_kernel_bo *bo) { diff --git a/drivers/gpu/drm/panthor/panthor_heap.c b/drivers/gpu/drm/panthor/panthor_heap.c index db0285ce5812..73cf43eb4a7b 100644 --- a/drivers/gpu/drm/panthor/panthor_heap.c +++ b/drivers/gpu/drm/panthor/panthor_heap.c @@ -180,6 +180,9 @@ static int panthor_alloc_heap_chunk(struct panthor_device *ptdev, heap->chunk_count++; mutex_unlock(&heap->lock); + panthor_gem_kernel_bo_set_label(chunk->bo, "\"Tiler heap chunk\""); + panthor_gem_debugfs_bo_add(to_panthor_bo(chunk->bo->obj)); + return 0; err_destroy_bo: