From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
Subject: [Intel-gfx] [PATCH v7 29/63] drm/i915: Defer pin calls in buffer pool until first use by caller.
Date: Thu, 28 Jan 2021 17:25:38 +0100 [thread overview]
Message-ID: <20210128162612.927917-30-maarten.lankhorst@linux.intel.com> (raw)
In-Reply-To: <20210128162612.927917-1-maarten.lankhorst@linux.intel.com>
We need to take the obj lock to pin pages, so wait until the callers
have done so, before making the object unshrinkable.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
---
.../gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +
.../gpu/drm/i915/gem/i915_gem_object_blt.c | 6 +++
.../gpu/drm/i915/gt/intel_gt_buffer_pool.c | 47 +++++++++----------
.../gpu/drm/i915/gt/intel_gt_buffer_pool.h | 5 ++
.../drm/i915/gt/intel_gt_buffer_pool_types.h | 1 +
5 files changed, 35 insertions(+), 26 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index 64d0e5fccece..97b0d1134b66 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -1335,6 +1335,7 @@ static int __reloc_gpu_alloc(struct i915_execbuffer *eb,
err = PTR_ERR(cmd);
goto err_pool;
}
+ intel_gt_buffer_pool_mark_used(pool);
memset32(cmd, 0, pool->obj->base.size / sizeof(u32));
@@ -2630,6 +2631,7 @@ static int eb_parse(struct i915_execbuffer *eb)
err = PTR_ERR(shadow);
goto err;
}
+ intel_gt_buffer_pool_mark_used(pool);
i915_gem_object_set_readonly(shadow->obj);
shadow->private = pool;
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c b/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c
index d6dac21fce0b..df8e8c18c6c9 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c
@@ -55,6 +55,9 @@ struct i915_vma *intel_emit_vma_fill_blt(struct intel_context *ce,
if (unlikely(err))
goto out_put;
+ /* we pinned the pool, mark it as such */
+ intel_gt_buffer_pool_mark_used(pool);
+
cmd = i915_gem_object_pin_map(pool->obj, pool->type);
if (IS_ERR(cmd)) {
err = PTR_ERR(cmd);
@@ -277,6 +280,9 @@ struct i915_vma *intel_emit_vma_copy_blt(struct intel_context *ce,
if (unlikely(err))
goto out_put;
+ /* we pinned the pool, mark it as such */
+ intel_gt_buffer_pool_mark_used(pool);
+
cmd = i915_gem_object_pin_map(pool->obj, pool->type);
if (IS_ERR(cmd)) {
err = PTR_ERR(cmd);
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c b/drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c
index 06d84cf09570..c59468107598 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c
@@ -98,28 +98,6 @@ static void pool_free_work(struct work_struct *wrk)
round_jiffies_up_relative(HZ));
}
-static int pool_active(struct i915_active *ref)
-{
- struct intel_gt_buffer_pool_node *node =
- container_of(ref, typeof(*node), active);
- struct dma_resv *resv = node->obj->base.resv;
- int err;
-
- if (dma_resv_trylock(resv)) {
- dma_resv_add_excl_fence(resv, NULL);
- dma_resv_unlock(resv);
- }
-
- err = i915_gem_object_pin_pages(node->obj);
- if (err)
- return err;
-
- /* Hide this pinned object from the shrinker until retired */
- i915_gem_object_make_unshrinkable(node->obj);
-
- return 0;
-}
-
__i915_active_call
static void pool_retire(struct i915_active *ref)
{
@@ -129,10 +107,13 @@ static void pool_retire(struct i915_active *ref)
struct list_head *list = bucket_for_size(pool, node->obj->base.size);
unsigned long flags;
- i915_gem_object_unpin_pages(node->obj);
+ if (node->pinned) {
+ i915_gem_object_unpin_pages(node->obj);
- /* Return this object to the shrinker pool */
- i915_gem_object_make_purgeable(node->obj);
+ /* Return this object to the shrinker pool */
+ i915_gem_object_make_purgeable(node->obj);
+ node->pinned = false;
+ }
GEM_BUG_ON(node->age);
spin_lock_irqsave(&pool->lock, flags);
@@ -144,6 +125,19 @@ static void pool_retire(struct i915_active *ref)
round_jiffies_up_relative(HZ));
}
+void intel_gt_buffer_pool_mark_used(struct intel_gt_buffer_pool_node *node)
+{
+ assert_object_held(node->obj);
+
+ if (node->pinned)
+ return;
+
+ __i915_gem_object_pin_pages(node->obj);
+ /* Hide this pinned object from the shrinker until retired */
+ i915_gem_object_make_unshrinkable(node->obj);
+ node->pinned = true;
+}
+
static struct intel_gt_buffer_pool_node *
node_create(struct intel_gt_buffer_pool *pool, size_t sz,
enum i915_map_type type)
@@ -159,7 +153,8 @@ node_create(struct intel_gt_buffer_pool *pool, size_t sz,
node->age = 0;
node->pool = pool;
- i915_active_init(&node->active, pool_active, pool_retire);
+ node->pinned = false;
+ i915_active_init(&node->active, NULL, pool_retire);
obj = i915_gem_object_create_internal(gt->i915, sz);
if (IS_ERR(obj)) {
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.h b/drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.h
index 6068f8f1762e..487b8a5520f1 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.h
+++ b/drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.h
@@ -18,10 +18,15 @@ struct intel_gt_buffer_pool_node *
intel_gt_get_buffer_pool(struct intel_gt *gt, size_t size,
enum i915_map_type type);
+void intel_gt_buffer_pool_mark_used(struct intel_gt_buffer_pool_node *node);
+
static inline int
intel_gt_buffer_pool_mark_active(struct intel_gt_buffer_pool_node *node,
struct i915_request *rq)
{
+ /* did we call mark_used? */
+ GEM_WARN_ON(!node->pinned);
+
return i915_active_add_request(&node->active, rq);
}
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_buffer_pool_types.h b/drivers/gpu/drm/i915/gt/intel_gt_buffer_pool_types.h
index c49b84fe5164..df1d75d08cd2 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_buffer_pool_types.h
+++ b/drivers/gpu/drm/i915/gt/intel_gt_buffer_pool_types.h
@@ -30,6 +30,7 @@ struct intel_gt_buffer_pool_node {
};
unsigned long age;
enum i915_map_type type;
+ u32 pinned;
};
#endif /* INTEL_GT_BUFFER_POOL_TYPES_H */
--
2.30.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-01-28 16:27 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-28 16:25 [Intel-gfx] [PATCH v7 00/63] drm/i915: Remove obj->mm.lock! Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 01/63] drm/i915: Do not share hwsp across contexts any more, v7 Maarten Lankhorst
2021-01-28 17:42 ` Chris Wilson
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 02/63] drm/i915: Pin timeline map after first timeline pin, v3 Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 03/63] drm/i915: Move cmd parser pinning to execbuffer Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 04/63] drm/i915: Add missing -EDEADLK handling to execbuf pinning, v2 Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 05/63] drm/i915: Ensure we hold the object mutex in pin correctly Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 06/63] drm/i915: Add gem object locking to madvise Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 07/63] drm/i915: Move HAS_STRUCT_PAGE to obj->flags Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 08/63] drm/i915: Rework struct phys attachment handling Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 09/63] drm/i915: Convert i915_gem_object_attach_phys() to ww locking, v2 Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 10/63] drm/i915: make lockdep slightly happier about execbuf Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 11/63] drm/i915: Disable userptr pread/pwrite support Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 12/63] drm/i915: No longer allow exporting userptr through dma-buf Maarten Lankhorst
2021-01-28 16:44 ` Jason Ekstrand
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 13/63] drm/i915: Reject more ioctls for userptr Maarten Lankhorst
2021-01-28 16:47 ` Jason Ekstrand
2021-01-29 11:42 ` Maarten Lankhorst
2021-02-01 19:11 ` Jason Ekstrand
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 14/63] drm/i915: Reject UNSYNCHRONIZED for userptr, v2 Maarten Lankhorst
2021-01-28 16:49 ` Jason Ekstrand
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 15/63] drm/i915: Make compilation of userptr code depend on MMU_NOTIFIER Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 16/63] drm/i915: Fix userptr so we do not have to worry about obj->mm.lock, v6 Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 17/63] drm/i915: Flatten obj->mm.lock Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 18/63] drm/i915: Populate logical context during first pin Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 19/63] drm/i915: Make ring submission compatible with obj->mm.lock removal, v2 Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 20/63] drm/i915: Handle ww locking in init_status_page Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 21/63] drm/i915: Rework clflush to work correctly without obj->mm.lock Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 22/63] drm/i915: Pass ww ctx to intel_pin_to_display_plane Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 23/63] drm/i915: Add object locking to vm_fault_cpu Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 24/63] drm/i915: Move pinning to inside engine_wa_list_verify() Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 25/63] drm/i915: Take reservation lock around i915_vma_pin Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 26/63] drm/i915: Make lrc_init_wa_ctx compatible with ww locking, v2 Maarten Lankhorst
2021-02-01 12:50 ` [Intel-gfx] [PATCH] drm/i915: Make lrc_init_wa_ctx compatible with ww locking, v3 Maarten Lankhorst
2021-02-01 13:03 ` Thomas Hellström
2021-02-01 13:08 ` Chris Wilson
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 27/63] drm/i915: Make __engine_unpark() compatible with ww locking Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 28/63] drm/i915: Take obj lock around set_domain ioctl Maarten Lankhorst
2021-01-28 16:25 ` Maarten Lankhorst [this message]
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 30/63] drm/i915: Fix pread/pwrite to work with new locking rules Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 31/63] drm/i915: Fix workarounds selftest, part 1 Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 32/63] drm/i915: Prepare for obj->mm.lock removal, v2 Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 33/63] drm/i915: Add igt_spinner_pin() to allow for ww locking around spinner Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 34/63] drm/i915: Add ww locking around vm_access() Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 35/63] drm/i915: Increase ww locking for perf Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 36/63] drm/i915: Lock ww in ucode objects correctly Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 37/63] drm/i915: Add ww locking to dma-buf ops Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 38/63] drm/i915: Add missing ww lock in intel_dsb_prepare Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 39/63] drm/i915: Fix ww locking in shmem_create_from_object Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 40/63] drm/i915: Use a single page table lock for each gtt Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 41/63] drm/i915/selftests: Prepare huge_pages testcases for obj->mm.lock removal Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 42/63] drm/i915/selftests: Prepare client blit " Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 43/63] drm/i915/selftests: Prepare coherency tests " Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 44/63] drm/i915/selftests: Prepare context " Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 45/63] drm/i915/selftests: Prepare dma-buf " Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 46/63] drm/i915/selftests: Prepare execbuf " Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 47/63] drm/i915/selftests: Prepare mman testcases " Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 48/63] drm/i915/selftests: Prepare object tests " Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 49/63] drm/i915/selftests: Prepare object blit " Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 50/63] drm/i915/selftests: Prepare igt_gem_utils " Maarten Lankhorst
2021-01-28 16:26 ` [Intel-gfx] [PATCH v7 51/63] drm/i915/selftests: Prepare context selftest " Maarten Lankhorst
2021-01-28 16:26 ` [Intel-gfx] [PATCH v7 52/63] drm/i915/selftests: Prepare hangcheck " Maarten Lankhorst
2021-01-28 16:26 ` [Intel-gfx] [PATCH v7 53/63] drm/i915/selftests: Prepare execlists and lrc selftests " Maarten Lankhorst
2021-01-28 16:26 ` [Intel-gfx] [PATCH v7 54/63] drm/i915/selftests: Prepare mocs tests " Maarten Lankhorst
2021-01-28 16:26 ` [Intel-gfx] [PATCH v7 55/63] drm/i915/selftests: Prepare ring submission " Maarten Lankhorst
2021-01-28 16:26 ` [Intel-gfx] [PATCH v7 56/63] drm/i915/selftests: Prepare timeline tests " Maarten Lankhorst
2021-01-28 16:26 ` [Intel-gfx] [PATCH v7 57/63] drm/i915/selftests: Prepare i915_request " Maarten Lankhorst
2021-01-28 16:26 ` [Intel-gfx] [PATCH v7 58/63] drm/i915/selftests: Prepare memory region " Maarten Lankhorst
2021-01-28 16:26 ` [Intel-gfx] [PATCH v7 59/63] drm/i915/selftests: Prepare cs engine " Maarten Lankhorst
2021-01-28 16:26 ` [Intel-gfx] [PATCH v7 60/63] drm/i915/selftests: Prepare gtt " Maarten Lankhorst
2021-01-28 16:26 ` [Intel-gfx] [PATCH v7 61/63] drm/i915: Finally remove obj->mm.lock Maarten Lankhorst
2021-01-28 16:26 ` [Intel-gfx] [PATCH v7 62/63] drm/i915: Keep userpointer bindings if seqcount is unchanged, v2 Maarten Lankhorst
2021-01-28 16:26 ` [Intel-gfx] [PATCH v7 63/63] drm/i915: Move gt_revoke() slightly Maarten Lankhorst
2021-01-28 17:50 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Remove obj->mm.lock! (rev14) Patchwork
2021-01-28 17:51 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-01-28 17:54 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork
2021-01-28 18:20 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2021-01-29 15:28 ` [Intel-gfx] ✗ Fi.CI.IGT: " Patchwork
2021-02-01 16:20 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Remove obj->mm.lock! (rev15) Patchwork
2021-02-01 16:22 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-02-01 16:25 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork
2021-02-01 16:51 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " 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=20210128162612.927917-30-maarten.lankhorst@linux.intel.com \
--to=maarten.lankhorst@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=thomas.hellstrom@linux.intel.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).