From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> To: Intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Subject: [PATCH 3/7] drm/i915: Make GEM contexts track DRM clients Date: Thu, 13 May 2021 11:59:58 +0100 [thread overview] Message-ID: <20210513110002.3641705-4-tvrtko.ursulin@linux.intel.com> (raw) In-Reply-To: <20210513110002.3641705-1-tvrtko.ursulin@linux.intel.com> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> 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 on upstream Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Aravind Iddamsetty <aravind.iddamsetty@intel.com> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Link: https://patchwork.freedesktop.org/patch/msgid/20210123153733.18139-4-chris@chris-wilson.co.uk Link: https://patchwork.freedesktop.org/patch/msgid/20210124153136.19124-4-chris@chris-wilson.co.uk --- drivers/gpu/drm/i915/gem/i915_gem_context.c | 20 ++++++++++++----- .../gpu/drm/i915/gem/i915_gem_context_types.h | 13 +++-------- drivers/gpu/drm/i915/i915_gpu_error.c | 22 +++++++++++-------- 3 files changed, 30 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c index e5f8d94666e8..5ea42d5b0b1a 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c @@ -345,13 +345,14 @@ void i915_gem_context_release(struct kref *ref) trace_i915_context_free(ctx); GEM_BUG_ON(!i915_gem_context_is_closed(ctx)); - mutex_destroy(&ctx->engines_mutex); - mutex_destroy(&ctx->lut_mutex); + if (ctx->client) + i915_drm_client_put(ctx->client); if (ctx->timeline) intel_timeline_put(ctx->timeline); - put_pid(ctx->pid); + mutex_destroy(&ctx->engines_mutex); + mutex_destroy(&ctx->lut_mutex); mutex_destroy(&ctx->mutex); kfree_rcu(ctx, rcu); @@ -895,6 +896,7 @@ static int gem_context_register(struct i915_gem_context *ctx, u32 *id) { struct drm_i915_private *i915 = ctx->i915; + struct i915_drm_client *client; struct i915_address_space *vm; int ret; @@ -906,15 +908,21 @@ static int gem_context_register(struct i915_gem_context *ctx, WRITE_ONCE(vm->file, fpriv); /* XXX */ mutex_unlock(&ctx->mutex); - ctx->pid = get_task_pid(current, PIDTYPE_PID); + 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(client), + pid_nr(i915_drm_client_pid(client))); + rcu_read_unlock(); /* And finally expose ourselves to userspace via the idr */ ret = xa_alloc(&fpriv->context_xa, id, ctx, xa_limit_32b, GFP_KERNEL); if (ret) goto err_pid; + ctx->client = client; + spin_lock(&i915->gem.contexts.lock); list_add_tail(&ctx->link, &i915->gem.contexts.list); spin_unlock(&i915->gem.contexts.lock); @@ -922,7 +930,7 @@ static int gem_context_register(struct i915_gem_context *ctx, return 0; err_pid: - put_pid(fetch_and_zero(&ctx->pid)); + i915_drm_client_put(client); return ret; } diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h index 340473aa70de..eb098f2896c5 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h @@ -96,19 +96,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 * diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 99ca242ec13b..dc9eb6823270 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -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; -- 2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> To: Intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 3/7] drm/i915: Make GEM contexts track DRM clients Date: Thu, 13 May 2021 11:59:58 +0100 [thread overview] Message-ID: <20210513110002.3641705-4-tvrtko.ursulin@linux.intel.com> (raw) In-Reply-To: <20210513110002.3641705-1-tvrtko.ursulin@linux.intel.com> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> 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 on upstream Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Aravind Iddamsetty <aravind.iddamsetty@intel.com> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Link: https://patchwork.freedesktop.org/patch/msgid/20210123153733.18139-4-chris@chris-wilson.co.uk Link: https://patchwork.freedesktop.org/patch/msgid/20210124153136.19124-4-chris@chris-wilson.co.uk --- drivers/gpu/drm/i915/gem/i915_gem_context.c | 20 ++++++++++++----- .../gpu/drm/i915/gem/i915_gem_context_types.h | 13 +++-------- drivers/gpu/drm/i915/i915_gpu_error.c | 22 +++++++++++-------- 3 files changed, 30 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c index e5f8d94666e8..5ea42d5b0b1a 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c @@ -345,13 +345,14 @@ void i915_gem_context_release(struct kref *ref) trace_i915_context_free(ctx); GEM_BUG_ON(!i915_gem_context_is_closed(ctx)); - mutex_destroy(&ctx->engines_mutex); - mutex_destroy(&ctx->lut_mutex); + if (ctx->client) + i915_drm_client_put(ctx->client); if (ctx->timeline) intel_timeline_put(ctx->timeline); - put_pid(ctx->pid); + mutex_destroy(&ctx->engines_mutex); + mutex_destroy(&ctx->lut_mutex); mutex_destroy(&ctx->mutex); kfree_rcu(ctx, rcu); @@ -895,6 +896,7 @@ static int gem_context_register(struct i915_gem_context *ctx, u32 *id) { struct drm_i915_private *i915 = ctx->i915; + struct i915_drm_client *client; struct i915_address_space *vm; int ret; @@ -906,15 +908,21 @@ static int gem_context_register(struct i915_gem_context *ctx, WRITE_ONCE(vm->file, fpriv); /* XXX */ mutex_unlock(&ctx->mutex); - ctx->pid = get_task_pid(current, PIDTYPE_PID); + 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(client), + pid_nr(i915_drm_client_pid(client))); + rcu_read_unlock(); /* And finally expose ourselves to userspace via the idr */ ret = xa_alloc(&fpriv->context_xa, id, ctx, xa_limit_32b, GFP_KERNEL); if (ret) goto err_pid; + ctx->client = client; + spin_lock(&i915->gem.contexts.lock); list_add_tail(&ctx->link, &i915->gem.contexts.list); spin_unlock(&i915->gem.contexts.lock); @@ -922,7 +930,7 @@ static int gem_context_register(struct i915_gem_context *ctx, return 0; err_pid: - put_pid(fetch_and_zero(&ctx->pid)); + i915_drm_client_put(client); return ret; } diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h index 340473aa70de..eb098f2896c5 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h @@ -96,19 +96,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 * diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 99ca242ec13b..dc9eb6823270 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -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; -- 2.30.2 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-05-13 11:00 UTC|newest] Thread overview: 103+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-13 10:59 [PATCH 0/7] Per client engine busyness Tvrtko Ursulin 2021-05-13 10:59 ` [Intel-gfx] " Tvrtko Ursulin 2021-05-13 10:59 ` [PATCH 1/7] drm/i915: Expose list of clients in sysfs Tvrtko Ursulin 2021-05-13 10:59 ` [Intel-gfx] " Tvrtko Ursulin 2021-05-13 10:59 ` [PATCH 2/7] drm/i915: Update client name on context create Tvrtko Ursulin 2021-05-13 10:59 ` [Intel-gfx] " Tvrtko Ursulin 2021-05-13 10:59 ` Tvrtko Ursulin [this message] 2021-05-13 10:59 ` [Intel-gfx] [PATCH 3/7] drm/i915: Make GEM contexts track DRM clients Tvrtko Ursulin 2021-05-13 10:59 ` [PATCH 4/7] drm/i915: Track runtime spent in closed and unreachable GEM contexts Tvrtko Ursulin 2021-05-13 10:59 ` [Intel-gfx] " Tvrtko Ursulin 2021-05-13 11:00 ` [PATCH 5/7] drm/i915: Track all user contexts per client Tvrtko Ursulin 2021-05-13 11:00 ` [Intel-gfx] " Tvrtko Ursulin 2021-05-13 11:00 ` [PATCH 6/7] drm/i915: Track context current active time Tvrtko Ursulin 2021-05-13 11:00 ` [Intel-gfx] " Tvrtko Ursulin 2021-05-13 11:00 ` [PATCH 7/7] drm/i915: Expose per-engine client busyness Tvrtko Ursulin 2021-05-13 11:00 ` [Intel-gfx] " Tvrtko Ursulin 2021-05-13 11:28 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Per client engine busyness Patchwork 2021-05-13 11:30 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2021-05-13 11:59 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2021-05-13 15:48 ` [PATCH 0/7] " Alex Deucher 2021-05-13 15:48 ` [Intel-gfx] " Alex Deucher 2021-05-13 16:40 ` Tvrtko Ursulin 2021-05-13 16:40 ` [Intel-gfx] " Tvrtko Ursulin 2021-05-14 5:58 ` Alex Deucher 2021-05-14 5:58 ` [Intel-gfx] " Alex Deucher 2021-05-14 7:22 ` Nieto, David M 2021-05-14 7:22 ` [Intel-gfx] " Nieto, David M 2021-05-14 8:04 ` Christian König 2021-05-14 8:04 ` [Intel-gfx] " Christian König 2021-05-14 13:42 ` Tvrtko Ursulin 2021-05-14 13:42 ` [Intel-gfx] " Tvrtko Ursulin 2021-05-14 13:53 ` Christian König 2021-05-14 13:53 ` [Intel-gfx] " Christian König 2021-05-14 14:47 ` Tvrtko Ursulin 2021-05-14 14:47 ` [Intel-gfx] " Tvrtko Ursulin 2021-05-14 14:56 ` Christian König 2021-05-14 14:56 ` [Intel-gfx] " Christian König 2021-05-14 15:03 ` Tvrtko Ursulin 2021-05-14 15:03 ` [Intel-gfx] " Tvrtko Ursulin 2021-05-14 15:10 ` Christian König 2021-05-14 15:10 ` [Intel-gfx] " Christian König 2021-05-17 14:30 ` Daniel Vetter 2021-05-17 14:30 ` [Intel-gfx] " Daniel Vetter 2021-05-17 14:39 ` Nieto, David M 2021-05-17 14:39 ` [Intel-gfx] " Nieto, David M 2021-05-17 16:00 ` Tvrtko Ursulin 2021-05-17 16:00 ` [Intel-gfx] " Tvrtko Ursulin 2021-05-17 18:02 ` Nieto, David M 2021-05-17 18:02 ` [Intel-gfx] " Nieto, David M 2021-05-17 18:16 ` [Nouveau] " Nieto, David M 2021-05-17 18:16 ` [Intel-gfx] " Nieto, David M 2021-05-17 18:16 ` Nieto, David M 2021-05-17 19:03 ` [Nouveau] " Simon Ser 2021-05-17 19:03 ` [Intel-gfx] " Simon Ser 2021-05-17 19:03 ` Simon Ser 2021-05-18 9:08 ` [Nouveau] " Tvrtko Ursulin 2021-05-18 9:08 ` [Intel-gfx] " Tvrtko Ursulin 2021-05-18 9:08 ` Tvrtko Ursulin 2021-05-18 9:16 ` [Nouveau] " Daniel Stone 2021-05-18 9:16 ` [Intel-gfx] " Daniel Stone 2021-05-18 9:16 ` Daniel Stone 2021-05-18 9:40 ` [Nouveau] " Tvrtko Ursulin 2021-05-18 9:40 ` [Intel-gfx] " Tvrtko Ursulin 2021-05-18 9:40 ` Tvrtko Ursulin 2021-05-19 16:16 ` [Nouveau] " Tvrtko Ursulin 2021-05-19 16:16 ` [Intel-gfx] " Tvrtko Ursulin 2021-05-19 16:16 ` Tvrtko Ursulin 2021-05-19 18:23 ` [Nouveau] [Intel-gfx] " Daniel Vetter 2021-05-19 18:23 ` Daniel Vetter 2021-05-19 18:23 ` Daniel Vetter 2021-05-19 23:17 ` [Nouveau] " Nieto, David M 2021-05-19 23:17 ` Nieto, David M 2021-05-19 23:17 ` Nieto, David M 2021-05-20 14:11 ` [Nouveau] " Daniel Vetter 2021-05-20 14:11 ` Daniel Vetter 2021-05-20 14:11 ` Daniel Vetter 2021-05-20 14:12 ` [Nouveau] " Christian König 2021-05-20 14:12 ` Christian König 2021-05-20 14:12 ` Christian König 2021-05-20 14:17 ` [Nouveau] " arabek 2021-05-20 14:17 ` [Intel-gfx] [Nouveau] " arabek 2021-05-20 14:17 ` [Nouveau] [Intel-gfx] " arabek 2021-05-20 8:35 ` Tvrtko Ursulin 2021-05-20 8:35 ` Tvrtko Ursulin 2021-05-20 8:35 ` Tvrtko Ursulin 2021-05-24 10:48 ` [Nouveau] " Tvrtko Ursulin 2021-05-24 10:48 ` Tvrtko Ursulin 2021-05-24 10:48 ` Tvrtko Ursulin 2021-05-18 9:35 ` Tvrtko Ursulin 2021-05-18 9:35 ` [Intel-gfx] " Tvrtko Ursulin 2021-05-18 12:06 ` Christian König 2021-05-18 12:06 ` [Intel-gfx] " Christian König 2021-05-17 19:16 ` Christian König 2021-05-17 19:16 ` [Intel-gfx] " Christian König 2021-06-28 10:16 ` Tvrtko Ursulin 2021-06-28 10:16 ` [Intel-gfx] " Tvrtko Ursulin 2021-06-28 14:37 ` Daniel Vetter 2021-06-28 14:37 ` [Intel-gfx] " Daniel Vetter 2021-05-15 10:40 ` Maxime Schmitt 2021-05-17 16:13 ` Tvrtko Ursulin 2021-05-17 14:20 ` Daniel Vetter 2021-05-17 14:20 ` [Intel-gfx] " Daniel Vetter 2021-05-13 16:38 ` [Intel-gfx] ✗ Fi.CI.IGT: failure for " Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210513110002.3641705-4-tvrtko.ursulin@linux.intel.com \ --to=tvrtko.ursulin@linux.intel.com \ --cc=Intel-gfx@lists.freedesktop.org \ --cc=dri-devel@lists.freedesktop.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.