Per client engine busyness
Subsystems (4)
cover Per client engine busyness
From: Tvrtko Ursulin <[email protected]>
Same old work but now rebased and series ending with some DRM docs proposing the common specification which should enable nice common userspace tools to be written.
For the moment I only have intel_gpu_top converted to use this and that seems to work okay.
Tvrtko Ursulin (8):
drm/i915: Explicitly track DRM clients
drm/i915: Update client name on context create
drm/i915: Make GEM contexts track DRM clients
drm/i915: Track runtime spent in closed and unreachable GEM contexts drm/i915: Track all user contexts per client
drm/i915: Track context current active time
drm/i915: Expose client engine utilisation via fdinfo
drm: Document fdinfo format specification
Documentation/gpu/drm-usage-stats.rst | 99 +++++++ Documentation/gpu/i915.rst | 27 ++ Documentation/gpu/index.rst | 1 + drivers/gpu/drm/i915/Makefile | 5 +- drivers/gpu/drm/i915/gem/i915_gem_context.c | 55 +++- .../gpu/drm/i915/gem/i915_gem_context_types.h | 16 +- drivers/gpu/drm/i915/gt/intel_context.c | 27 +- drivers/gpu/drm/i915/gt/intel_context.h | 15 +- drivers/gpu/drm/i915/gt/intel_context_types.h | 24 +- .../drm/i915/gt/intel_execlists_submission.c | 23 +- .../gpu/drm/i915/gt/intel_gt_clock_utils.c | 4 + drivers/gpu/drm/i915/gt/intel_lrc.c | 27 +- drivers/gpu/drm/i915/gt/intel_lrc.h | 24 ++ drivers/gpu/drm/i915/gt/selftest_lrc.c | 10 +- drivers/gpu/drm/i915/i915_drm_client.c | 243 ++++++++++++++++++ drivers/gpu/drm/i915/i915_drm_client.h | 107 ++++++++ drivers/gpu/drm/i915/i915_drv.c | 9 + drivers/gpu/drm/i915/i915_drv.h | 5 + drivers/gpu/drm/i915/i915_gem.c | 21 +- drivers/gpu/drm/i915/i915_gpu_error.c | 31 +-- drivers/gpu/drm/i915/i915_gpu_error.h | 2 +- 21 files changed, 696 insertions(+), 79 deletions(-) create mode 100644 Documentation/gpu/drm-usage-stats.rst create mode 100644 drivers/gpu/drm/i915/i915_drm_client.c create mode 100644 drivers/gpu/drm/i915/i915_drm_client.h
Signature · 1 line
2.30.2
PATCH 1/8 drm/i915: Explicitly track DRM clients
From: Tvrtko Ursulin <[email protected]>
Tracking DRM clients more explicitly will allow later patches to accumulate past and current GPU usage in a centralised place and also consolidate access to owning task pid/name.
Unique client id is also assigned for the purpose of distinguishing/ consolidating between multiple file descriptors owned by the same process.
v2:
Chris Wilson:
* Enclose new members into dedicated structs.
* Protect against failed sysfs registration.
v3:
* sysfs_attr_init.
v4:
* Fix for internal clients.
v5:
* Use cyclic ida for client id. (Chris)
* Do not leak pid reference. (Chris)
* Tidy code with some locals.
v6:
* Use xa_alloc_cyclic to simplify locking. (Chris)
* No need to unregister individial sysfs files. (Chris)
* Rebase on top of fpriv kref.
* Track client closed status and reflect in sysfs.
v7:
* Make drm_client more standalone concept.
v8:
* Simplify sysfs show. (Chris)
* Always track name and pid.
v9:
* Fix cyclic id assignment.
v10:
* No need for a mutex around xa_alloc_cyclic.
* Refactor sysfs into own function.
* Unregister sysfs before freeing pid and name.
* Move clients setup into own function.
v11:
* Call clients init directly from driver init. (Chris)
v12:
* Do not fail client add on id wrap. (Maciej)
v13 (Lucas): Rebase.
v14:
* Dropped sysfs bits.
--- drivers/gpu/drm/i915/Makefile | 5 +- drivers/gpu/drm/i915/i915_drm_client.c | 113 +++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_drm_client.h | 61 +++++++++++++ drivers/gpu/drm/i915/i915_drv.c | 6 ++ drivers/gpu/drm/i915/i915_drv.h | 5 ++ drivers/gpu/drm/i915/i915_gem.c | 21 ++++- 6 files changed, 206 insertions(+), 5 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_drm_client.c create mode 100644 drivers/gpu/drm/i915/i915_drm_client.h
drivers/gpu/drm/i915/Makefile +3 -2
@@ -33,8 +33,9 @@ subdir-ccflags-y += -I$(srctree)/$(src) # Please keep these build lists sorted! # core driver code -i915-y += i915_drv.o \ - i915_config.o \ +i915-y += i915_config.o \ + i915_drm_client.o \ + i915_drv.o \ i915_irq.o \ i915_getparam.o \ i915_mitigations.o \
drivers/gpu/drm/i915/i915_drm_client.c new file +113 -0
113 lines not on this page · raw message
drivers/gpu/drm/i915/i915_drm_client.h new file +61 -0
61 lines not on this page · raw message
drivers/gpu/drm/i915/i915_drv.c +6 -0
@@ -68,6 +68,7 @@#include "gt/intel_rc6.h" #include "i915_debugfs.h" +#include "i915_drm_client.h" #include "i915_drv.h" #include "i915_ioc32.h" #include "i915_irq.h"
@@ -343,6 +344,8 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)intel_gt_init_early (&dev_priv->gt, dev_priv); +i915_drm_clients_init (&dev_priv->clients, dev_priv); +i915_gem_init_early (dev_priv);/* This must be called before any calls to HAS_PCH_* */
@@ -362,6 +365,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv) err_gem:i915_gem_cleanup_early (dev_priv); +i915_drm_clients_fini (&dev_priv->clients);intel_gt_driver_late_release (&dev_priv->gt);intel_region_ttm_device_fini (dev_priv); err_ttm:
@@ -381,6 +385,7 @@ static void i915_driver_late_release(struct drm_i915_private *dev_priv)intel_irq_fini (dev_priv);intel_power_domains_cleanup (dev_priv);i915_gem_cleanup_early (dev_priv); +i915_drm_clients_fini (&dev_priv->clients);intel_gt_driver_late_release (&dev_priv->gt);intel_region_ttm_device_fini (dev_priv);vlv_suspend_cleanup (dev_priv);
@@ -996,6 +1001,7 @@ static void i915_driver_postclose(struct drm_device *dev, struct drm_file *file)struct drm_i915_file_private *file_priv = file->driver_priv;i915_gem_context_close (file); +i915_drm_client_close (file_priv->client);kfree_rcu (file_priv, rcu);
drivers/gpu/drm/i915/i915_drv.h +5 -0
@@ -96,6 +96,7 @@#include "intel_wakeref.h" #include "intel_wopcm.h" +#include "i915_drm_client.h" #include "i915_gem.h" #include "i915_gem_gtt.h" #include "i915_gpu_error.h"
@@ -284,6 +285,8 @@ struct drm_i915_file_private {/** ban_score: Accumulated score of all ctx bans and fast hangs. */ atomic_t ban_score;unsigned long hang_timestamp; + +struct i915_drm_client *client; };/* Interface history:
@@ -1218,6 +1221,8 @@ struct drm_i915_private {struct i915_pmu pmu; +struct i915_drm_clients clients; +struct i915_hdcp_comp_master *hdcp_master;bool hdcp_comp_added;
drivers/gpu/drm/i915/i915_gem.c +18 -3
@@ -1179,25 +1179,40 @@ void i915_gem_cleanup_early(struct drm_i915_private *dev_priv)int i915_gem_open (struct drm_i915_private *i915,struct drm_file *file) {struct drm_i915_file_private *file_priv; -int ret; +struct i915_drm_client *client; +int ret = -ENOMEM ;DRM_DEBUG ("\n" ); file_priv =kzalloc (sizeof (*file_priv),GFP_KERNEL );if (!file_priv) -return -ENOMEM ; + goto err_alloc; + + client =i915_drm_client_add (&i915->clients, current); +if (IS_ERR (client)) { + ret =PTR_ERR (client); + goto err_client; + } file->driver_priv = file_priv; file_priv->dev_priv = i915; file_priv->file = file; + file_priv->client = client; file_priv->bsd_engine =-1 ; file_priv->hang_timestamp = jiffies; ret =i915_gem_context_open (i915, file);if (ret) -kfree (file_priv); + goto err_context; + +return 0 ; +err_context: +i915_drm_client_close (client); +err_client: +kfree (file_priv); +err_alloc:return ret; }
Signature · 1 line
2.30.2
Re: [PATCH 1/8] drm/i915: Explicitly track DRM clients
Quoted 55 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Tracking DRM clients more explicitly will allow later patches to accumulate past and current GPU usage in a centralised place and also consolidate access to owning task pid/name.
Unique client id is also assigned for the purpose of distinguishing/ consolidating between multiple file descriptors owned by the same process.
v2:
Chris Wilson:
* Enclose new members into dedicated structs.
* Protect against failed sysfs registration.v3:
*sysfs_attr_init.v4:
* Fix for internal clients.v5:
* Use cyclic ida for client id. (Chris)
* Do not leak pid reference. (Chris)
* Tidy code with some locals.v6:
* Usexa_alloc_cyclicto simplify locking. (Chris)
* No need to unregister individial sysfs files. (Chris)
* Rebase on top of fpriv kref.
* Track client closed status and reflect in sysfs.v7:
* Makedrm_clientmore standalone concept.v8:
* Simplify sysfs show. (Chris)
* Always track name and pid.v9:
* Fix cyclic id assignment.v10:
* No need for a mutex aroundxa_alloc_cyclic.
* Refactor sysfs into own function.
* Unregister sysfs before freeing pid and name.
* Move clients setup into own function.v11:
* Call clients init directly from driver init. (Chris)v12:
* Do not fail client add on id wrap. (Maciej)v13 (Lucas): Rebase.
Quoted 7 lines
v14:
* Dropped sysfs bits.Signed-off-by Tvrtko Ursulin <[email protected]>Reviewed-by Chris Wilson <[email protected]> # v11Reviewed-by Aravind Iddamsetty <[email protected]> # v11Signed-off-by Chris Wilson <[email protected]>
On the implementation: I'm not clear why this is a separate object. All that seems to achieve is make the lifetim fun we have in here even more annoying, for not real gain?
What's the reasons for this separate i915_drm_client struct? The commit message talks about de-duping these within the same process, but with fdinfo I'm not seeing the relevance of this anymore.
Also, with the fdinfo approach, why do we still need to even track the pid? That can be all figured out from proc now, with much cleaner semantics.
-Daniel
Quoted 339 lines
--- drivers/gpu/drm/i915/Makefile | 5 +- drivers/gpu/drm/i915/i915_drm_client.c | 113 +++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_drm_client.h | 61 +++++++++++++ drivers/gpu/drm/i915/i915_drv.c | 6 ++ drivers/gpu/drm/i915/i915_drv.h | 5 ++ drivers/gpu/drm/i915/i915_gem.c | 21 ++++- 6 files changed, 206 insertions(+), 5 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_drm_client.c create mode 100644 drivers/gpu/drm/i915/i915_drm_client.hdrivers/gpu/drm/i915/Makefile +3
-2@@ -33,8 +33,9 @@ subdir-ccflags-y += -I$(srctree)/$(src) # Please keep these build lists sorted! # core driver code -i915-y += i915_drv.o \ - i915_config.o \ +i915-y += i915_config.o \ + i915_drm_client.o \ + i915_drv.o \ i915_irq.o \ i915_getparam.o \ i915_mitigations.o \drivers/gpu/drm/i915/i915_drm_client.c new file +113
-0@@ -0,0 +1,113 @@ +// SPDX-License-Identifier: MIT +/* +* Copyright © 2020 Intel Corporation +*/ + +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/types.h> + +#include "i915_drm_client.h" +#include "i915_gem.h" +#include "i915_utils.h" + +void i915_drm_clients_init (struct i915_drm_clients *clients, +struct drm_i915_private *i915) +{ + clients->i915 = i915; + + clients->next_id =0 ; +xa_init_flags (&clients->xarray,XA_FLAGS_ALLOC ); +} + +static int +__i915_drm_client_register (struct i915_drm_client *client, +struct task_struct *task) +{ +char *name; + + name =kstrdup (task->comm,GFP_KERNEL ); +if (!name) +return -ENOMEM ; + + client->pid =get_task_pid (task,PIDTYPE_PID ); + client->name = name; + +return 0 ; +} + +static void __i915_drm_client_unregister (struct i915_drm_client *client) +{ +put_pid (fetch_and_zero (&client->pid)); +kfree (fetch_and_zero (&client->name)); +} + +static void __rcu_i915_drm_client_free (struct work_struct *wrk) +{ +struct i915_drm_client *client = +container_of (wrk,typeof (*client), rcu.work); + +xa_erase (&client->clients->xarray, client->id); + +__i915_drm_client_unregister (client); + +kfree (client); +} + +struct i915_drm_client * +i915_drm_client_add (struct i915_drm_clients *clients,struct task_struct *task) +{ +struct i915_drm_client *client; +int ret; + + client =kzalloc (sizeof (*client),GFP_KERNEL ); +if (!client) +return ERR_PTR (-ENOMEM ); + +kref_init (&client->kref); + client->clients = clients; +INIT_RCU_WORK (&client->rcu, __rcu_i915_drm_client_free); + + ret =xa_alloc_cyclic (&clients->xarray, &client->id, client, + xa_limit_32b, &clients->next_id,GFP_KERNEL ); +if (ret <0 ) + goto err_id; + + ret =__i915_drm_client_register (client, task); +if (ret) + goto err_register; + +return client; + +err_register: +xa_erase (&clients->xarray, client->id); +err_id: +kfree (client); + +return ERR_PTR (ret); +} + +void __i915_drm_client_free (struct kref *kref) +{ +struct i915_drm_client *client = +container_of (kref,typeof (*client), kref); + +queue_rcu_work (system_wq, &client->rcu); +} + +void i915_drm_client_close (struct i915_drm_client *client) +{ +GEM_BUG_ON (READ_ONCE (client->closed)); +WRITE_ONCE (client->closed, true); +i915_drm_client_put (client); +} + +void i915_drm_clients_fini (struct i915_drm_clients *clients) +{ +while (!xa_empty (&clients->xarray)) { +rcu_barrier (); +flush_workqueue (system_wq); + } + +xa_destroy (&clients->xarray); +}drivers/gpu/drm/i915/i915_drm_client.h new file +61
-0@@ -0,0 +1,61 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2020 Intel Corporation +*/ + +#ifndef __I915_DRM_CLIENT_H__ +#define __I915_DRM_CLIENT_H__ + +#include <linux/kref.h> +#include <linux/pid.h> +#include <linux/rcupdate.h> +#include <linux/sched.h> +#include <linux/xarray.h> + +struct drm_i915_private ; + +struct i915_drm_clients { +struct drm_i915_private *i915; + +struct xarray xarray; +u32 next_id; +}; + +struct i915_drm_client { +struct kref kref; + +struct rcu_work rcu; + +unsigned int id; +struct pid *pid; +char *name; +bool closed; + +struct i915_drm_clients *clients; +}; + +void i915_drm_clients_init (struct i915_drm_clients *clients, +struct drm_i915_private *i915); + +static inline struct i915_drm_client * +i915_drm_client_get (struct i915_drm_client *client) +{ +kref_get (&client->kref); +return client; +} + +void __i915_drm_client_free (struct kref *kref); + +static inline void i915_drm_client_put (struct i915_drm_client *client) +{ +kref_put (&client->kref, __i915_drm_client_free); +} + +void i915_drm_client_close (struct i915_drm_client *client); + +struct i915_drm_client *i915_drm_client_add (struct i915_drm_clients *clients, +struct task_struct *task); + +void i915_drm_clients_fini (struct i915_drm_clients *clients); + +#endif /* !__I915_DRM_CLIENT_H__ */ drivers/gpu/drm/i915/i915_drv.c +6
-0@@ -68,6 +68,7 @@#include "gt/intel_rc6.h" #include "i915_debugfs.h" +#include "i915_drm_client.h" #include "i915_drv.h" #include "i915_ioc32.h" #include "i915_irq.h" @@ -343,6 +344,8 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)intel_gt_init_early (&dev_priv->gt, dev_priv); +i915_drm_clients_init (&dev_priv->clients, dev_priv); +i915_gem_init_early (dev_priv);/* This must be called before any calls to HAS_PCH_* */ @@ -362,6 +365,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv) err_gem:i915_gem_cleanup_early (dev_priv); +i915_drm_clients_fini (&dev_priv->clients);intel_gt_driver_late_release (&dev_priv->gt);intel_region_ttm_device_fini (dev_priv); err_ttm:@@ -381,6 +385,7 @@ static void i915_driver_late_release(struct drm_i915_private *dev_priv)intel_irq_fini (dev_priv);intel_power_domains_cleanup (dev_priv);i915_gem_cleanup_early (dev_priv); +i915_drm_clients_fini (&dev_priv->clients);intel_gt_driver_late_release (&dev_priv->gt);intel_region_ttm_device_fini (dev_priv);vlv_suspend_cleanup (dev_priv);@@ -996,6 +1001,7 @@ static void i915_driver_postclose(struct drm_device *dev, struct drm_file *file)struct drm_i915_file_private *file_priv = file->driver_priv;i915_gem_context_close (file); +i915_drm_client_close (file_priv->client);kfree_rcu (file_priv, rcu);drivers/gpu/drm/i915/i915_drv.h +5
-0@@ -96,6 +96,7 @@#include "intel_wakeref.h" #include "intel_wopcm.h" +#include "i915_drm_client.h" #include "i915_gem.h" #include "i915_gem_gtt.h" #include "i915_gpu_error.h" @@ -284,6 +285,8 @@ struct drm_i915_file_private {/** ban_score: Accumulated score of all ctx bans and fast hangs. */ atomic_t ban_score;unsigned long hang_timestamp; + +struct i915_drm_client *client; };/* Interface history: @@ -1218,6 +1221,8 @@ struct drm_i915_private {struct i915_pmu pmu; +struct i915_drm_clients clients; +struct i915_hdcp_comp_master *hdcp_master;bool hdcp_comp_added;drivers/gpu/drm/i915/i915_gem.c +18
-3@@ -1179,25 +1179,40 @@ void i915_gem_cleanup_early(struct drm_i915_private *dev_priv)int i915_gem_open (struct drm_i915_private *i915,struct drm_file *file) {struct drm_i915_file_private *file_priv; -int ret; +struct i915_drm_client *client; +int ret = -ENOMEM ;DRM_DEBUG ("\n" ); file_priv =kzalloc (sizeof (*file_priv),GFP_KERNEL );if (!file_priv) -return -ENOMEM ; + goto err_alloc; + + client =i915_drm_client_add (&i915->clients, current); +if (IS_ERR (client)) { + ret =PTR_ERR (client); + goto err_client; + } file->driver_priv = file_priv; file_priv->dev_priv = i915; file_priv->file = file; + file_priv->client = client; file_priv->bsd_engine =-1 ; file_priv->hang_timestamp = jiffies; ret =i915_gem_context_open (i915, file);if (ret) -kfree (file_priv); + goto err_context; + +return 0 ; +err_context: +i915_drm_client_close (client); +err_client: +kfree (file_priv); +err_alloc:return ret; }Signature · 1 line
2.30.2
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PATCH 1/8] drm/i915: Explicitly track DRM clients
Quoted 64 lines · Daniel Vetter
Quoted 55 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Tracking DRM clients more explicitly will allow later patches to accumulate past and current GPU usage in a centralised place and also consolidate access to owning task pid/name.
Unique client id is also assigned for the purpose of distinguishing/ consolidating between multiple file descriptors owned by the same process.
v2:
Chris Wilson:
* Enclose new members into dedicated structs.
* Protect against failed sysfs registration.v3:
*sysfs_attr_init.v4:
* Fix for internal clients.v5:
* Use cyclic ida for client id. (Chris)
* Do not leak pid reference. (Chris)
* Tidy code with some locals.v6:
* Usexa_alloc_cyclicto simplify locking. (Chris)
* No need to unregister individial sysfs files. (Chris)
* Rebase on top of fpriv kref.
* Track client closed status and reflect in sysfs.v7:
* Makedrm_clientmore standalone concept.v8:
* Simplify sysfs show. (Chris)
* Always track name and pid.v9:
* Fix cyclic id assignment.v10:
* No need for a mutex aroundxa_alloc_cyclic.
* Refactor sysfs into own function.
* Unregister sysfs before freeing pid and name.
* Move clients setup into own function.v11:
* Call clients init directly from driver init. (Chris)v12:
* Do not fail client add on id wrap. (Maciej)v13 (Lucas): Rebase.
Quoted 7 lines
v14:
* Dropped sysfs bits.Signed-off-by Tvrtko Ursulin <[email protected]>Reviewed-by Chris Wilson <[email protected]> # v11Reviewed-by Aravind Iddamsetty <[email protected]> # v11Signed-off-by Chris Wilson <[email protected]>
Quoted 7 lines
On the implementation: I'm not clear why this is a separate object. All that seems to achieve is make the lifetim fun we have in here even more annoying, for not real gain?
What's the reasons for this separate
i915_drm_clientstruct? The commit message talks about de-duping these within the same process, but with fdinfo I'm not seeing the relevance of this anymore.
AFAIR I started with the new fields directly in file_priv (note file_priv then needed to be freed via RCU due sysfs access to it!), but then the idea there was to consolidate new members into a separate struct.
Plan was (and still is in internal) that the concept for DRM client will gain more users/usefulness and would benefit from encapsulation from the start.
For instance at patch 3 in the series it does consolidate i915 users of ctx->pid to go via ctx->client (process name as well). Those are async entry points (compared to file_priv lifetime) from error capture and debugfs. Hm no, debugfs is there no more, only error capture remains.
As you say since the change of direction to use fdinfo, the asynchronous entry path into those members from sysfs is gone. Hence if they were moved back to file_priv, and assuming ctx->pid/name changes to be undone, then file_priv could remain being immediately freed on file close. Or perhaps we lose easy pid/name update for files passed over sockets. I'd have to think about that a bit deeper.
But essentially I think ctx->client is a cleaner design that ctx->pid and given error capture and debugfs can be async to file_priv lifetime that's a benefit for me.
With regards to de-duping multiple fdinfo entries via client->id - that is actually the opposite from what you suggest. Whereas with the sysfs approach we had one entry per client, with fdinfo we have duplicates. So client->id is essential for userspace to correctly account per client statistics.
Quoted 3 lines
Also, with the fdinfo approach, why do we still need to even track the pid? That can be all figured out from proc now, with much cleaner semantics.
Not sure what you mean here. As explained above pid is tracked as replacement for current ctx->pid tracking. So for uses inside i915.
Also note that even from userspace semantics of getting the pid from procfs is not necessarily clean, since actually three different file descriptors need to be open to get the whole set of data.
/proc/<pid>/fdinfo/<fd> - obviously
/proc/<pid>/fd/<fd> - to filter out non drm fds avoiding text parsing above file /proc/<pid>/stat - to get the pid
Since in the intel_gpu_top conversion I do keep the /proc/<pid> open and do the rest via openat, I am hoping at least that's safe againt pid swaps. For the file descriptor cross check it is more questionable but worst case the drm fd check via stat could be dropped and replaced with more fdinfo text parsing.
Having the pid and process name in fdinfo hence makes this easier and potentially safer. Given how we already store ctx->pid I think that should be fine.
FWIW I still think the whole approach is bad since number of operations required scales with number of non drm processes (even threads) on the system.
Regards,
Tvrtko
Quoted 336 lines
Quoted 336 lines
--- drivers/gpu/drm/i915/Makefile | 5 +- drivers/gpu/drm/i915/i915_drm_client.c | 113 +++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_drm_client.h | 61 +++++++++++++ drivers/gpu/drm/i915/i915_drv.c | 6 ++ drivers/gpu/drm/i915/i915_drv.h | 5 ++ drivers/gpu/drm/i915/i915_gem.c | 21 ++++- 6 files changed, 206 insertions(+), 5 deletions(-)create mode 100644
drivers/gpu/drm/i915/i915_drm_client.ccreate mode 100644drivers/gpu/drm/i915/i915_drm_client.hdrivers/gpu/drm/i915/Makefile +3
-2@@ -33,8 +33,9 @@ subdir-ccflags-y += -I$(srctree)/$(src) # Please keep these build lists sorted! # core driver code -i915-y += i915_drv.o \ - i915_config.o \ +i915-y += i915_config.o \ + i915_drm_client.o \ + i915_drv.o \ i915_irq.o \ i915_getparam.o \ i915_mitigations.o \drivers/gpu/drm/i915/i915_drm_client.c new file +113
-0@@ -0,0 +1,113 @@ +// SPDX-License-Identifier: MIT +/* +* Copyright © 2020 Intel Corporation +*/ + +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/types.h> + +#include "i915_drm_client.h" +#include "i915_gem.h" +#include "i915_utils.h" + +void i915_drm_clients_init (struct i915_drm_clients *clients, +struct drm_i915_private *i915) +{ + clients->i915 = i915; + + clients->next_id =0 ; +xa_init_flags (&clients->xarray,XA_FLAGS_ALLOC ); +} + +static int +__i915_drm_client_register (struct i915_drm_client *client, +struct task_struct *task) +{ +char *name; + + name =kstrdup (task->comm,GFP_KERNEL ); +if (!name) +return -ENOMEM ; + + client->pid =get_task_pid (task,PIDTYPE_PID ); + client->name = name; + +return 0 ; +} + +static void __i915_drm_client_unregister (struct i915_drm_client *client) +{ +put_pid (fetch_and_zero (&client->pid)); +kfree (fetch_and_zero (&client->name)); +} + +static void __rcu_i915_drm_client_free (struct work_struct *wrk) +{ +struct i915_drm_client *client = +container_of (wrk,typeof (*client), rcu.work); + +xa_erase (&client->clients->xarray, client->id); + +__i915_drm_client_unregister (client); + +kfree (client); +} + +struct i915_drm_client * +i915_drm_client_add (struct i915_drm_clients *clients,struct task_struct *task) +{ +struct i915_drm_client *client; +int ret; + + client =kzalloc (sizeof (*client),GFP_KERNEL ); +if (!client) +return ERR_PTR (-ENOMEM ); + +kref_init (&client->kref); + client->clients = clients; +INIT_RCU_WORK (&client->rcu, __rcu_i915_drm_client_free); + + ret =xa_alloc_cyclic (&clients->xarray, &client->id, client, + xa_limit_32b, &clients->next_id,GFP_KERNEL ); +if (ret <0 ) + goto err_id; + + ret =__i915_drm_client_register (client, task); +if (ret) + goto err_register; + +return client; + +err_register: +xa_erase (&clients->xarray, client->id); +err_id: +kfree (client); + +return ERR_PTR (ret); +} + +void __i915_drm_client_free (struct kref *kref) +{ +struct i915_drm_client *client = +container_of (kref,typeof (*client), kref); + +queue_rcu_work (system_wq, &client->rcu); +} + +void i915_drm_client_close (struct i915_drm_client *client) +{ +GEM_BUG_ON (READ_ONCE (client->closed)); +WRITE_ONCE (client->closed, true); +i915_drm_client_put (client); +} + +void i915_drm_clients_fini (struct i915_drm_clients *clients) +{ +while (!xa_empty (&clients->xarray)) { +rcu_barrier (); +flush_workqueue (system_wq); + } + +xa_destroy (&clients->xarray); +}drivers/gpu/drm/i915/i915_drm_client.h new file +61
-0@@ -0,0 +1,61 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2020 Intel Corporation +*/ + +#ifndef __I915_DRM_CLIENT_H__ +#define __I915_DRM_CLIENT_H__ + +#include <linux/kref.h> +#include <linux/pid.h> +#include <linux/rcupdate.h> +#include <linux/sched.h> +#include <linux/xarray.h> + +struct drm_i915_private ; + +struct i915_drm_clients { +struct drm_i915_private *i915; + +struct xarray xarray; +u32 next_id; +}; + +struct i915_drm_client { +struct kref kref; + +struct rcu_work rcu; + +unsigned int id; +struct pid *pid; +char *name; +bool closed; + +struct i915_drm_clients *clients; +}; + +void i915_drm_clients_init (struct i915_drm_clients *clients, +struct drm_i915_private *i915); + +static inline struct i915_drm_client * +i915_drm_client_get (struct i915_drm_client *client) +{ +kref_get (&client->kref); +return client; +} + +void __i915_drm_client_free (struct kref *kref); + +static inline void i915_drm_client_put (struct i915_drm_client *client) +{ +kref_put (&client->kref, __i915_drm_client_free); +} + +void i915_drm_client_close (struct i915_drm_client *client); + +struct i915_drm_client *i915_drm_client_add (struct i915_drm_clients *clients, +struct task_struct *task); + +void i915_drm_clients_fini (struct i915_drm_clients *clients); + +#endif /* !__I915_DRM_CLIENT_H__ */ drivers/gpu/drm/i915/i915_drv.c +6
-0@@ -68,6 +68,7 @@#include "gt/intel_rc6.h" #include "i915_debugfs.h" +#include "i915_drm_client.h" #include "i915_drv.h" #include "i915_ioc32.h" #include "i915_irq.h" @@ -343,6 +344,8 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)intel_gt_init_early (&dev_priv->gt, dev_priv); +i915_drm_clients_init (&dev_priv->clients, dev_priv); +i915_gem_init_early (dev_priv);/* This must be called before any calls to HAS_PCH_* */ @@ -362,6 +365,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv) err_gem:i915_gem_cleanup_early (dev_priv); +i915_drm_clients_fini (&dev_priv->clients);intel_gt_driver_late_release (&dev_priv->gt);intel_region_ttm_device_fini (dev_priv); err_ttm:@@ -381,6 +385,7 @@ static void i915_driver_late_release(struct drm_i915_private *dev_priv)intel_irq_fini (dev_priv);intel_power_domains_cleanup (dev_priv);i915_gem_cleanup_early (dev_priv); +i915_drm_clients_fini (&dev_priv->clients);intel_gt_driver_late_release (&dev_priv->gt);intel_region_ttm_device_fini (dev_priv);vlv_suspend_cleanup (dev_priv);@@ -996,6 +1001,7 @@ static void i915_driver_postclose(struct drm_device *dev, struct drm_file *file)struct drm_i915_file_private *file_priv = file->driver_priv;i915_gem_context_close (file); +i915_drm_client_close (file_priv->client);kfree_rcu (file_priv, rcu);drivers/gpu/drm/i915/i915_drv.h +5
-0@@ -96,6 +96,7 @@#include "intel_wakeref.h" #include "intel_wopcm.h" +#include "i915_drm_client.h" #include "i915_gem.h" #include "i915_gem_gtt.h" #include "i915_gpu_error.h" @@ -284,6 +285,8 @@ struct drm_i915_file_private {/** ban_score: Accumulated score of all ctx bans and fast hangs. */ atomic_t ban_score;unsigned long hang_timestamp; + +struct i915_drm_client *client; };/* Interface history: @@ -1218,6 +1221,8 @@ struct drm_i915_private {struct i915_pmu pmu; +struct i915_drm_clients clients; +struct i915_hdcp_comp_master *hdcp_master;bool hdcp_comp_added;drivers/gpu/drm/i915/i915_gem.c +18
-3@@ -1179,25 +1179,40 @@ void i915_gem_cleanup_early(struct drm_i915_private *dev_priv)int i915_gem_open (struct drm_i915_private *i915,struct drm_file *file) {struct drm_i915_file_private *file_priv; -int ret; +struct i915_drm_client *client; +int ret = -ENOMEM ;DRM_DEBUG ("\n" ); file_priv =kzalloc (sizeof (*file_priv),GFP_KERNEL );if (!file_priv) -return -ENOMEM ; + goto err_alloc; + + client =i915_drm_client_add (&i915->clients, current); +if (IS_ERR (client)) { + ret =PTR_ERR (client); + goto err_client; + } file->driver_priv = file_priv; file_priv->dev_priv = i915; file_priv->file = file; + file_priv->client = client; file_priv->bsd_engine =-1 ; file_priv->hang_timestamp = jiffies; ret =i915_gem_context_open (i915, file);if (ret) -kfree (file_priv); + goto err_context; + +return 0 ; +err_context: +i915_drm_client_close (client); +err_client: +kfree (file_priv); +err_alloc:return ret; }
Quoted 4 lines
Quoted 3 lines
Signature · 1 line
2.30.2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/8] drm/i915: Explicitly track DRM clients
Quoted 70 lines · Tvrtko Ursulin
Quoted 68 lines · Daniel Vetter
Quoted 55 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Tracking DRM clients more explicitly will allow later patches to accumulate past and current GPU usage in a centralised place and also consolidate access to owning task pid/name.
Unique client id is also assigned for the purpose of distinguishing/ consolidating between multiple file descriptors owned by the same process.
v2:
Chris Wilson:
* Enclose new members into dedicated structs.
* Protect against failed sysfs registration.v3:
*sysfs_attr_init.v4:
* Fix for internal clients.v5:
* Use cyclic ida for client id. (Chris)
* Do not leak pid reference. (Chris)
* Tidy code with some locals.v6:
* Usexa_alloc_cyclicto simplify locking. (Chris)
* No need to unregister individial sysfs files. (Chris)
* Rebase on top of fpriv kref.
* Track client closed status and reflect in sysfs.v7:
* Makedrm_clientmore standalone concept.v8:
* Simplify sysfs show. (Chris)
* Always track name and pid.v9:
* Fix cyclic id assignment.v10:
* No need for a mutex aroundxa_alloc_cyclic.
* Refactor sysfs into own function.
* Unregister sysfs before freeing pid and name.
* Move clients setup into own function.v11:
* Call clients init directly from driver init. (Chris)v12:
* Do not fail client add on id wrap. (Maciej)v13 (Lucas): Rebase.
Quoted 7 lines
v14:
* Dropped sysfs bits.Signed-off-by Tvrtko Ursulin <[email protected]>Reviewed-by Chris Wilson <[email protected]> # v11Reviewed-by Aravind Iddamsetty <[email protected]> # v11Signed-off-by Chris Wilson <[email protected]>On the implementation: I'm not clear why this is a separate object. All that seems to achieve is make the lifetim fun we have in here even more annoying, for not real gain?
Quoted 7 lines
Quoted 3 lines
What's the reasons for this separate
i915_drm_clientstruct? The commit message talks about de-duping these within the same process, but with fdinfo I'm not seeing the relevance of this anymore.AFAIR I started with the new fields directly in
file_priv(notefile_privthen needed to be freed via RCU due sysfs access to it!), but then the idea there was to consolidate new members into a separate struct.
Yeah separate struct makes sense for this stuff, just to encapsulate/document things a bit. It's the entire scaffolding around it that I don't think makes sense anymore with the design switch to fdinfo.
Quoted 16 lines
Plan was (and still is in internal) that the concept for DRM client will gain more users/usefulness and would benefit from encapsulation from the start.
For instance at patch 3 in the series it does consolidate i915 users of
ctx->pidto go viactx->client(process name as well). Those are async entry points (compared tofile_privlifetime) from error capture and debugfs. Hm no, debugfs is there no more, only error capture remains.As you say since the change of direction to use fdinfo, the asynchronous entry path into those members from sysfs is gone. Hence if they were moved back to
file_priv, and assuming ctx->pid/name changes to be undone, thenfile_privcould remain being immediately freed on file close. Or perhaps we lose easy pid/name update for files passed over sockets. I'd have to think about that a bit deeper.
Quoted 3 lines
But essentially I think
ctx->clientis a cleaner design thatctx->pidand given error capture and debugfs can be async tofile_privlifetime that's a benefit for me.
From a quick check it's just for debug printing when a ctx hung/got banned, and for that we do want the pid - users won't have an understanding of a drm_client. I think pid is actually what we want there.
Quoted 4 lines
With regards to de-duping multiple fdinfo entries via
client->id- that is actually the opposite from what you suggest. Whereas with the sysfs approach we had one entry per client, with fdinfo we have duplicates. Soclient->idis essential for userspace to correctly account per client statistics.
Uh why? Like if you use fdinfo and have a bunch of duplicate drm_file, then your parsing tool can aggregate them all together under the same pid. No need we do that in the kernel.
If the problem is that we can't tell apart a dup'ed fd from multiple open() calls, then I think that should be solved by dropping the hash of the drm_file pointer into the fdinfo.
Quoted 6 lines
Quoted 3 lines
Also, with the fdinfo approach, why do we still need to even track the pid? That can be all figured out from proc now, with much cleaner semantics.
Not sure what you mean here. As explained above pid is tracked as replacement for current
ctx->pidtracking. So for uses inside i915.
Why do we need to track that for that info file?
Quoted 8 lines
Also note that even from userspace semantics of getting the pid from procfs is not necessarily clean, since actually three different file descriptors need to be open to get the whole set of data.
/proc/<pid>/fdinfo/<fd> - obviously
/proc/<pid>/fd/<fd> - to filter out non drm fds avoiding text parsing above file
/proc/<pid>/stat - to get the pid
Well yes userspace needs to keep track of a few things. top works like that too.
Quoted 9 lines
Since in the
intel_gpu_topconversion I do keep the /proc/<pid> open and do the rest via openat, I am hoping at least that's safe againt pid swaps. For the file descriptor cross check it is more questionable but worst case the drm fd check via stat could be dropped and replaced with more fdinfo text parsing.Having the pid and process name in fdinfo hence makes this easier and potentially safer. Given how we already store
ctx->pidI think that should be fine.
Uh no. We need to understand either the procfs rules, or what we need to understand them. Re-rolling our own interpretation of pid within something that already has the pid seems very broken.
I do expect openat to work.
Quoted 3 lines
FWIW I still think the whole approach is bad since number of operations required scales with number of non drm processes (even threads) on the system.
top works.
-Daniel
Quoted 323 lines
Regards,
Tvrtko
Quoted 319 lines
Quoted 318 lines
--- drivers/gpu/drm/i915/Makefile | 5 +- drivers/gpu/drm/i915/i915_drm_client.c | 113 +++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_drm_client.h | 61 +++++++++++++ drivers/gpu/drm/i915/i915_drv.c | 6 ++ drivers/gpu/drm/i915/i915_drv.h | 5 ++ drivers/gpu/drm/i915/i915_gem.c | 21 ++++- 6 files changed, 206 insertions(+), 5 deletions(-)create mode 100644
drivers/gpu/drm/i915/i915_drm_client.ccreate mode 100644drivers/gpu/drm/i915/i915_drm_client.hdrivers/gpu/drm/i915/Makefile +3
-2@@ -33,8 +33,9 @@ subdir-ccflags-y += -I$(srctree)/$(src) # Please keep these build lists sorted! # core driver code -i915-y += i915_drv.o \ - i915_config.o \ +i915-y += i915_config.o \ + i915_drm_client.o \ + i915_drv.o \ i915_irq.o \ i915_getparam.o \ i915_mitigations.o \drivers/gpu/drm/i915/i915_drm_client.c new file +113
-0@@ -0,0 +1,113 @@ +// SPDX-License-Identifier: MIT +/* +* Copyright © 2020 Intel Corporation +*/ + +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/types.h> + +#include "i915_drm_client.h" +#include "i915_gem.h" +#include "i915_utils.h" + +void i915_drm_clients_init (struct i915_drm_clients *clients, +struct drm_i915_private *i915) +{ + clients->i915 = i915; + + clients->next_id =0 ; +xa_init_flags (&clients->xarray,XA_FLAGS_ALLOC ); +} + +static int +__i915_drm_client_register (struct i915_drm_client *client, +struct task_struct *task) +{ +char *name; + + name =kstrdup (task->comm,GFP_KERNEL ); +if (!name) +return -ENOMEM ; + + client->pid =get_task_pid (task,PIDTYPE_PID ); + client->name = name; + +return 0 ; +} + +static void __i915_drm_client_unregister (struct i915_drm_client *client) +{ +put_pid (fetch_and_zero (&client->pid)); +kfree (fetch_and_zero (&client->name)); +} + +static void __rcu_i915_drm_client_free (struct work_struct *wrk) +{ +struct i915_drm_client *client = +container_of (wrk,typeof (*client), rcu.work); + +xa_erase (&client->clients->xarray, client->id); + +__i915_drm_client_unregister (client); + +kfree (client); +} + +struct i915_drm_client * +i915_drm_client_add (struct i915_drm_clients *clients,struct task_struct *task) +{ +struct i915_drm_client *client; +int ret; + + client =kzalloc (sizeof (*client),GFP_KERNEL ); +if (!client) +return ERR_PTR (-ENOMEM ); + +kref_init (&client->kref); + client->clients = clients; +INIT_RCU_WORK (&client->rcu, __rcu_i915_drm_client_free); + + ret =xa_alloc_cyclic (&clients->xarray, &client->id, client, + xa_limit_32b, &clients->next_id,GFP_KERNEL ); +if (ret <0 ) + goto err_id; + + ret =__i915_drm_client_register (client, task); +if (ret) + goto err_register; + +return client; + +err_register: +xa_erase (&clients->xarray, client->id); +err_id: +kfree (client); + +return ERR_PTR (ret); +} + +void __i915_drm_client_free (struct kref *kref) +{ +struct i915_drm_client *client = +container_of (kref,typeof (*client), kref); + +queue_rcu_work (system_wq, &client->rcu); +} + +void i915_drm_client_close (struct i915_drm_client *client) +{ +GEM_BUG_ON (READ_ONCE (client->closed)); +WRITE_ONCE (client->closed, true); +i915_drm_client_put (client); +} + +void i915_drm_clients_fini (struct i915_drm_clients *clients) +{ +while (!xa_empty (&clients->xarray)) { +rcu_barrier (); +flush_workqueue (system_wq); + } + +xa_destroy (&clients->xarray); +}drivers/gpu/drm/i915/i915_drm_client.h new file +61
-0@@ -0,0 +1,61 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2020 Intel Corporation +*/ + +#ifndef __I915_DRM_CLIENT_H__ +#define __I915_DRM_CLIENT_H__ + +#include <linux/kref.h> +#include <linux/pid.h> +#include <linux/rcupdate.h> +#include <linux/sched.h> +#include <linux/xarray.h> + +struct drm_i915_private ; + +struct i915_drm_clients { +struct drm_i915_private *i915; + +struct xarray xarray; +u32 next_id; +}; + +struct i915_drm_client { +struct kref kref; + +struct rcu_work rcu; + +unsigned int id; +struct pid *pid; +char *name; +bool closed; + +struct i915_drm_clients *clients; +}; + +void i915_drm_clients_init (struct i915_drm_clients *clients, +struct drm_i915_private *i915); + +static inline struct i915_drm_client * +i915_drm_client_get (struct i915_drm_client *client) +{ +kref_get (&client->kref); +return client; +} + +void __i915_drm_client_free (struct kref *kref); + +static inline void i915_drm_client_put (struct i915_drm_client *client) +{ +kref_put (&client->kref, __i915_drm_client_free); +} + +void i915_drm_client_close (struct i915_drm_client *client); + +struct i915_drm_client *i915_drm_client_add (struct i915_drm_clients *clients, +struct task_struct *task); + +void i915_drm_clients_fini (struct i915_drm_clients *clients); + +#endif /* !__I915_DRM_CLIENT_H__ */ drivers/gpu/drm/i915/i915_drv.c +6
-0@@ -68,6 +68,7 @@#include "gt/intel_rc6.h" #include "i915_debugfs.h" +#include "i915_drm_client.h" #include "i915_drv.h" #include "i915_ioc32.h" #include "i915_irq.h" @@ -343,6 +344,8 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)intel_gt_init_early (&dev_priv->gt, dev_priv); +i915_drm_clients_init (&dev_priv->clients, dev_priv); +i915_gem_init_early (dev_priv);/* This must be called before any calls to HAS_PCH_* */ @@ -362,6 +365,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv) err_gem:i915_gem_cleanup_early (dev_priv); +i915_drm_clients_fini (&dev_priv->clients);intel_gt_driver_late_release (&dev_priv->gt);intel_region_ttm_device_fini (dev_priv); err_ttm:@@ -381,6 +385,7 @@ static void i915_driver_late_release(struct drm_i915_private *dev_priv)intel_irq_fini (dev_priv);intel_power_domains_cleanup (dev_priv);i915_gem_cleanup_early (dev_priv); +i915_drm_clients_fini (&dev_priv->clients);intel_gt_driver_late_release (&dev_priv->gt);intel_region_ttm_device_fini (dev_priv);vlv_suspend_cleanup (dev_priv);@@ -996,6 +1001,7 @@ static void i915_driver_postclose(struct drm_device *dev, struct drm_file *file)struct drm_i915_file_private *file_priv = file->driver_priv;i915_gem_context_close (file); +i915_drm_client_close (file_priv->client);kfree_rcu (file_priv, rcu);drivers/gpu/drm/i915/i915_drv.h +5
-0@@ -96,6 +96,7 @@#include "intel_wakeref.h" #include "intel_wopcm.h" +#include "i915_drm_client.h" #include "i915_gem.h" #include "i915_gem_gtt.h" #include "i915_gpu_error.h" @@ -284,6 +285,8 @@ struct drm_i915_file_private {/** ban_score: Accumulated score of all ctx bans and fast hangs. */ atomic_t ban_score;unsigned long hang_timestamp; + +struct i915_drm_client *client; };/* Interface history: @@ -1218,6 +1221,8 @@ struct drm_i915_private {struct i915_pmu pmu; +struct i915_drm_clients clients; +struct i915_hdcp_comp_master *hdcp_master;bool hdcp_comp_added;drivers/gpu/drm/i915/i915_gem.c +18
-3@@ -1179,25 +1179,40 @@ void i915_gem_cleanup_early(struct drm_i915_private *dev_priv)int i915_gem_open (struct drm_i915_private *i915,struct drm_file *file) {struct drm_i915_file_private *file_priv; -int ret; +struct i915_drm_client *client; +int ret = -ENOMEM ;DRM_DEBUG ("\n" ); file_priv =kzalloc (sizeof (*file_priv),GFP_KERNEL );if (!file_priv) -return -ENOMEM ; + goto err_alloc; + + client =i915_drm_client_add (&i915->clients, current); +if (IS_ERR (client)) { + ret =PTR_ERR (client); + goto err_client; + } file->driver_priv = file_priv; file_priv->dev_priv = i915; file_priv->file = file; + file_priv->client = client; file_priv->bsd_engine =-1 ; file_priv->hang_timestamp = jiffies; ret =i915_gem_context_open (i915, file);if (ret) -kfree (file_priv); + goto err_context; + +return 0 ; +err_context: +i915_drm_client_close (client); +err_client: +kfree (file_priv); +err_alloc:return ret; }Signature · 1 line
2.30.2
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PATCH 1/8] drm/i915: Explicitly track DRM clients
Quoted 75 lines · Daniel Vetter
Quoted 74 lines · Tvrtko Ursulin
Quoted 71 lines · Daniel Vetter
Quoted 55 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Tracking DRM clients more explicitly will allow later patches to accumulate past and current GPU usage in a centralised place and also consolidate access to owning task pid/name.
Unique client id is also assigned for the purpose of distinguishing/ consolidating between multiple file descriptors owned by the same process.
v2:
Chris Wilson:
* Enclose new members into dedicated structs.
* Protect against failed sysfs registration.v3:
*sysfs_attr_init.v4:
* Fix for internal clients.v5:
* Use cyclic ida for client id. (Chris)
* Do not leak pid reference. (Chris)
* Tidy code with some locals.v6:
* Usexa_alloc_cyclicto simplify locking. (Chris)
* No need to unregister individial sysfs files. (Chris)
* Rebase on top of fpriv kref.
* Track client closed status and reflect in sysfs.v7:
* Makedrm_clientmore standalone concept.v8:
* Simplify sysfs show. (Chris)
* Always track name and pid.v9:
* Fix cyclic id assignment.v10:
* No need for a mutex aroundxa_alloc_cyclic.
* Refactor sysfs into own function.
* Unregister sysfs before freeing pid and name.
* Move clients setup into own function.v11:
* Call clients init directly from driver init. (Chris)v12:
* Do not fail client add on id wrap. (Maciej)v13 (Lucas): Rebase.
Quoted 7 lines
v14:
* Dropped sysfs bits.Signed-off-by Tvrtko Ursulin <[email protected]>Reviewed-by Chris Wilson <[email protected]> # v11Reviewed-by Aravind Iddamsetty <[email protected]> # v11Signed-off-by Chris Wilson <[email protected]>On the implementation: I'm not clear why this is a separate object. All that seems to achieve is make the lifetim fun we have in here even more annoying, for not real gain?
What's the reasons for this separate
i915_drm_clientstruct? The commit message talks about de-duping these within the same process, but with fdinfo I'm not seeing the relevance of this anymore.
Quoted 7 lines
Quoted 3 lines
AFAIR I started with the new fields directly in
file_priv(notefile_privthen needed to be freed via RCU due sysfs access to it!), but then the idea there was to consolidate new members into a separate struct.Yeah separate struct makes sense for this stuff, just to encapsulate/document things a bit. It's the entire scaffolding around it that I don't think makes sense anymore with the design switch to fdinfo.
So if I just drop the client name updating and lock/RCU used to query said client data locklessly you would be happy with that?
Quoted 24 lines
Quoted 16 lines
Plan was (and still is in internal) that the concept for DRM client will gain more users/usefulness and would benefit from encapsulation from the start.
For instance at patch 3 in the series it does consolidate i915 users of
ctx->pidto go viactx->client(process name as well). Those are async entry points (compared tofile_privlifetime) from error capture and debugfs. Hm no, debugfs is there no more, only error capture remains.As you say since the change of direction to use fdinfo, the asynchronous entry path into those members from sysfs is gone. Hence if they were moved back to
file_priv, and assuming ctx->pid/name changes to be undone, thenfile_privcould remain being immediately freed on file close. Or perhaps we lose easy pid/name update for files passed over sockets. I'd have to think about that a bit deeper.Quoted 5 lines
But essentially I think
ctx->clientis a cleaner design thatctx->pidand given error capture and debugfs can be async tofile_privlifetime that's a benefit for me.From a quick check it's just for debug printing when a ctx hung/got
banned, and for that we do want the pid - users won't have an understanding of a
drm_client. I think pid is actually what we want there.
Quoted 8 lines
Quoted 4 lines
With regards to de-duping multiple fdinfo entries via
client->id- that is actually the opposite from what you suggest. Whereas with the sysfs approach we had one entry per client, with fdinfo we have duplicates. Soclient->idis essential for userspace to correctly account per client statistics.Uh why? Like if you use fdinfo and have a bunch of duplicate
drm_file, then your parsing tool can aggregate them all together under the same pid. No need we do that in the kernel.
It's not done in the kernel. It's just userspace which needs an unique key.
Quoted 3 lines
If the problem is that we can't tell apart a dup'ed fd from multiple
open()calls, then I think that should be solved by dropping the hash of thedrm_filepointer into the fdinfo.
Yes hash would work as long as fdinfo is the only way in since then lifetime rules are aligned. Or I just keep the id as is since I am keeping the client encapsulation, which is simpler.
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Also, with the fdinfo approach, why do we still need to even track the pid? That can be all figured out from proc now, with much cleaner semantics.
Not sure what you mean here. As explained above pid is tracked as replacement for current
ctx->pidtracking. So for uses inside i915.Why do we need to track that for that info file?
It's not an absolute requirement. As I was explaining it was consolidating all accesses to pid/process name, with included update upon context create for shared file descriptors. It was two nice benefits IMHO, but if you disagree I can easily drop it. Ctx->pid then remains fixed to the value of the original opener and that's it.
Quoted 22 lines
Quoted 8 lines
Also note that even from userspace semantics of getting the pid from procfs is not necessarily clean, since actually three different file descriptors need to be open to get the whole set of data.
/proc/<pid>/fdinfo/<fd> - obviously
/proc/<pid>/fd/<fd> - to filter out non drm fds avoiding text parsing above file
/proc/<pid>/stat - to get the pidWell yes userspace needs to keep track of a few things. top works like that too.
Quoted 9 lines
Since in the
intel_gpu_topconversion I do keep the /proc/<pid> open and do the rest via openat, I am hoping at least that's safe againt pid swaps. For the file descriptor cross check it is more questionable but worst case the drm fd check via stat could be dropped and replaced with more fdinfo text parsing.Having the pid and process name in fdinfo hence makes this easier and potentially safer. Given how we already store
ctx->pidI think that should be fine.
Quoted 5 lines
Uh no. We need to understand either the procfs rules, or what we need to understand them. Re-rolling our own interpretation of pid within something that already has the pid seems very broken.
I do expect openat to work.
Yes me too. I mostly worry that someone will get it wrong because they would use string/path based access.
Quoted 5 lines
Quoted 3 lines
FWIW I still think the whole approach is bad since number of operations required scales with number of non drm processes (even threads) on the system.
top works.
So does a flat headed screwdriver for chiseling a short channel in soft walls. :) Relax, I am doing fdinfo as you can see, and yes it works for top. Simply stating it is very algorithmically inefficient for pure _gpu_ top.
Hm wait.. fdinfo actually cannot show persistent contexts. Process exits leaves a hog on the GPU and it will be invisible via fdinfo who was to blame. :( Sysfs implementation did not have that problem and it would show it as a closed client with a name and old pid. Tough luck I guess.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/8 drm/i915: Update client name on context create
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Some clients have the DRM fd passed to them over a socket by the X server.
Grab the real client and pid when they create their first context and update the exposed data for more useful enumeration.
To enable lockless access to client name and pid data from the following patches, we also make these fields rcu protected. In this way asynchronous code paths where both contexts which remain after the client exit, and access to client name and pid as they are getting updated due context creation running in parallel with name/pid queries.
v2:
* Do not leak the pid reference and borrow context idr_lock. (Chris)
v3:
* More avoiding leaks. (Chris)
v4:
* Move update completely to drm client. (Chris)
* Do not lose previous client data on failure to re-register and simplify update to only touch what it needs.
v5:
* Reuse ext_data local. (Chris)
--- drivers/gpu/drm/i915/gem/i915_gem_context.c | 5 ++ drivers/gpu/drm/i915/i915_drm_client.c | 66 +++++++++++++++++++-- drivers/gpu/drm/i915/i915_drm_client.h | 34 ++++++++++- 3 files changed, 97 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_context.c +5 -0
@@ -78,6 +78,7 @@#include "gt/intel_gpu_commands.h" #include "gt/intel_ring.h" +#include "i915_drm_client.h" #include "i915_gem_context.h" #include "i915_globals.h" #include "i915_trace.h"
@@ -1996,6 +1997,10 @@ int i915_gem_context_create_ioctl(struct drm_device *dev, void *data, goto err_pc; } + ret =i915_drm_client_update (ext_data.fpriv->client, current); +if (ret) + goto err_pc; +if (GRAPHICS_VER (i915) >12 ) {struct i915_gem_context *ctx;
drivers/gpu/drm/i915/i915_drm_client.c +60 -6
105 lines not on this page · raw message
drivers/gpu/drm/i915/i915_drm_client.h +32 -2
@@ -7,6 +7,7 @@#define __I915_DRM_CLIENT_H__#include <linux/kref.h> +#include <linux/mutex.h> #include <linux/pid.h> #include <linux/rcupdate.h> #include <linux/sched.h>
@@ -21,14 +22,22 @@ struct i915_drm_clients {u32 next_id; }; +struct i915_drm_client_name { +struct rcu_head rcu; +struct i915_drm_client *client; +struct pid *pid; +char name[]; +}; +struct i915_drm_client {struct kref kref;struct rcu_work rcu; +struct mutex update_lock;/* Serializes name and pid updates. */ +unsigned int id; -struct pid *pid; -char *name; +struct i915_drm_client_name __rcu *name;bool closed;struct i915_drm_clients *clients;
@@ -56,6 +65,27 @@ void i915_drm_client_close(struct i915_drm_client *client);struct i915_drm_client *i915_drm_client_add (struct i915_drm_clients *clients,struct task_struct *task); +int i915_drm_client_update (struct i915_drm_client *client, +struct task_struct *task); + +static inline const struct i915_drm_client_name * +__i915_drm_client_name (const struct i915_drm_client *client) +{ +return rcu_dereference (client->name); +} + +static inline const char * +i915_drm_client_name (const struct i915_drm_client *client) +{ +return __i915_drm_client_name (client)->name; +} + +static inline struct pid * +i915_drm_client_pid (const struct i915_drm_client *client) +{ +return __i915_drm_client_name (client)->pid; +} +void i915_drm_clients_fini (struct i915_drm_clients *clients);#endif /* !__I915_DRM_CLIENT_H__ */
Signature · 1 line
2.30.2
PATCH 3/8 drm/i915: Make GEM contexts track DRM clients
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
If we make GEM contexts keep a reference to i915_drm_client for the whole of their lifetime, we can consolidate the current task pid and name usage by getting it from the client.
v2: Don't bother supporting selftests contexts from debugfs. (Chris) v3 (Lucas): Finish constructing ctx before adding it to the list v4 (Ram): Rebase.
v5: Trivial rebase for proto ctx changes.
--- drivers/gpu/drm/i915/gem/i915_gem_context.c | 13 +++++++---- .../gpu/drm/i915/gem/i915_gem_context_types.h | 13 +++-------- drivers/gpu/drm/i915/i915_gpu_error.c | 22 +++++++++++-------- 3 files changed, 25 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_context.c +9 -4
@@ -989,10 +989,11 @@ void i915_gem_context_release(struct kref *ref)trace_i915_context_free (ctx);GEM_BUG_ON (!i915_gem_context_is_closed (ctx)); +if (ctx->client) +i915_drm_client_put (ctx->client); +mutex_destroy (&ctx->engines_mutex);mutex_destroy (&ctx->lut_mutex); - -put_pid (ctx->pid);mutex_destroy (&ctx->mutex);kfree_rcu (ctx, rcu);
@@ -1436,9 +1437,13 @@ static void gem_context_register(struct i915_gem_context *ctx, ctx->file_priv = fpriv; - ctx->pid =get_task_pid (current,PIDTYPE_PID ); + ctx->client =i915_drm_client_get (fpriv->client); + +rcu_read_lock ();snprintf (ctx->name,sizeof (ctx->name),"%s[%d]" , - current->comm,pid_nr (ctx->pid)); +i915_drm_client_name (ctx->client), +pid_nr (i915_drm_client_pid (ctx->client))); +rcu_read_unlock ();/* And finally expose ourselves to userspace via the idr */ old =xa_store (&fpriv->context_xa, id, ctx,GFP_KERNEL );
drivers/gpu/drm/i915/gem/i915_gem_context_types.h +3 -10
@@ -264,19 +264,12 @@ struct i915_gem_context {*/ struct i915_address_space __rcu *vm; -/** -* @pid: process id of creator -* -* Note that who created the context may not be the principle user, -* as the context may be shared across a local socket. However, -* that should only affect the default context, all contexts created -* explicitly by the client are expected to be isolated. -*/ -struct pid *pid; -/** @link: place with &drm_i915_private.context_list */ struct list_head link; +/** @client: struct i915_drm_client */ +struct i915_drm_client *client; +/** * @ref: reference count *
drivers/gpu/drm/i915/i915_gpu_error.c +13 -9
@@ -1235,7 +1235,9 @@ static void record_request(const struct i915_request *request, ctx =rcu_dereference (request->context->gem_context);if (ctx) - erq->pid =pid_nr (ctx->pid); + erq->pid =I915_SELFTEST_ONLY (!ctx->client) ? +0 : +pid_nr (i915_drm_client_pid (ctx->client)); }rcu_read_unlock (); }
@@ -1256,23 +1258,25 @@ static bool record_context(struct i915_gem_context_coredump *e, const struct i915_request *rq) {struct i915_gem_context *ctx; -struct task_struct *task;bool simulated;rcu_read_lock (); + ctx =rcu_dereference (rq->context->gem_context);if (ctx && !kref_get_unless_zero (&ctx->ref)) ctx =NULL ; -rcu_read_unlock (); -if (!ctx) +if (!ctx) { +rcu_read_unlock ();return true; + } -rcu_read_lock (); - task =pid_task (ctx->pid,PIDTYPE_PID ); -if (task) { -strcpy (e->comm, task->comm); - e->pid = task->pid; +if (I915_SELFTEST_ONLY (!ctx->client)) { +strcpy (e->comm,"[kernel]" ); + }else { +strcpy (e->comm,i915_drm_client_name (ctx->client)); + e->pid =pid_nr (i915_drm_client_pid (ctx->client)); } +rcu_read_unlock (); e->sched_attr = ctx->sched;
Signature · 6 lines
2.30.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/8 drm/i915: Track runtime spent in closed and unreachable GEM contexts
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
As contexts are abandoned we want to remember how much GPU time they used (per class) so later we can used it for smarter purposes.
As GEM contexts are closed we want to have the DRM client remember how much GPU time they used (per class) so later we can used it for smarter purposes.
--- drivers/gpu/drm/i915/gem/i915_gem_context.c | 25 +++++++++++++++++++-- drivers/gpu/drm/i915/i915_drm_client.h | 7 ++++++ 2 files changed, 30 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_context.c +23 -2
@@ -842,23 +842,44 @@ static void free_engines_rcu(struct rcu_head *rcu)free_engines (engines); } +static void accumulate_runtime (struct i915_drm_client *client, +struct i915_gem_engines *engines) +{ +struct i915_gem_engines_iter it; +struct intel_context *ce; + +if (!client) +return ; + +/* Transfer accumulated runtime to the parent GEM context. */ +for_each_gem_engine (ce, engines, it) { +unsigned int class = ce->engine->uabi_class; + +GEM_BUG_ON (class >=ARRAY_SIZE (client->past_runtime)); +atomic64_add (intel_context_get_total_runtime_ns (ce), + &client->past_runtime[class]); + } +} + static int __i915_sw_fence_callengines_notify (struct i915_sw_fence *fence,enum i915_sw_fence_notify state) {struct i915_gem_engines *engines =container_of (fence,typeof (*engines), fence); +struct i915_gem_context *ctx = engines->ctx;switch (state) {case FENCE_COMPLETE :if (!list_empty (&engines->link)) { -struct i915_gem_context *ctx = engines->ctx;unsigned long flags;spin_lock_irqsave (&ctx->stale.lock, flags);list_del (&engines->link);spin_unlock_irqrestore (&ctx->stale.lock, flags); } -i915_gem_context_put (engines->ctx); +accumulate_runtime (ctx->client, engines); +i915_gem_context_put (ctx); +break ;case FENCE_FREE :
drivers/gpu/drm/i915/i915_drm_client.h +7 -0
@@ -13,6 +13,8 @@#include <linux/sched.h> #include <linux/xarray.h> +#include "gt/intel_engine_types.h" +struct drm_i915_private ;struct i915_drm_clients {
@@ -41,6 +43,11 @@ struct i915_drm_client {bool closed;struct i915_drm_clients *clients; + +/** +* @past_runtime: Accumulation of pphwsp runtimes from closed contexts. +*/ +atomic64_t past_runtime[MAX_ENGINE_CLASS +1 ]; }; void i915_drm_clients_init(struct i915_drm_clients *clients,
Signature · 1 line
2.30.2
PATCH 5/8 drm/i915: Track all user contexts per client
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
We soon want to start answering questions like how much GPU time is the context belonging to a client which exited still using.
To enable this we start tracking all context belonging to a client on a separate list.
--- drivers/gpu/drm/i915/gem/i915_gem_context.c | 12 ++++++++++++ drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 3 +++ drivers/gpu/drm/i915/i915_drm_client.c | 3 +++ drivers/gpu/drm/i915/i915_drm_client.h | 5 +++++ 4 files changed, 23 insertions(+)
drivers/gpu/drm/i915/gem/i915_gem_context.c +12 -0
@@ -1214,6 +1214,7 @@ static void set_closed_name(struct i915_gem_context *ctx)static void context_close (struct i915_gem_context *ctx) { +struct i915_drm_client *client;struct i915_address_space *vm;/* Flush any concurrent set_engines() */
@@ -1246,6 +1247,13 @@ static void context_close(struct i915_gem_context *ctx)list_del (&ctx->link);spin_unlock (&ctx->i915->gem.contexts.lock); + client = ctx->client; +if (client) { +spin_lock (&client->ctx_lock); +list_del_rcu (&ctx->client_link); +spin_unlock (&client->ctx_lock); + } +mutex_unlock (&ctx->mutex);/*
@@ -1470,6 +1478,10 @@ static void gem_context_register(struct i915_gem_context *ctx, old =xa_store (&fpriv->context_xa, id, ctx,GFP_KERNEL );WARN_ON (old); +spin_lock (&ctx->client->ctx_lock); +list_add_tail_rcu (&ctx->client_link, &ctx->client->ctx_list); +spin_unlock (&ctx->client->ctx_lock); +spin_lock (&i915->gem.contexts.lock);list_add_tail (&ctx->link, &i915->gem.contexts.list);spin_unlock (&i915->gem.contexts.lock);
drivers/gpu/drm/i915/gem/i915_gem_context_types.h +3 -0
@@ -270,6 +270,9 @@ struct i915_gem_context {/** @client: struct i915_drm_client */ struct i915_drm_client *client; +/** link: &drm_client.context_list */ +struct list_head client_link; +/** * @ref: reference count *
drivers/gpu/drm/i915/i915_drm_client.c +3 -0
@@ -100,6 +100,9 @@ i915_drm_client_add(struct i915_drm_clients *clients, struct task_struct *task)kref_init (&client->kref);mutex_init (&client->update_lock); +spin_lock_init (&client->ctx_lock); +INIT_LIST_HEAD (&client->ctx_list); + client->clients = clients;INIT_RCU_WORK (&client->rcu, __rcu_i915_drm_client_free);
drivers/gpu/drm/i915/i915_drm_client.h +5 -0
@@ -7,10 +7,12 @@#define __I915_DRM_CLIENT_H__#include <linux/kref.h> +#include <linux/list.h> #include <linux/mutex.h> #include <linux/pid.h> #include <linux/rcupdate.h> #include <linux/sched.h> +#include <linux/spinlock.h> #include <linux/xarray.h> #include "gt/intel_engine_types.h"
@@ -42,6 +44,9 @@ struct i915_drm_client {struct i915_drm_client_name __rcu *name;bool closed; +spinlock_t ctx_lock;/* For add/remove from ctx_list. */ +struct list_head ctx_list;/* List of contexts belonging to client. */ +struct i915_drm_clients *clients;/**
Signature · 1 line
2.30.2
PATCH 6/8 drm/i915: Track context current active time
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Track context active (on hardware) status together with the start timestamp.
This will be used to provide better granularity of context runtime reporting in conjunction with already tracked pphwsp accumulated runtime.
The latter is only updated on context save so does not give us visibility to any currently executing work.
As part of the patch the existing runtime tracking data is moved under the new ce->stats member and updated under the seqlock. This provides the ability to atomically read out accumulated plus active runtime.
v2:
* Rename and make __intel_context_get_active_time unlocked.
v3:
* Use GRAPHICS_VER.
--- drivers/gpu/drm/i915/gt/intel_context.c | 27 ++++++++++++++++++- drivers/gpu/drm/i915/gt/intel_context.h | 15 ++++------- drivers/gpu/drm/i915/gt/intel_context_types.h | 24 +++++++++++------ .../drm/i915/gt/intel_execlists_submission.c | 23 ++++++++++++---- .../gpu/drm/i915/gt/intel_gt_clock_utils.c | 4 +++ drivers/gpu/drm/i915/gt/intel_lrc.c | 27 ++++++++++--------- drivers/gpu/drm/i915/gt/intel_lrc.h | 24 +++++++++++++++++ drivers/gpu/drm/i915/gt/selftest_lrc.c | 10 +++---- drivers/gpu/drm/i915/i915_gpu_error.c | 9 +++---- drivers/gpu/drm/i915/i915_gpu_error.h | 2 +- 10 files changed, 116 insertions(+), 49 deletions(-)
drivers/gpu/drm/i915/gt/intel_context.c +26 -1
@@ -374,7 +374,7 @@ intel_context_init(struct intel_context *ce, struct intel_engine_cs *engine) ce->ring =NULL ; ce->ring_size =SZ_4K ; -ewma_runtime_init (&ce->runtime.avg); +ewma_runtime_init (&ce->stats.runtime.avg); ce->vm =i915_vm_get (engine->gt->vm);
@@ -500,6 +500,31 @@ struct i915_request *intel_context_create_request(struct intel_context *ce)return rq; } +u64 intel_context_get_total_runtime_ns (const struct intel_context *ce) +{ +u64 total, active; + + total = ce->stats.runtime.total; +if (ce->ops->flags &COPS_RUNTIME_CYCLES ) + total *= ce->engine->gt->clock_period_ns; + + active =READ_ONCE (ce->stats.active); +if (active) + active =intel_context_clock () - active; + +return total + active; +} + +u64 intel_context_get_avg_runtime_ns (struct intel_context *ce) +{ +u64 avg =ewma_runtime_read (&ce->stats.runtime.avg); + +if (ce->ops->flags &COPS_RUNTIME_CYCLES ) + avg *= ce->engine->gt->clock_period_ns; + +return avg; +} +#if IS_ENABLED (CONFIG_DRM_I915_SELFTEST )#include "selftest_context.c" #endif
drivers/gpu/drm/i915/gt/intel_context.h +5 -10
@@ -245,18 +245,13 @@ intel_context_clear_nopreempt(struct intel_context *ce) clear_bit(CONTEXT_NOPREEMPT, &ce->flags); } -static inline u64 intel_context_get_total_runtime_ns (struct intel_context *ce) -{ -const u32 period = ce->engine->gt->clock_period_ns; - -return READ_ONCE (ce->runtime.total) * period; -} +u64 intel_context_get_total_runtime_ns (const struct intel_context *ce); +u64 intel_context_get_avg_runtime_ns (struct intel_context *ce); -static inline u64 intel_context_get_avg_runtime_ns (struct intel_context *ce) +static inline u64 intel_context_clock (void ) { -const u32 period = ce->engine->gt->clock_period_ns; - -return mul_u32_u32 (ewma_runtime_read (&ce->runtime.avg), period); +/* As we mix CS cycles with CPU clocks, use the raw monotonic clock. */ +return ktime_get_raw_fast_ns (); }#endif /* __INTEL_CONTEXT_H__ */
drivers/gpu/drm/i915/gt/intel_context_types.h +16 -8
@@ -33,6 +33,9 @@ struct intel_context_ops {#define COPS_HAS_INFLIGHT_BIT 0#define COPS_HAS_INFLIGHT BIT(COPS_HAS_INFLIGHT_BIT) +#define COPS_RUNTIME_CYCLES_BIT 1 +#define COPS_RUNTIME_CYCLES BIT(COPS_RUNTIME_CYCLES_BIT) +int (*alloc)(struct intel_context *ce);int (*pre_pin)(struct intel_context *ce,struct i915_gem_ww_ctx *ww,void **vaddr);
@@ -111,14 +114,19 @@ struct intel_context { } lrc;u32 tag;/* cookie passed to HW to track this context on submission */ -/* Time on GPU as tracked by the hw. */ -struct { -struct ewma_runtime avg; -u64 total; -u32 last; - I915_SELFTEST_DECLARE(u32 num_underflow); - I915_SELFTEST_DECLARE(u32 max_underflow); - } runtime; +/** stats: Context GPU engine busyness tracking. */ +struct intel_context_stats { +u64 active; + +/* Time on GPU as tracked by the hw. */ +struct { +struct ewma_runtime avg; +u64 total; +u32 last; + I915_SELFTEST_DECLARE(u32 num_underflow); + I915_SELFTEST_DECLARE(u32 max_underflow); + } runtime; + } stats;unsigned int active_count;/* protected by timeline->mutex */
drivers/gpu/drm/i915/gt/intel_execlists_submission.c +18 -5
@@ -595,8 +595,6 @@ static void __execlists_schedule_out(struct i915_request * const rq,GEM_BUG_ON (test_bit (ccid -1 , &engine->context_tag));__set_bit (ccid -1 , &engine->context_tag); } - -lrc_update_runtime (ce);intel_engine_context_out (engine);execlists_context_status_change (rq,INTEL_CONTEXT_SCHEDULE_OUT );if (engine->fw_domain && !--engine->fw_active)
@@ -1948,8 +1946,23 @@ process_csb(struct intel_engine_cs *engine, struct i915_request **inactive)* and merits a fresh timeslice. We reinstall the timer after * inspecting the queue to see if we need to resumbit. */ -if (*prev != *execlists->active)/* elide lite-restores */ +if (*prev != *execlists->active) {/* elide lite-restores */ +/* +* Note the inherent discrepancy between the HW runtime, +* recorded as part of the context switch, and the CPU +* adjustment for active contexts. We have to hope that +* the delay in processing the CS event is very small +* and consistent. It works to our advantage to have +* the CPU adjustment _undershoot_ (i.e. start later than) +* the CS timestamp so we never overreport the runtime +* and correct overselves later when updating from HW. +*/ +if (*prev) +lrc_runtime_stop ((*prev)->context); +if (*execlists->active) +lrc_runtime_start ((*execlists->active)->context);new_timeslice (execlists); + }return inactive; }
@@ -2534,7 +2547,7 @@ static int execlists_context_alloc(struct intel_context *ce) }static const struct intel_context_ops execlists_context_ops = { - .flags =COPS_HAS_INFLIGHT , + .flags =COPS_HAS_INFLIGHT |COPS_RUNTIME_CYCLES , .alloc = execlists_context_alloc,
@@ -3494,7 +3507,7 @@ static void virtual_context_exit(struct intel_context *ce) }static const struct intel_context_ops virtual_context_ops = { - .flags =COPS_HAS_INFLIGHT , + .flags =COPS_HAS_INFLIGHT |COPS_RUNTIME_CYCLES , .alloc = virtual_context_alloc,
drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c +4 -0
@@ -159,6 +159,10 @@ void intel_gt_init_clock_frequency(struct intel_gt *gt)if (gt->clock_frequency) gt->clock_period_ns =intel_gt_clock_interval_to_ns (gt,1 ); +/* Icelake appears to use another fixed frequency for CTX_TIMESTAMP */ +if (GRAPHICS_VER (gt->i915) ==11 ) + gt->clock_period_ns =NSEC_PER_SEC /13750000 ; + GT_TRACE(gt, "Using clock frequency: %dkHz, period: %dns, wrap: %lldms\n", gt->clock_frequency / 1000,
drivers/gpu/drm/i915/gt/intel_lrc.c +14 -13
@@ -642,7 +642,7 @@ static void init_common_regs(u32 * const regs, CTX_CTRL_RS_CTX_ENABLE); regs[CTX_CONTEXT_CONTROL ] = ctl; - regs[CTX_TIMESTAMP ] = ce->runtime.last; + regs[CTX_TIMESTAMP ] = ce->stats.runtime.last; } static void init_wa_bb_regs(u32 * const regs,
@@ -1565,35 +1565,36 @@ void lrc_init_wa_ctx(struct intel_engine_cs *engine) } } -static void st_update_runtime_underflow (struct intel_context *ce,s32 dt) +static void st_runtime_underflow (struct intel_context_stats *stats,s32 dt) {#if IS_ENABLED (CONFIG_DRM_I915_SELFTEST ) - ce->runtime.num_underflow++; - ce->runtime.max_underflow =max_t (u32, ce->runtime.max_underflow, -dt); + stats->runtime.num_underflow++; + stats->runtime.max_underflow = +max_t (u32, stats->runtime.max_underflow, -dt);#endif }void lrc_update_runtime (struct intel_context *ce) { +struct intel_context_stats *stats = &ce->stats;u32 old;s32 dt; -if (intel_context_is_barrier (ce)) + old = stats->runtime.last; + stats->runtime.last =lrc_get_runtime (ce); + dt = stats->runtime.last - old; +if (!dt)return ; - old = ce->runtime.last; - ce->runtime.last =lrc_get_runtime (ce); - dt = ce->runtime.last - old; -if (unlikely (dt <0 )) {CE_TRACE (ce,"runtime underflow: last=%u, new=%u, delta=%d\n" , - old, ce->runtime.last, dt); -st_update_runtime_underflow (ce, dt); + old, stats->runtime.last, dt); +st_runtime_underflow (stats, dt);return ; } -ewma_runtime_add (&ce->runtime.avg, dt); - ce->runtime.total += dt; +ewma_runtime_add (&stats->runtime.avg, dt); + stats->runtime.total += dt; }#if IS_ENABLED (CONFIG_DRM_I915_SELFTEST )
drivers/gpu/drm/i915/gt/intel_lrc.h +24 -0
@@ -79,4 +79,28 @@ static inline u32 lrc_get_runtime(const struct intel_context *ce) return READ_ONCE(ce->lrc_reg_state[CTX_TIMESTAMP]); } +static inline void lrc_runtime_start (struct intel_context *ce) +{ +struct intel_context_stats *stats = &ce->stats; + +if (intel_context_is_barrier (ce)) +return ; + +if (stats->active) +return ; + +WRITE_ONCE (stats->active,intel_context_clock ()); +} + +static inline void lrc_runtime_stop (struct intel_context *ce) +{ +struct intel_context_stats *stats = &ce->stats; + +if (!stats->active) +return ; + +lrc_update_runtime (ce); +WRITE_ONCE (stats->active,0 ); +} +#endif /* __INTEL_LRC_H__ */
drivers/gpu/drm/i915/gt/selftest_lrc.c +5 -5
@@ -1751,8 +1751,8 @@ static int __live_pphwsp_runtime(struct intel_engine_cs *engine)if (IS_ERR (ce))return PTR_ERR (ce); - ce->runtime.num_underflow =0 ; - ce->runtime.max_underflow =0 ; + ce->stats.runtime.num_underflow =0 ; + ce->stats.runtime.max_underflow =0 ; do { unsigned int loop = 1024;
@@ -1790,11 +1790,11 @@ static int __live_pphwsp_runtime(struct intel_engine_cs *engine) intel_context_get_avg_runtime_ns(ce)); err =0 ; -if (ce->runtime.num_underflow) { +if (ce->stats.runtime.num_underflow) {pr_err ("%s: pphwsp underflow %u time(s), max %u cycles!\n" , engine->name, - ce->runtime.num_underflow, - ce->runtime.max_underflow); + ce->stats.runtime.num_underflow, + ce->stats.runtime.max_underflow);GEM_TRACE_DUMP (); err = -EOVERFLOW ; }
drivers/gpu/drm/i915/i915_gpu_error.c +3 -6
@@ -484,13 +484,10 @@ static void error_print_context(struct drm_i915_error_state_buf *m, const char *header, const struct i915_gem_context_coredump *ctx) { - const u32 period = m->i915->gt.clock_period_ns; - err_printf(m, "%s%s[%d] prio %d, guilty %d active %d, runtime total %lluns, avg %lluns\n", header, ctx->comm, ctx->pid, ctx->sched_attr.priority, ctx->guilty, ctx->active, - ctx->total_runtime * period, -mul_u32_u32 (ctx->avg_runtime, period)); + ctx->total_runtime, ctx->avg_runtime); } static struct i915_vma_coredump *
@@ -1283,8 +1280,8 @@ static bool record_context(struct i915_gem_context_coredump *e, e->guilty =atomic_read (&ctx->guilty_count); e->active =atomic_read (&ctx->active_count); - e->total_runtime = rq->context->runtime.total; - e->avg_runtime =ewma_runtime_read (&rq->context->runtime.avg); + e->total_runtime =intel_context_get_total_runtime_ns (rq->context); + e->avg_runtime =intel_context_get_avg_runtime_ns (rq->context); simulated =i915_gem_context_no_error_capture (ctx);
drivers/gpu/drm/i915/i915_gpu_error.h +1 -1
@@ -90,7 +90,7 @@ struct intel_engine_coredump {char comm[TASK_COMM_LEN ];u64 total_runtime; -u32 avg_runtime; +u64 avg_runtime;pid_t pid;int active;
Signature · 6 lines
2.30.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 7/8 drm/i915: Expose client engine utilisation via fdinfo
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Similar to AMD commit
874442541133 ("drm/amdgpu: Add show_fdinfo() interface"), using the infrastructure added in previous patches, we add basic client info and GPU engine utilisation for i915.
Example of the output:
pos: 0
flags: 0100002
mnt_id: 21
drm-driver: i915
drm-pdev: 0000:00:02.0
drm-client-id: 7 drm-engine-render: 9288864723 ns drm-engine-copy: 2035071108 ns drm-engine-video: 0 ns
drm-engine-video-enhance: 0 ns
--- drivers/gpu/drm/i915/i915_drm_client.c | 73 ++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_drm_client.h | 4 ++ drivers/gpu/drm/i915/i915_drv.c | 3 ++ 3 files changed, 80 insertions(+)
drivers/gpu/drm/i915/i915_drm_client.c +73 -0
@@ -9,6 +9,11 @@#include <drm/drm_print.h> +#include <uapi/drm/i915_drm.h> + +#include "gem/i915_gem_context.h" +#include "gt/intel_engine_user.h" +#include "i915_drm_client.h" #include "i915_drv.h" #include "i915_gem.h"
@@ -168,3 +173,71 @@ void i915_drm_clients_fini(struct i915_drm_clients *clients)xa_destroy (&clients->xarray); } + +#ifdef CONFIG_PROC_FS +static const char *const uabi_class_names[] = { + [I915_ENGINE_CLASS_RENDER ] ="render" , + [I915_ENGINE_CLASS_COPY ] ="copy" , + [I915_ENGINE_CLASS_VIDEO ] ="video" , + [I915_ENGINE_CLASS_VIDEO_ENHANCE ] ="video-enhance" , +}; + +static u64 busy_add (struct i915_gem_context *ctx,unsigned int class) +{ +struct i915_gem_engines_iter it; +struct intel_context *ce; +u64 total =0 ; + +for_each_gem_engine (ce,rcu_dereference (ctx->engines), it) { +if (ce->engine->uabi_class != class) +continue ; + + total +=intel_context_get_total_runtime_ns (ce); + } + +return total; +} + +static void +show_client_class (struct seq_file *m, +struct i915_drm_client *client, +unsigned int class) +{ +const struct list_head *list = &client->ctx_list; +u64 total =atomic64_read (&client->past_runtime[class]); +struct i915_gem_context *ctx; + +rcu_read_lock (); +list_for_each_entry_rcu (ctx, list, client_link) + total +=busy_add (ctx, class); +rcu_read_unlock (); + +return seq_printf (m,"drm-engine-%s:\t%llu ns\n" , + uabi_class_names[class], total); +} + +void i915_drm_client_fdinfo (struct seq_file *m,struct file *f) +{ +struct drm_file *file = f->private_data; +struct drm_i915_file_private *file_priv = file->driver_priv; +struct drm_i915_private *i915 = file_priv->dev_priv; +struct i915_drm_client *client = file_priv->client; +struct pci_dev *pdev =to_pci_dev (i915->drm.dev); +unsigned int i; + +seq_puts (m,"drm-driver:\ti915\n" ); +seq_printf (m,"drm-pdev:\t%04x:%02x:%02x.%d\n" , +pci_domain_nr (pdev->bus), pdev->bus->number, +PCI_SLOT (pdev->devfn),PCI_FUNC (pdev->devfn)); + +seq_printf (m,"drm-client-id:\t%u\n" , client->id); +rcu_read_lock (); +seq_printf (m,"drm-client-name:\t%s\n" ,i915_drm_client_name (client)); +seq_printf (m,"drm-client-pid:\t%u\n" , +pid_nr (i915_drm_client_pid (client))); +rcu_read_unlock (); + +for (i =0 ; i <ARRAY_SIZE (uabi_class_names); i++) +show_client_class (m, client, i); +} +#endif
drivers/gpu/drm/i915/i915_drm_client.h +4 -0
@@ -98,6 +98,10 @@ i915_drm_client_pid(const struct i915_drm_client *client) return __i915_drm_client_name(client)->pid; } +#ifdef CONFIG_PROC_FS +void i915_drm_client_fdinfo (struct seq_file *m,struct file *f); +#endif +void i915_drm_clients_fini (struct i915_drm_clients *clients);#endif /* !__I915_DRM_CLIENT_H__ */
drivers/gpu/drm/i915/i915_drv.c +3 -0
@@ -1706,6 +1706,9 @@ static const struct file_operations i915_driver_fops = { .read = drm_read, .compat_ioctl = i915_ioc32_compat_ioctl, .llseek = noop_llseek, +#ifdef CONFIG_PROC_FS + .show_fdinfo = i915_drm_client_fdinfo, +#endif }; static int
Signature · 6 lines
2.30.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 8/8 drm: Document fdinfo format specification
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Proposal to standardise the fdinfo text format as optionally output by DRM drivers.
Idea is that a simple but, well defined, spec will enable generic userspace tools to be written while at the same time avoiding a more heavy handed approach of adding a mid-layer to DRM.
i915 implements a subset of the spec, everything apart from the memory stats currently, and a matching intel_gpu_top tool exists.
Open is to see if AMD can migrate to using the proposed GPU utilisation key-value pairs, or if they are not workable to see whether to go vendor specific, or if a standardised alternative can be found which is workable for both drivers.
Same for the memory utilisation key-value pairs proposal.
--- Documentation/gpu/drm-usage-stats.rst | 99 +++++++++++++++++++++++++++ Documentation/gpu/i915.rst | 27 ++++++++ Documentation/gpu/index.rst | 1 + 3 files changed, 127 insertions(+) create mode 100644 Documentation/gpu/drm-usage-stats.rst
Documentation/gpu/drm-usage-stats.rst new file +99 -0
@@ -0,0 +1,99 @@ +.. _drm-client-usage-stats: + +====================== +DRM client usage stats +====================== + +DRM drivers can choose to export partly standardised text output via the +`fops->show_fdinfo()` as part of the driver specific file operations registered +in the `struct drm_driver` object registered with the DRM core. + +One purpose of this output is to enable writing as generic as practicaly +feasible `top(1)` like userspace monitoring tools. + +Given the differences between various DRM drivers the specification of the +output is split between common and driver specific parts. Having said that, +wherever possible effort should still be made to standardise as much as +possible. + +File format specification +========================= + +- File shall contain one key value pair per one line of text. +- Colon character (`:`) must be used to delimit keys and values. +- All keys shall be prefixed with `drm-`. +- Whitespace between the delimiter and first non-whitespace character shall be + ignored when parsing. +- Neither keys or values are allowed to contain whitespace characters. +- Numerical key value pairs can end with optional unit string. +- Data type of the value is fixed as defined in the specification. + +Key types +--------- + +1. Mandatory, fully standardised. +2. Optional, fully standardised. +3. Driver specific. + +Mandatory fully standardised keys +--------------------------------- + +- drm-driver: <string> + +String shall contain a fixed string uniquely identified the driver handling +the device in question. For example name of the respective kernel module. + +Optional fully standardised keys +-------------------------------- + +- drm-pdev: <aaaa:bb.cc.d> + +For PCI devices this should contain the PCI slot address of the device in +question. + +- drm-client-id: <uint> + +Unique value relating to the open DRM file descriptor used to distinguish +duplicated and shared file descriptors. Conceptually the value should map 1:1 +to the in kernel representation of `struct drm_file` instances. + +Uniqueness of the value shall be either globally unique, or unique within the +scope of each device, in which case `drm-pdev` shall be present as well. + +Userspace should make sure to not double account any usage statistics by using +the above described criteria in order to associate data to individual clients. + +- drm-client-name: <string> + +Process name of the thread which opened the file. + +- drm-client-pid: <uint> + +PID of the thread which opened the file. + +- drm-engine-<str>: <uint> ns + +GPUs usually contain multiple execution engines. Each shall be given a stable +and unique string, with possible values documented in the driver specific +specification document. + +Value shall be a monotonically increasing number of nanoseconds the respective +GPU engine spent executing workloads belonging to this client. + +- drm-memory-<str>: <uint> [KiB|MiB] + +Each possible memory type which can be used to store buffer objects by the +GPU in question shall be given a stable and unique name to be returned as the +string here. + +Value shall reflect the amount of storage currently consumed by the buffer +object belong to this client, in the respective memory region. + +Default unit shall be bytes with optional unit specifiers of 'KiB' or 'MiB' +indicating kibi- or mebi-bytes. + +=============================== +Driver specific implementations +=============================== + +:ref:`i915-usage-stats`
Documentation/gpu/i915.rst +27 -0
@@ -701,3 +701,30 @@ The style guide for ``i915_reg.h``. .. kernel-doc:: drivers/gpu/drm/i915/i915_reg.h :doc: The i915 register macro definition style guide + +.. _i915-usage-stats: + +i915 DRM client usage stats implementation +========================================== + +The drm/i915 drivers implements the DRM client usage stats specification as +documented in :ref:`drm-client-usage-stats`. + +Example of the output showing the implemented key value pairs and entirety of +the currenly possible format options: + +:: + + pos: 0 + flags: 0100002 + mnt_id: 21 + drm-driver: i915 + drm-pdev: 0000:00:02.0 + drm-client-id: 7 + drm-engine-render: 9288864723 ns + drm-engine-copy: 2035071108 ns + drm-engine-video: 0 ns + drm-engine-video-enhance: 0 ns + +Possible `drm-engine-` key names are: `render`, `copy`, `video` and +`video-enhance`.
Documentation/gpu/index.rst +1 -0
@@ -10,6 +10,7 @@ Linux GPU Driver Developer's Guide drm-kms drm-kms-helpers drm-uapi + drm-usage-stats driver-uapi drm-client drivers
Signature · 1 line
2.30.2
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Per client engine busyness
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: Per client engine busyness
URL : https://patchwork.freedesktop.org/series/92435/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip cd1de51f55b2 drm/i915: Explicitly track DRM clients -:84: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #84: new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 287 lines checked f7063d21a85d drm/i915: Update client name on context create 8563c5aeca1a drm/i915: Make GEM contexts track DRM clients db56ccda834e drm/i915: Track runtime spent in closed and unreachable GEM contexts 726f6083cc01 drm/i915: Track all user contexts per client 76b7c1579fce drm/i915: Track context current active time
-:139: WARNING:LINE_SPACING: Missing a blank line after declarations #139: FILE: drivers/gpu/drm/i915/gt/intel_context_types.h:126:
+ u32 last;
+ I915_SELFTEST_DECLARE(u32 num_underflow);
total: 0 errors, 1 warnings, 0 checks, 296 lines checkede43d1b5db399 drm/i915: Expose client engine utilisation via fdinfo
-:10: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 874442541133 ("drm/amdgpu: Add show_fdinfo() interface")' #10:
874442541133 ("drm/amdgpu: Add show_fdinfo() interface"), using the
total: 1 errors, 0 warnings, 0 checks, 101 lines checked1fe5f6f4bff5 drm: Document fdinfo format specification
-:32: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #32:
new file mode 100644
-:37: WARNING:SPDX_LICENSE_TAG: Missing or malformed SPDX-License-Identifier tag in line 1 #37: FILE: Documentation/gpu/drm-usage-stats.rst:1:
+.. _drm-client-usage-stats:
total: 0 errors, 2 warnings, 0 checks, 136 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for Per client engine busyness
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: Per client engine busyness
URL : https://patchwork.freedesktop.org/series/92435/
State : warning
== Summary ==
$ dim sparse --fast origin/drm-tip Sparse version: v0.6.2 Fast mode used, each commit won't be checked separately. - +drivers/gpu/drm/i915/display/intel_display.c:1896:21: expected struct i915_vma *[assigned] vma +drivers/gpu/drm/i915/display/intel_display.c:1896:21: got void [noderef] __iomem *[assigned] iomem +drivers/gpu/drm/i915/display/intel_display.c:1896:21: warning: incorrect type in assignment (different address spaces) +drivers/gpu/drm/i915/gem/i915_gem_context.c:1443:34: expected struct i915_address_space *vm +drivers/gpu/drm/i915/gem/i915_gem_context.c:1443:34: got struct i915_address_space [noderef] __rcu *vm +drivers/gpu/drm/i915/gem/i915_gem_context.c:1443:34: warning: incorrect type in argument 1 (different address spaces) +drivers/gpu/drm/i915/gem/selftests/mock_context.c:43:25: expected struct i915_address_space [noderef] __rcu *vm +drivers/gpu/drm/i915/gem/selftests/mock_context.c:43:25: got struct i915_address_space * +drivers/gpu/drm/i915/gem/selftests/mock_context.c:43:25: warning: incorrect type in assignment (different address spaces) +drivers/gpu/drm/i915/gem/selftests/mock_context.c:60:34: expected struct i915_address_space *vm +drivers/gpu/drm/i915/gem/selftests/mock_context.c:60:34: got struct i915_address_space [noderef] __rcu *vm +drivers/gpu/drm/i915/gem/selftests/mock_context.c:60:34: warning: incorrect type in argument 1 (different address spaces) +drivers/gpu/drm/i915/gt/intel_engine_stats.h:27:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:27:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:27:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:32:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:32:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:49:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:49:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:49:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:56:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:56:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_reset.c:1396:5: warning: context imbalance in 'intel_gt_reset_trylock' - different lock contexts for basic block +drivers/gpu/drm/i915/gt/intel_ring_submission.c:1210:24: warning: Using plain integer as NULL pointer +drivers/gpu/drm/i915/i915_perf.c:1434:15: warning: memset with byte count of 16777216 +drivers/gpu/drm/i915/i915_perf.c:1488:15: warning: memset with byte count of 16777216 +./include/asm-generic/bitops/find.h:112:45: warning: shift count is negative (-262080) +./include/asm-generic/bitops/find.h:32:31: warning: shift count is negative (-262080) +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen8_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen8_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen8_write8' - different lock contexts for basic block
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.DOCS: warning for Per client engine busyness
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: Per client engine busyness
URL : https://patchwork.freedesktop.org/series/92435/
State : warning
== Summary ==
$ make htmldocs 2>&1 > /dev/null | grep i915 ./drivers/gpu/drm/i915/gem/i915_gem_context_types.h:357: warning: Function parameter or member 'client_link' not described in 'i915_gem_context'
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for Per client engine busyness
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: Per client engine busyness
URL : https://patchwork.freedesktop.org/series/92435/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_10333 -> Patchwork_20573
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/index.html
Known issues
------------
Here are the changes found in Patchwork_20573 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_huc_copy@huc-copy:
- fi-tgl-y: NOTRUN -> [SKIP][1] ([i915#2190])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/fi-tgl-y/igt@[email protected]
* igt@kms_chamelium@vga-edid-read:
- fi-tgl-y: NOTRUN -> [SKIP][2] ([fdo#111827]) +8 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/fi-tgl-y/igt@[email protected]
* igt@kms_force_connector_basic@force-load-detect:
- fi-tgl-y: NOTRUN -> [SKIP][3] ([fdo#109285])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/fi-tgl-y/igt@[email protected]
* igt@prime_vgem@basic-userptr:
- fi-tgl-y: NOTRUN -> [SKIP][4] ([i915#3301])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/fi-tgl-y/igt@[email protected]
* igt@runner@aborted:
- fi-tgl-y: NOTRUN -> [FAIL][5] ([i915#2722] / [i915#3744])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/fi-tgl-y/igt@[email protected]
* igt@vgem_basic@unload:
- fi-tgl-y: NOTRUN -> [INCOMPLETE][6] ([i915#3744])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/fi-tgl-y/igt@[email protected]
#### Possible fixes ####
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-kbl-7500u: [FAIL][7] ([i915#3449]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/fi-kbl-7500u/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/fi-kbl-7500u/igt@[email protected]
#### Warnings ####
* igt@runner@aborted:
- fi-kbl-soraka: [FAIL][9] ([i915#2722] / [i915#3363] / [i915#3744]) -> [FAIL][10] ([i915#1569] / [i915#192] / [i915#193] / [i915#194] / [i915#2426] / [i915#3363])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/fi-kbl-soraka/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/fi-kbl-soraka/igt@[email protected]
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1569]: https://gitlab.freedesktop.org/drm/intel/issues/1569
[i915#192]: https://gitlab.freedesktop.org/drm/intel/issues/192
[i915#193]: https://gitlab.freedesktop.org/drm/intel/issues/193
[i915#194]: https://gitlab.freedesktop.org/drm/intel/issues/194
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426
[i915#2722]: https://gitlab.freedesktop.org/drm/intel/issues/2722
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3363]: https://gitlab.freedesktop.org/drm/intel/issues/3363
[i915#3449]: https://gitlab.freedesktop.org/drm/intel/issues/3449
[i915#3744]: https://gitlab.freedesktop.org/drm/intel/issues/3744
Participating hosts (39 -> 39)
------------------------------
Additional (1): fi-tgl-y
Missing (1): fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_10333 -> Patchwork_20573
CI-20190529: 20190529
CI_DRM_10333: 138708ec9f303e98fded4239cafa0577d1f47030 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6134: cd63c83e23789eb194d38b8d272247a88122f2f6 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_20573: 1fe5f6f4bff5f22aa43c3096848a48e844b76b00 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
1fe5f6f4bff5 drm: Document fdinfo format specificatione43d1b5db399 drm/i915: Expose client engine utilisation via fdinfo 76b7c1579fce drm/i915: Track context current active time 726f6083cc01 drm/i915: Track all user contexts per client db56ccda834e drm/i915: Track runtime spent in closed and unreachable GEM contexts 8563c5aeca1a drm/i915: Make GEM contexts track DRM clients f7063d21a85d drm/i915: Update client name on context create cd1de51f55b2 drm/i915: Explicitly track DRM clients
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.IGT: failure for Per client engine busyness
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: Per client engine busyness
URL : https://patchwork.freedesktop.org/series/92435/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_10333_full -> Patchwork_20573_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_20573_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_20573_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_20573_full:
### IGT changes ###
#### Possible regressions ####
* igt@kms_big_fb@y-tiled-64bpp-rotate-0:
- shard-glk: [PASS][1] -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-glk9/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-glk3/igt@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_ccs:
- {shard-rkl}: [FAIL][3] ([i915#3678]) -> [SKIP][4] +2 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-rkl-2/igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_ccs.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-rkl-6/igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_ccs.html
* igt@kms_dither@fb-8bpc-vs-panel-6bpc:
- {shard-rkl}: NOTRUN -> [SKIP][5]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-rkl-1/igt@[email protected]
### Piglit changes ###
#### Possible regressions ####
* spec@arb_texture_cube_map_array@arb_texture_cube_map_array-fbo-cubemap-array (NEW):
- pig-glk-j5005: NOTRUN -> [INCOMPLETE][6]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/pig-glk-j5005/spec@arb_texture_cube_map_array@arb_texture_cube_map_array-fbo-cubemap-array.html
New tests
---------
New tests have been introduced between CI_DRM_10333_full and Patchwork_20573_full:
### New Piglit tests (1) ###
* spec@arb_texture_cube_map_array@arb_texture_cube_map_array-fbo-cubemap-array:
- Statuses : 1 incomplete(s)
- Exec time: [0.0] s
Known issues
------------
Here are the changes found in Patchwork_20573_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_persistence@idempotent:
- shard-snb: NOTRUN -> [SKIP][7] ([fdo#109271] / [i915#1099]) +5 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-snb7/igt@[email protected]
* igt@gem_eio@unwedge-stress:
- shard-snb: NOTRUN -> [FAIL][8] ([i915#3354])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-snb7/igt@[email protected]
* igt@gem_exec_fair@basic-deadline:
- shard-glk: [PASS][9] -> [FAIL][10] ([i915#2846])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-glk1/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-glk2/igt@[email protected]
* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-iclb: NOTRUN -> [FAIL][11] ([i915#2842])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-iclb4/igt@gem_exec_fair@[email protected]
- shard-tglb: [PASS][12] -> [FAIL][13] ([i915#2842]) +1 similar issue
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-tglb2/igt@gem_exec_fair@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-tglb1/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-none-vip@rcs0:
- shard-tglb: NOTRUN -> [FAIL][14] ([i915#2842])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-tglb2/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace-solo@rcs0:
- shard-glk: [PASS][15] -> [FAIL][16] ([i915#2842])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-glk4/igt@gem_exec_fair@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-glk1/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace@vcs0:
- shard-kbl: [PASS][17] -> [FAIL][18] ([i915#2842])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-kbl3/igt@gem_exec_fair@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-kbl2/igt@gem_exec_fair@[email protected]
* igt@gem_exec_whisper@basic-fds-priority:
- shard-iclb: [PASS][19] -> [INCOMPLETE][20] ([i915#1394])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-iclb6/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-iclb5/igt@[email protected]
* igt@gem_mmap_gtt@cpuset-big-copy-xy:
- shard-glk: [PASS][21] -> [FAIL][22] ([i915#307])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-glk7/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-glk9/igt@[email protected]
* igt@gem_render_copy@x-tiled-to-vebox-yf-tiled:
- shard-kbl: NOTRUN -> [SKIP][23] ([fdo#109271]) +101 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-kbl3/igt@[email protected]
* igt@gem_render_copy@yf-tiled-to-vebox-yf-tiled:
- shard-iclb: NOTRUN -> [SKIP][24] ([i915#768])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-iclb8/igt@[email protected]
* igt@gem_userptr_blits@access-control:
- shard-tglb: NOTRUN -> [SKIP][25] ([i915#3297])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-tglb2/igt@[email protected]
* igt@gen9_exec_parse@allowed-all:
- shard-glk: [PASS][26] -> [DMESG-WARN][27] ([i915#1436] / [i915#716])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-glk3/igt@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-glk8/igt@[email protected]
* igt@gen9_exec_parse@basic-rejected-ctx-param:
- shard-tglb: NOTRUN -> [SKIP][28] ([fdo#112306])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-tglb2/igt@[email protected]
* igt@gen9_exec_parse@batch-without-end:
- shard-iclb: NOTRUN -> [SKIP][29] ([fdo#112306]) +1 similar issue
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-iclb8/igt@[email protected]
* igt@i915_pm_dc@dc6-psr:
- shard-skl: NOTRUN -> [FAIL][30] ([i915#454])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-skl3/igt@[email protected]
* igt@i915_pm_rc6_residency@rc6-fence:
- shard-iclb: NOTRUN -> [WARN][31] ([i915#2684])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-iclb8/igt@[email protected]
* igt@kms_big_fb@linear-16bpp-rotate-270:
- shard-tglb: NOTRUN -> [SKIP][32] ([fdo#111614])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-tglb2/igt@[email protected]
* igt@kms_big_fb@x-tiled-32bpp-rotate-180:
- shard-glk: [PASS][33] -> [DMESG-WARN][34] ([i915#118] / [i915#95])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-glk1/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-glk1/igt@[email protected]
* igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-180-async-flip:
- shard-skl: NOTRUN -> [FAIL][35] ([i915#3722])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-skl3/igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-180-async-flip.html
* igt@kms_big_fb@yf-tiled-addfb-size-offset-overflow:
- shard-tglb: NOTRUN -> [SKIP][36] ([fdo#111615]) +1 similar issue
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-tglb2/igt@[email protected]
* igt@kms_big_fb@yf-tiled-max-hw-stride-64bpp-rotate-0:
- shard-apl: NOTRUN -> [SKIP][37] ([fdo#109271]) +149 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-apl2/igt@[email protected]
* igt@kms_ccs@pipe-a-missing-ccs-buffer-y_tiled_ccs:
- shard-tglb: NOTRUN -> [SKIP][38] ([i915#3689]) +4 similar issues
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-tglb2/igt@kms_ccs@pipe-a-missing-ccs-buffer-y_tiled_ccs.html
* igt@kms_ccs@pipe-c-bad-rotation-90-y_tiled_gen12_rc_ccs_cc:
- shard-skl: NOTRUN -> [SKIP][39] ([fdo#109271]) +101 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-skl3/igt@kms_ccs@pipe-c-bad-rotation-90-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_chamelium@hdmi-hpd-storm:
- shard-kbl: NOTRUN -> [SKIP][40] ([fdo#109271] / [fdo#111827]) +13 similar issues
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-kbl7/igt@[email protected]
* igt@kms_chamelium@vga-hpd-without-ddc:
- shard-iclb: NOTRUN -> [SKIP][41] ([fdo#109284] / [fdo#111827]) +1 similar issue
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-iclb4/igt@[email protected]
* igt@kms_color_chamelium@pipe-a-ctm-blue-to-red:
- shard-snb: NOTRUN -> [SKIP][42] ([fdo#109271] / [fdo#111827]) +17 similar issues
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-snb7/igt@[email protected]
* igt@kms_color_chamelium@pipe-d-ctm-0-25:
- shard-skl: NOTRUN -> [SKIP][43] ([fdo#109271] / [fdo#111827]) +11 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-skl8/igt@[email protected]
- shard-apl: NOTRUN -> [SKIP][44] ([fdo#109271] / [fdo#111827]) +9 similar issues
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-apl2/igt@[email protected]
* igt@kms_color_chamelium@pipe-d-ctm-blue-to-red:
- shard-glk: NOTRUN -> [SKIP][45] ([fdo#109271] / [fdo#111827]) +1 similar issue
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-glk6/igt@[email protected]
- shard-iclb: NOTRUN -> [SKIP][46] ([fdo#109278] / [fdo#109284] / [fdo#111827])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-iclb8/igt@[email protected]
* igt@kms_color_chamelium@pipe-d-ctm-max:
- shard-tglb: NOTRUN -> [SKIP][47] ([fdo#109284] / [fdo#111827]) +5 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-tglb2/igt@[email protected]
* igt@kms_content_protection@atomic:
- shard-kbl: NOTRUN -> [TIMEOUT][48] ([i915#1319]) +1 similar issue
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-kbl6/igt@[email protected]
- shard-iclb: NOTRUN -> [SKIP][49] ([fdo#109300] / [fdo#111066])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-iclb8/igt@[email protected]
* igt@kms_content_protection@lic:
- shard-apl: NOTRUN -> [TIMEOUT][50] ([i915#1319]) +1 similar issue
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-apl6/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-128x42-offscreen:
- shard-skl: [PASS][51] -> [FAIL][52] ([i915#3444]) +1 similar issue
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-skl4/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-skl7/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-32x32-sliding:
- shard-tglb: NOTRUN -> [SKIP][53] ([i915#3319])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-tglb2/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-128x128-random:
- shard-skl: NOTRUN -> [FAIL][54] ([i915#3444])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-skl3/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-512x512-offscreen:
- shard-tglb: NOTRUN -> [SKIP][55] ([fdo#109279] / [i915#3359])
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-tglb2/igt@[email protected]
* igt@kms_cursor_crc@pipe-c-cursor-512x512-random:
- shard-iclb: NOTRUN -> [SKIP][56] ([fdo#109278] / [fdo#109279])
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-iclb8/igt@[email protected]
* igt@kms_cursor_crc@pipe-c-cursor-max-size-onscreen:
- shard-tglb: NOTRUN -> [SKIP][57] ([i915#3359]) +2 similar issues
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-tglb2/igt@[email protected]
* igt@kms_cursor_crc@pipe-c-cursor-suspend:
- shard-kbl: [PASS][58] -> [DMESG-WARN][59] ([i915#180]) +2 similar issues
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-kbl4/igt@[email protected]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-kbl1/igt@[email protected]
- shard-apl: NOTRUN -> [DMESG-WARN][60] ([i915#180])
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-apl3/igt@[email protected]
* igt@kms_cursor_crc@pipe-d-cursor-dpms:
- shard-iclb: NOTRUN -> [SKIP][61] ([fdo#109278]) +8 similar issues
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-iclb8/igt@[email protected]
* igt@kms_cursor_legacy@basic-flip-after-cursor-atomic:
- shard-skl: [PASS][62] -> [FAIL][63] ([i915#2346])
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-skl8/igt@[email protected]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-skl4/igt@[email protected]
* igt@kms_flip@2x-flip-vs-absolute-wf_vblank-interruptible:
- shard-tglb: NOTRUN -> [SKIP][64] ([fdo#111825]) +12 similar issues
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-tglb2/igt@kms_flip@2x-flip-vs-absolute-wf_vblank-interruptible.html
* igt@kms_flip@flip-vs-blocking-wf-vblank@b-edp1:
- shard-skl: [PASS][65] -> [FAIL][66] ([i915#2122])
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-skl2/igt@kms_flip@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-skl2/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-expired-vblank-interruptible@b-hdmi-a1:
- shard-glk: [PASS][67] -> [FAIL][68] ([i915#79])
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-glk6/igt@kms_flip@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-glk7/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1:
- shard-skl: [PASS][69] -> [FAIL][70] ([i915#79])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-skl7/igt@kms_flip@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-skl3/igt@kms_flip@[email protected]
* igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile:
- shard-snb: NOTRUN -> [SKIP][71] ([fdo#109271]) +351 similar issues
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-snb6/igt@[email protected]
* igt@kms_flip_tiling@flip-changes-tiling-yf@edp-1-pipe-a:
- shard-skl: [PASS][72] -> [FAIL][73] ([i915#699])
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-skl4/igt@kms_flip_tiling@[email protected]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-skl7/igt@kms_flip_tiling@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-2p-pri-indfb-multidraw:
- shard-glk: NOTRUN -> [SKIP][74] ([fdo#109271]) +12 similar issues
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-glk6/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-2p-shrfb-fliptrack-mmap-gtt:
- shard-iclb: NOTRUN -> [SKIP][75] ([fdo#109280]) +5 similar issues
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-iclb4/igt@[email protected]
* igt@kms_frontbuffer_tracking@psr-rgb101010-draw-render:
- shard-skl: [PASS][76] -> [FAIL][77] ([i915#49])
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-skl4/igt@[email protected]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-skl7/igt@[email protected]
* igt@kms_hdr@bpc-switch-dpms:
- shard-skl: [PASS][78] -> [FAIL][79] ([i915#1188])
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-skl10/igt@[email protected]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-skl6/igt@[email protected]
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-d-frame-sequence:
- shard-apl: NOTRUN -> [SKIP][80] ([fdo#109271] / [i915#533])
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-apl6/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb:
- shard-apl: NOTRUN -> [FAIL][81] ([fdo#108145] / [i915#265]) +1 similar issue
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-apl6/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-c-alpha-7efc:
- shard-kbl: NOTRUN -> [FAIL][82] ([fdo#108145] / [i915#265]) +1 similar issue
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-kbl1/igt@[email protected]
- shard-skl: NOTRUN -> [FAIL][83] ([fdo#108145] / [i915#265])
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-skl3/igt@[email protected]
* igt@kms_plane_lowres@pipe-d-tiling-yf:
- shard-tglb: NOTRUN -> [SKIP][84] ([fdo#112054]) +1 similar issue
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-tglb2/igt@[email protected]
* igt@kms_plane_scaling@2x-scaler-multi-pipe:
- shard-iclb: NOTRUN -> [SKIP][85] ([fdo#109274])
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-iclb3/igt@[email protected]
* igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-c-scaler-with-clipping-clamping:
- shard-apl: NOTRUN -> [SKIP][86] ([fdo#109271] / [i915#2733])
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-apl2/igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-c-scaler-with-clipping-clamping.html
- shard-skl: NOTRUN -> [SKIP][87] ([fdo#109271] / [i915#2733])
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-skl8/igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-c-scaler-with-clipping-clamping.html
* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-1:
- shard-kbl: NOTRUN -> [SKIP][88] ([fdo#109271] / [i915#658]) +2 similar issues
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-kbl6/igt@[email protected]
- shard-iclb: NOTRUN -> [SKIP][89] ([i915#658])
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-iclb8/igt@[email protected]
- shard-glk: NOTRUN -> [SKIP][90] ([fdo#109271] / [i915#658])
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-glk6/igt@[email protected]
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-1:
- shard-skl: NOTRUN -> [SKIP][91] ([fdo#109271] / [i915#658])
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-skl3/igt@[email protected]
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-1:
- shard-apl: NOTRUN -> [SKIP][92] ([fdo#109271] / [i915#658])
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-apl2/igt@[email protected]
* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: NOTRUN -> [SKIP][93] ([fdo#109441])
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-iclb8/igt@kms_psr@psr2_primary_mmap_cpu.html
* igt@kms_psr@psr2_sprite_mmap_cpu:
- shard-tglb: NOTRUN -> [FAIL][94] ([i915#132] / [i915#3467])
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-tglb2/igt@kms_psr@psr2_sprite_mmap_cpu.html
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [PASS][95] -> [SKIP][96] ([fdo#109441]) +1 similar issue
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-iclb8/igt@kms_psr@psr2_sprite_plane_move.html
* igt@kms_vblank@pipe-d-wait-idle:
- shard-kbl: NOTRUN -> [SKIP][97] ([fdo#109271] / [i915#533])
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-kbl3/igt@[email protected]
* igt@nouveau_crc@pipe-b-source-outp-complete:
- shard-tglb: NOTRUN -> [SKIP][98] ([i915#2530])
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-tglb2/igt@[email protected]
* igt@nouveau_crc@pipe-c-ctx-flip-detection:
- shard-iclb: NOTRUN -> [SKIP][99] ([i915#2530])
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-iclb8/igt@[email protected]
* igt@perf@blocking:
- shard-skl: [PASS][100] -> [FAIL][101] ([i915#1542]) +1 similar issue
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-skl7/igt@[email protected]
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-skl1/igt@[email protected]
* igt@perf_pmu@rc6-suspend:
- shard-skl: [PASS][102] -> [INCOMPLETE][103] ([i915#198] / [i915#2910])
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-skl2/igt@[email protected]
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-skl3/igt@[email protected]
* igt@prime_nv_api@i915_nv_double_export:
- shard-iclb: NOTRUN -> [SKIP][104] ([fdo#109291])
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-iclb8/igt@prime_nv_api@i915_nv_double_export.html
* igt@prime_nv_api@nv_self_import:
- shard-tglb: NOTRUN -> [SKIP][105] ([fdo#109291])
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-tglb2/igt@prime_nv_api@nv_self_import.html
* igt@sysfs_clients@busy:
- shard-apl: NOTRUN -> [SKIP][106] ([fdo#109271] / [i915#2994])
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-apl6/igt@[email protected]
#### Possible fixes ####
* igt@fbdev@nullptr:
- {shard-rkl}: [SKIP][107] ([i915#2582]) -> [PASS][108] +1 similar issue
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-rkl-2/igt@[email protected]
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-rkl-6/igt@[email protected]
* igt@gem_ctx_isolation@preservation-s3@rcs0:
- {shard-rkl}: [FAIL][109] ([fdo#103375]) -> [PASS][110]
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-rkl-6/igt@gem_ctx_isolation@[email protected]
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-rkl-1/igt@gem_ctx_isolation@[email protected]
* igt@gem_eio@unwedge-stress:
- shard-tglb: [TIMEOUT][111] ([i915#2369] / [i915#3063] / [i915#3648]) -> [PASS][112]
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-tglb7/igt@[email protected]
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-tglb3/igt@[email protected]
* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-apl: [SKIP][113] ([fdo#109271]) -> [PASS][114]
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-apl7/igt@gem_exec_fair@[email protected]
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-apl1/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace@rcs0:
- shard-kbl: [FAIL][115] ([i915#2842]) -> [PASS][116] +1 similar issue
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-kbl3/igt@gem_exec_fair@[email protected]
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-kbl2/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace@vecs0:
- shard-tglb: [FAIL][117] ([i915#2842]) -> [PASS][118] +2 similar issues
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-tglb7/igt@gem_exec_fair@[email protected]
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-tglb7/igt@gem_exec_fair@[email protected]
* igt@gem_exec_whisper@basic-forked:
- shard-glk: [DMESG-WARN][119] ([i915#118] / [i915#95]) -> [PASS][120]
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-glk6/igt@[email protected]
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-glk7/igt@[email protected]
* igt@gem_mmap_gtt@cpuset-big-copy-xy:
- shard-iclb: [FAIL][121] ([i915#2428]) -> [PASS][122]
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-iclb2/igt@[email protected]
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-iclb8/igt@[email protected]
* igt@gem_mmap_offset@clear:
- shard-skl: [FAIL][123] ([i915#3160]) -> [PASS][124]
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-skl7/igt@[email protected]
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-skl1/igt@[email protected]
* igt@gen9_exec_parse@allowed-single:
- shard-skl: [DMESG-WARN][125] ([i915#1436] / [i915#716]) -> [PASS][126]
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-skl4/igt@[email protected]
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-skl3/igt@[email protected]
* igt@i915_pm_rpm@gem-pread:
- {shard-rkl}: [SKIP][127] ([fdo#109308]) -> [PASS][128]
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-rkl-2/igt@[email protected]
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-rkl-6/igt@[email protected]
* igt@i915_pm_rpm@modeset-lpsp:
- {shard-rkl}: [SKIP][129] ([i915#1397]) -> [PASS][130]
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-rkl-2/igt@[email protected]
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-rkl-6/igt@[email protected]
* igt@i915_suspend@sysfs-reader:
- shard-skl: [INCOMPLETE][131] ([i915#198]) -> [PASS][132]
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-skl5/igt@[email protected]
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-skl8/igt@[email protected]
* igt@kms_big_fb@x-tiled-32bpp-rotate-180:
- {shard-rkl}: [SKIP][133] ([i915#3638]) -> [PASS][134]
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-rkl-1/igt@[email protected]
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-rkl-6/igt@[email protected]
* igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-0-hflip-async-flip:
- {shard-rkl}: [SKIP][135] ([i915#3721]) -> [PASS][136] +4 similar issues
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10333/shard-rkl-2/igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-0-hflip-async-flip.html
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/shard-rkl-6/igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-0-hflip-async-flip.html
* igt@kms_big_fb@y-tiled-64bpp-rotate-0:
- shard-iclb: [FAIL][137] -
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20573/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx