<!DOCTYPE html><html><head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> </head> <body> <div class="moz-cite-prefix">On 31-08-2023 14:35, Tejas Upadhyay wrote: </div> <blockquote type="cite" cite="mid:20230831090536.2949934-4-tejas.upadhyay@intel.com"> <pre class="moz-quote-pre" wrap="">In order to show per client memory consumption, we need tracking support APIs to add at every bo consumption and removal. Adding APIs here to add tracking calls at places wherever it is applicable. Signed-off-by: Tejas Upadhyay <a class="moz-txt-link-rfc2396E" href="mailto:tejas.upadhyay@intel.com"><tejas.upadhyay@intel.com></a> --- drivers/gpu/drm/xe/xe_bo.c | 7 ++++ drivers/gpu/drm/xe/xe_bo_types.h | 10 ++++++ drivers/gpu/drm/xe/xe_drm_client.c | 58 ++++++++++++++++++++++++++++++ drivers/gpu/drm/xe/xe_drm_client.h | 26 ++++++++++++++ 4 files changed, 101 insertions(+) diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c index 6a8a41dafe88..cde91c3601d1 100644 --- a/drivers/gpu/drm/xe/xe_bo.c +++ b/drivers/gpu/drm/xe/xe_bo.c @@ -16,6 +16,7 @@ #include "xe_device.h" #include "xe_dma_buf.h" +#include "xe_drm_client.h" #include "xe_ggtt.h" #include "xe_gt.h" #include "xe_map.h" @@ -1051,6 +1052,9 @@ static void xe_ttm_bo_destroy(struct ttm_buffer_object *ttm_bo) if (bo->vm && xe_bo_is_user(bo)) xe_vm_put(bo->vm); + if (bo->client) + xe_drm_client_remove_bo(bo);</pre> </blockquote> API returns bool, handle it or use void return type. <blockquote type="cite" cite="mid:20230831090536.2949934-4-tejas.upadhyay@intel.com"> <pre class="moz-quote-pre" wrap=""> + kfree(bo); } @@ -1230,6 +1234,9 @@ struct xe_bo *__xe_bo_create_locked(struct xe_device *xe, struct xe_bo *bo, bo->ttm.priority = DRM_XE_VMA_PRIORITY_NORMAL; INIT_LIST_HEAD(&bo->vmas); INIT_LIST_HEAD(&bo->pinned_link); +#ifdef CONFIG_PROC_FS + INIT_LIST_HEAD(&bo->client_link); +#endif drm_gem_private_object_init(&xe->drm, &bo->ttm.base, size); diff --git a/drivers/gpu/drm/xe/xe_bo_types.h b/drivers/gpu/drm/xe/xe_bo_types.h index f6ee920303af..1aef413b6f8a 100644 --- a/drivers/gpu/drm/xe/xe_bo_types.h +++ b/drivers/gpu/drm/xe/xe_bo_types.h @@ -45,6 +45,16 @@ struct xe_bo { struct ttm_bo_kmap_obj kmap; /** @pinned_link: link to present / evicted list of pinned BO */ struct list_head pinned_link; +#ifdef CONFIG_PROC_FS + /** + * @client: @xe_drm_client which created the bo + */ + struct xe_drm_client *client; + /** + * @client_link: Link into @xe_drm_client.objects_list + */ + struct list_head client_link; +#endif /** @props: BO user controlled properties */ struct { /** @preferred_mem: preferred memory class for this BO */ diff --git a/drivers/gpu/drm/xe/xe_drm_client.c b/drivers/gpu/drm/xe/xe_drm_client.c index b5dc024b5dd0..00b28a08909f 100644 --- a/drivers/gpu/drm/xe/xe_drm_client.c +++ b/drivers/gpu/drm/xe/xe_drm_client.c @@ -8,8 +8,11 @@ #include <linux/slab.h> #include <linux/types.h> +#include "xe_bo_types.h" #include "xe_device_types.h" #include "xe_drm_client.h" +#include "xe_device_types.h" +#include "xe_trace.h" /** * xe_drm_client_alloc() - Allocate drm client @@ -31,6 +34,10 @@ struct xe_drm_client *xe_drm_client_alloc(void) kref_init(&client->kref); +#ifdef CONFIG_PROC_FS + spin_lock_init(&client->bos_lock); + INIT_LIST_HEAD(&client->bos_list); +#endif return client; } @@ -52,6 +59,57 @@ void __xe_drm_client_free(struct kref *kref) } #ifdef CONFIG_PROC_FS +/** + * xe_drm_client_add_bo() - Add BO for tracking client mem usage + * @client: The drm client ptr + * @bo: The xe BO ptr + * + * Add all BO created by individual drm client by calling this function. + * This helps in tracking client memory usage. + * + * Return: void + */ +void xe_drm_client_add_bo(struct xe_drm_client *client, + struct xe_bo *bo) +{ + unsigned long flags; + + XE_WARN_ON(bo->client); + XE_WARN_ON(!list_empty(&bo->client_link)); + + spin_lock_irqsave(&client->bos_lock, flags); + bo->client = xe_drm_client_get(client); + list_add_tail_rcu(&bo->client_link, &client->bos_list); + spin_unlock_irqrestore(&client->bos_lock, flags); +} + +/** + * xe_drm_client_remove_bo() - Remove BO for tracking client mem usage + * @bo: The xe BO ptr + * + * Remove all BO removed by individual drm client by calling this function. + * This helps in tracking client memory usage. + * + * Return: void</pre> </blockquote> Wrong return type in comment. <blockquote type="cite" cite="mid:20230831090536.2949934-4-tejas.upadhyay@intel.com"> <pre class="moz-quote-pre" wrap=""> + */ +bool xe_drm_client_remove_bo(struct xe_bo *bo) +{ + struct xe_drm_client *client = bo->client; + unsigned long flags; + + /* Object may not be associated with a client. */ + if (!client) + return false;</pre> </blockquote> This call is redundant. API is being called only if client exists, make sure to check for bo->client_link too. Himal <blockquote type="cite" cite="mid:20230831090536.2949934-4-tejas.upadhyay@intel.com"> <pre class="moz-quote-pre" wrap=""> + + spin_lock_irqsave(&client->bos_lock, flags); + list_del_rcu(&bo->client_link); + spin_unlock_irqrestore(&client->bos_lock, flags); + + xe_drm_client_put(client); + + return true; +} + /** * xe_drm_client_fdinfo() - Callback for fdinfo interface * @p: The drm_printer ptr diff --git a/drivers/gpu/drm/xe/xe_drm_client.h b/drivers/gpu/drm/xe/xe_drm_client.h index dbe3a083c9df..bbbc5d6ce3ae 100644 --- a/drivers/gpu/drm/xe/xe_drm_client.h +++ b/drivers/gpu/drm/xe/xe_drm_client.h @@ -15,10 +15,23 @@ struct drm_file; struct drm_printer; +struct xe_bo; struct xe_drm_client { struct kref kref; unsigned int id; +#ifdef CONFIG_PROC_FS + /** + * @bos_lock: lock protecting @bos_list + */ + spinlock_t bos_lock; + /** + * @bos_list: list of bos created by this client + * + * Protected by @bos_lock. + */ + struct list_head bos_list; +#endif }; static inline struct xe_drm_client * @@ -41,5 +54,18 @@ xe_drm_client_get(struct xe_drm_client *client); static inline void xe_drm_client_put(struct xe_drm_client *client); #ifdef CONFIG_PROC_FS void xe_drm_client_fdinfo(struct drm_printer *p, struct drm_file *file); +void xe_drm_client_add_bo(struct xe_drm_client *client, + struct xe_bo *bo); +bool xe_drm_client_remove_bo(struct xe_bo *bo); +#else +static inline void xe_drm_client_add_bo(struct xe_drm_client *client, + struct xe_bo *bo) +{ +} + +static inline bool xe_drm_client_remove_bo(struct xe_bo *bo) +{ +} #endif + #endif </pre> </blockquote> </body> </html>