* [PATCH] drm/i915: Hide unshrinkable context objects from the shrinker
@ 2019-07-19 13:04 Chris Wilson
2019-07-19 14:29 ` ✓ Fi.CI.BAT: success for " Patchwork
` (7 more replies)
0 siblings, 8 replies; 12+ messages in thread
From: Chris Wilson @ 2019-07-19 13:04 UTC (permalink / raw)
To: intel-gfx
The shrinker cannot touch objects used by the contexts (logical state
and ring). Currently we mark those as "pin_global" to let the shrinker
skip over them, however, if we remove them from the shrinker lists
entirely, we don't event have to include them in our shrink accounting.
By keeping the unshrinkable objects in our shrinker tracking, we report
a large number of objects available to be shrunk, and leave the shrinker
deeply unsatisfied when we fail to reclaim those. The shrinker will
persist in trying to reclaim the unavailable objects, forcing the system
into a livelock (not even hitting the dread oomkiller).
v2: Extend unshrinkable protection for perma-pinned scratch and guc
allocations (Tvrtko)
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/gem/i915_gem_object.c | 11 ++--
drivers/gpu/drm/i915/gem/i915_gem_object.h | 4 ++
drivers/gpu/drm/i915/gem/i915_gem_pages.c | 13 +----
drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 57 ++++++++++++++++++++
drivers/gpu/drm/i915/gt/intel_context.c | 4 +-
drivers/gpu/drm/i915/gt/intel_gt.c | 2 +
drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 17 +++---
drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 +
drivers/gpu/drm/i915/i915_debugfs.c | 3 +-
drivers/gpu/drm/i915/i915_vma.c | 15 ++++++
drivers/gpu/drm/i915/i915_vma.h | 4 ++
11 files changed, 101 insertions(+), 31 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c
index d5197a2a106f..4ea97fca9c35 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_object.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c
@@ -63,6 +63,8 @@ void i915_gem_object_init(struct drm_i915_gem_object *obj,
spin_lock_init(&obj->vma.lock);
INIT_LIST_HEAD(&obj->vma.list);
+ INIT_LIST_HEAD(&obj->mm.link);
+
INIT_LIST_HEAD(&obj->lut_list);
INIT_LIST_HEAD(&obj->batch_pool_link);
@@ -273,14 +275,7 @@ void i915_gem_free_object(struct drm_gem_object *gem_obj)
* or else we may oom whilst there are plenty of deferred
* freed objects.
*/
- if (i915_gem_object_has_pages(obj) &&
- i915_gem_object_is_shrinkable(obj)) {
- unsigned long flags;
-
- spin_lock_irqsave(&i915->mm.obj_lock, flags);
- list_del_init(&obj->mm.link);
- spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
- }
+ i915_gem_object_make_unshrinkable(obj);
/*
* Since we require blocking on struct_mutex to unbind the freed
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h
index 67aea07ea019..3714cf234d64 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_object.h
+++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h
@@ -394,6 +394,10 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,
unsigned int flags);
void i915_gem_object_unpin_from_display_plane(struct i915_vma *vma);
+void i915_gem_object_make_unshrinkable(struct drm_i915_gem_object *obj);
+void i915_gem_object_make_shrinkable(struct drm_i915_gem_object *obj);
+void i915_gem_object_make_purgeable(struct drm_i915_gem_object *obj);
+
static inline bool cpu_write_needs_clflush(struct drm_i915_gem_object *obj)
{
if (obj->cache_dirty)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pages.c b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
index b36ad269f4ea..92ad3cc220e3 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
@@ -153,24 +153,13 @@ static void __i915_gem_object_reset_page_iter(struct drm_i915_gem_object *obj)
struct sg_table *
__i915_gem_object_unset_pages(struct drm_i915_gem_object *obj)
{
- struct drm_i915_private *i915 = to_i915(obj->base.dev);
struct sg_table *pages;
pages = fetch_and_zero(&obj->mm.pages);
if (IS_ERR_OR_NULL(pages))
return pages;
- if (i915_gem_object_is_shrinkable(obj)) {
- unsigned long flags;
-
- spin_lock_irqsave(&i915->mm.obj_lock, flags);
-
- list_del(&obj->mm.link);
- i915->mm.shrink_count--;
- i915->mm.shrink_memory -= obj->base.size;
-
- spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
- }
+ i915_gem_object_make_unshrinkable(obj);
if (obj->mm.mapping) {
void *ptr;
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
index 3f4c6bdcc3c3..14abfd77365f 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
@@ -530,3 +530,60 @@ void i915_gem_shrinker_taints_mutex(struct drm_i915_private *i915,
if (unlock)
mutex_release(&i915->drm.struct_mutex.dep_map, 0, _RET_IP_);
}
+
+void i915_gem_object_make_unshrinkable(struct drm_i915_gem_object *obj)
+{
+ if (!list_empty(&obj->mm.link)) {
+ struct drm_i915_private *i915 = to_i915(obj->base.dev);
+ unsigned long flags;
+
+ spin_lock_irqsave(&i915->mm.obj_lock, flags);
+ GEM_BUG_ON(list_empty(&obj->mm.link));
+
+ list_del_init(&obj->mm.link);
+ i915->mm.shrink_count--;
+ i915->mm.shrink_memory -= obj->base.size;
+
+ spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
+ }
+}
+
+void i915_gem_object_make_shrinkable(struct drm_i915_gem_object *obj)
+{
+ GEM_BUG_ON(!i915_gem_object_has_pages(obj));
+ GEM_BUG_ON(!list_empty(&obj->mm.link));
+
+ if (i915_gem_object_is_shrinkable(obj)) {
+ struct drm_i915_private *i915 = to_i915(obj->base.dev);
+ unsigned long flags;
+
+ spin_lock_irqsave(&i915->mm.obj_lock, flags);
+ GEM_BUG_ON(!kref_read(&obj->base.refcount));
+
+ list_add_tail(&obj->mm.link, &i915->mm.shrink_list);
+ i915->mm.shrink_count++;
+ i915->mm.shrink_memory += obj->base.size;
+
+ spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
+ }
+}
+
+void i915_gem_object_make_purgeable(struct drm_i915_gem_object *obj)
+{
+ GEM_BUG_ON(!i915_gem_object_has_pages(obj));
+ GEM_BUG_ON(!list_empty(&obj->mm.link));
+
+ if (i915_gem_object_is_shrinkable(obj)) {
+ struct drm_i915_private *i915 = to_i915(obj->base.dev);
+ unsigned long flags;
+
+ spin_lock_irqsave(&i915->mm.obj_lock, flags);
+ GEM_BUG_ON(!kref_read(&obj->base.refcount));
+
+ list_add_tail(&obj->mm.link, &i915->mm.purge_list);
+ i915->mm.shrink_count++;
+ i915->mm.shrink_memory += obj->base.size;
+
+ spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
+ }
+}
diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c
index 9e4f51ce52ff..9830edda1ade 100644
--- a/drivers/gpu/drm/i915/gt/intel_context.c
+++ b/drivers/gpu/drm/i915/gt/intel_context.c
@@ -118,7 +118,7 @@ static int __context_pin_state(struct i915_vma *vma)
* And mark it as a globally pinned object to let the shrinker know
* it cannot reclaim the object until we release it.
*/
- vma->obj->pin_global++;
+ i915_vma_make_unshrinkable(vma);
vma->obj->mm.dirty = true;
return 0;
@@ -126,8 +126,8 @@ static int __context_pin_state(struct i915_vma *vma)
static void __context_unpin_state(struct i915_vma *vma)
{
- vma->obj->pin_global--;
__i915_vma_unpin(vma);
+ i915_vma_make_shrinkable(vma);
}
static void __intel_context_retire(struct i915_active *active)
diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c
index f7e69db4019d..5b16b233a059 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt.c
@@ -231,6 +231,8 @@ int intel_gt_init_scratch(struct intel_gt *gt, unsigned int size)
if (ret)
goto err_unref;
+ i915_gem_object_make_unshrinkable(obj);
+
gt->scratch = vma;
return 0;
diff --git a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c
index 38ec11ae6ed7..d8efb88f33f3 100644
--- a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c
@@ -1238,7 +1238,7 @@ int intel_ring_pin(struct intel_ring *ring)
goto err_ring;
}
- vma->obj->pin_global++;
+ i915_vma_make_unshrinkable(vma);
GEM_BUG_ON(ring->vaddr);
ring->vaddr = addr;
@@ -1267,6 +1267,8 @@ void intel_ring_reset(struct intel_ring *ring, u32 tail)
void intel_ring_unpin(struct intel_ring *ring)
{
+ struct i915_vma *vma = ring->vma;
+
if (!atomic_dec_and_test(&ring->pin_count))
return;
@@ -1275,18 +1277,17 @@ void intel_ring_unpin(struct intel_ring *ring)
/* Discard any unused bytes beyond that submitted to hw. */
intel_ring_reset(ring, ring->tail);
- GEM_BUG_ON(!ring->vma);
- i915_vma_unset_ggtt_write(ring->vma);
- if (i915_vma_is_map_and_fenceable(ring->vma))
- i915_vma_unpin_iomap(ring->vma);
+ i915_vma_unset_ggtt_write(vma);
+ if (i915_vma_is_map_and_fenceable(vma))
+ i915_vma_unpin_iomap(vma);
else
- i915_gem_object_unpin_map(ring->vma->obj);
+ i915_gem_object_unpin_map(vma->obj);
GEM_BUG_ON(!ring->vaddr);
ring->vaddr = NULL;
- ring->vma->obj->pin_global--;
- i915_vma_unpin(ring->vma);
+ i915_vma_unpin(vma);
+ i915_vma_make_purgeable(vma);
intel_timeline_unpin(ring->timeline);
}
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
index 83f2c197375f..a5ba0164fd14 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
@@ -597,6 +597,8 @@ struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size)
goto err;
}
+ i915_gem_object_make_unshrinkable(obj);
+
return vma;
err:
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 6b84d04a6a28..c43f270085f5 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -363,8 +363,9 @@ static int i915_gem_object_info(struct seq_file *m, void *data)
struct drm_i915_private *i915 = node_to_i915(m->private);
int ret;
- seq_printf(m, "%u shrinkable objects, %llu bytes\n",
+ seq_printf(m, "%u shrinkable [%u free] objects, %llu bytes\n",
i915->mm.shrink_count,
+ atomic_read(&i915->mm.free_count),
i915->mm.shrink_memory);
seq_putc(m, '\n');
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
index eb16a1a93bbc..e27ddbff487e 100644
--- a/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@ -1030,6 +1030,21 @@ int i915_vma_unbind(struct i915_vma *vma)
return 0;
}
+void i915_vma_make_unshrinkable(struct i915_vma *vma)
+{
+ i915_gem_object_make_unshrinkable(vma->obj);
+}
+
+void i915_vma_make_shrinkable(struct i915_vma *vma)
+{
+ i915_gem_object_make_shrinkable(vma->obj);
+}
+
+void i915_vma_make_purgeable(struct i915_vma *vma)
+{
+ i915_gem_object_make_purgeable(vma->obj);
+}
+
#if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
#include "selftests/i915_vma.c"
#endif
diff --git a/drivers/gpu/drm/i915/i915_vma.h b/drivers/gpu/drm/i915/i915_vma.h
index 4b769db649bf..a24bd6787ef7 100644
--- a/drivers/gpu/drm/i915/i915_vma.h
+++ b/drivers/gpu/drm/i915/i915_vma.h
@@ -459,4 +459,8 @@ void i915_vma_parked(struct drm_i915_private *i915);
struct i915_vma *i915_vma_alloc(void);
void i915_vma_free(struct i915_vma *vma);
+void i915_vma_make_unshrinkable(struct i915_vma *vma);
+void i915_vma_make_shrinkable(struct i915_vma *vma);
+void i915_vma_make_purgeable(struct i915_vma *vma);
+
#endif
--
2.22.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 12+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Hide unshrinkable context objects from the shrinker
2019-07-19 13:04 [PATCH] drm/i915: Hide unshrinkable context objects from the shrinker Chris Wilson
@ 2019-07-19 14:29 ` Patchwork
2019-07-19 15:38 ` [PATCH] " Tvrtko Ursulin
` (6 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2019-07-19 14:29 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Hide unshrinkable context objects from the shrinker
URL : https://patchwork.freedesktop.org/series/63943/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6511 -> Patchwork_13701
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/
Known issues
------------
Here are the changes found in Patchwork_13701 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_reloc@basic-write-read:
- fi-icl-u3: [PASS][1] -> [DMESG-WARN][2] ([fdo#107724])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6511/fi-icl-u3/igt@gem_exec_reloc@basic-write-read.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/fi-icl-u3/igt@gem_exec_reloc@basic-write-read.html
#### Possible fixes ####
* igt@gem_basic@bad-close:
- fi-icl-u3: [DMESG-WARN][3] ([fdo#107724]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6511/fi-icl-u3/igt@gem_basic@bad-close.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/fi-icl-u3/igt@gem_basic@bad-close.html
* igt@gem_mmap_gtt@basic-copy:
- fi-glk-dsi: [INCOMPLETE][5] ([fdo#103359] / [k.org#198133]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6511/fi-glk-dsi/igt@gem_mmap_gtt@basic-copy.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/fi-glk-dsi/igt@gem_mmap_gtt@basic-copy.html
* igt@i915_selftest@live_client:
- fi-icl-dsi: [INCOMPLETE][7] ([fdo#107713]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6511/fi-icl-dsi/igt@i915_selftest@live_client.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/fi-icl-dsi/igt@i915_selftest@live_client.html
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][9] ([fdo#109485]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6511/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
- fi-kbl-7567u: [FAIL][11] ([fdo#109485]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6511/fi-kbl-7567u/igt@kms_chamelium@hdmi-hpd-fast.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/fi-kbl-7567u/igt@kms_chamelium@hdmi-hpd-fast.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#109485]: https://bugs.freedesktop.org/show_bug.cgi?id=109485
[k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133
Participating hosts (52 -> 47)
------------------------------
Additional (1): fi-cml-u2
Missing (6): fi-kbl-soraka fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_6511 -> Patchwork_13701
CI_DRM_6511: dbedd493118204a194fbc480f86866ddebbc4723 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5103: 45c31e294b9d7874a9a21860f8a89c64bc853df2 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13701: f91fdb878d56bb5fc7ff6f123fd3bca37b32acfa @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
f91fdb878d56 drm/i915: Hide unshrinkable context objects from the shrinker
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] drm/i915: Hide unshrinkable context objects from the shrinker
2019-07-19 13:04 [PATCH] drm/i915: Hide unshrinkable context objects from the shrinker Chris Wilson
2019-07-19 14:29 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2019-07-19 15:38 ` Tvrtko Ursulin
2019-07-19 15:50 ` Chris Wilson
2019-07-19 16:32 ` Chris Wilson
` (5 subsequent siblings)
7 siblings, 1 reply; 12+ messages in thread
From: Tvrtko Ursulin @ 2019-07-19 15:38 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On 19/07/2019 14:04, Chris Wilson wrote:
> The shrinker cannot touch objects used by the contexts (logical state
> and ring). Currently we mark those as "pin_global" to let the shrinker
> skip over them, however, if we remove them from the shrinker lists
> entirely, we don't event have to include them in our shrink accounting.
>
> By keeping the unshrinkable objects in our shrinker tracking, we report
> a large number of objects available to be shrunk, and leave the shrinker
> deeply unsatisfied when we fail to reclaim those. The shrinker will
> persist in trying to reclaim the unavailable objects, forcing the system
> into a livelock (not even hitting the dread oomkiller).
>
> v2: Extend unshrinkable protection for perma-pinned scratch and guc
> allocations (Tvrtko)
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> ---
> drivers/gpu/drm/i915/gem/i915_gem_object.c | 11 ++--
> drivers/gpu/drm/i915/gem/i915_gem_object.h | 4 ++
> drivers/gpu/drm/i915/gem/i915_gem_pages.c | 13 +----
> drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 57 ++++++++++++++++++++
> drivers/gpu/drm/i915/gt/intel_context.c | 4 +-
> drivers/gpu/drm/i915/gt/intel_gt.c | 2 +
> drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 17 +++---
> drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 +
> drivers/gpu/drm/i915/i915_debugfs.c | 3 +-
> drivers/gpu/drm/i915/i915_vma.c | 15 ++++++
> drivers/gpu/drm/i915/i915_vma.h | 4 ++
> 11 files changed, 101 insertions(+), 31 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c
> index d5197a2a106f..4ea97fca9c35 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_object.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c
> @@ -63,6 +63,8 @@ void i915_gem_object_init(struct drm_i915_gem_object *obj,
> spin_lock_init(&obj->vma.lock);
> INIT_LIST_HEAD(&obj->vma.list);
>
> + INIT_LIST_HEAD(&obj->mm.link);
> +
> INIT_LIST_HEAD(&obj->lut_list);
> INIT_LIST_HEAD(&obj->batch_pool_link);
>
> @@ -273,14 +275,7 @@ void i915_gem_free_object(struct drm_gem_object *gem_obj)
> * or else we may oom whilst there are plenty of deferred
> * freed objects.
> */
> - if (i915_gem_object_has_pages(obj) &&
> - i915_gem_object_is_shrinkable(obj)) {
> - unsigned long flags;
> -
> - spin_lock_irqsave(&i915->mm.obj_lock, flags);
> - list_del_init(&obj->mm.link);
> - spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
> - }
> + i915_gem_object_make_unshrinkable(obj);
>
> /*
> * Since we require blocking on struct_mutex to unbind the freed
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h
> index 67aea07ea019..3714cf234d64 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_object.h
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h
> @@ -394,6 +394,10 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,
> unsigned int flags);
> void i915_gem_object_unpin_from_display_plane(struct i915_vma *vma);
>
> +void i915_gem_object_make_unshrinkable(struct drm_i915_gem_object *obj);
> +void i915_gem_object_make_shrinkable(struct drm_i915_gem_object *obj);
> +void i915_gem_object_make_purgeable(struct drm_i915_gem_object *obj);
> +
> static inline bool cpu_write_needs_clflush(struct drm_i915_gem_object *obj)
> {
> if (obj->cache_dirty)
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pages.c b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
> index b36ad269f4ea..92ad3cc220e3 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
> @@ -153,24 +153,13 @@ static void __i915_gem_object_reset_page_iter(struct drm_i915_gem_object *obj)
> struct sg_table *
> __i915_gem_object_unset_pages(struct drm_i915_gem_object *obj)
> {
> - struct drm_i915_private *i915 = to_i915(obj->base.dev);
> struct sg_table *pages;
>
> pages = fetch_and_zero(&obj->mm.pages);
> if (IS_ERR_OR_NULL(pages))
> return pages;
>
> - if (i915_gem_object_is_shrinkable(obj)) {
> - unsigned long flags;
> -
> - spin_lock_irqsave(&i915->mm.obj_lock, flags);
> -
> - list_del(&obj->mm.link);
> - i915->mm.shrink_count--;
> - i915->mm.shrink_memory -= obj->base.size;
> -
> - spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
> - }
> + i915_gem_object_make_unshrinkable(obj);
>
> if (obj->mm.mapping) {
> void *ptr;
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
> index 3f4c6bdcc3c3..14abfd77365f 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
> @@ -530,3 +530,60 @@ void i915_gem_shrinker_taints_mutex(struct drm_i915_private *i915,
> if (unlock)
> mutex_release(&i915->drm.struct_mutex.dep_map, 0, _RET_IP_);
> }
> +
> +void i915_gem_object_make_unshrinkable(struct drm_i915_gem_object *obj)
> +{
> + if (!list_empty(&obj->mm.link)) {
Which lock protects this list head?
> + struct drm_i915_private *i915 = to_i915(obj->base.dev);
> + unsigned long flags;
> +
> + spin_lock_irqsave(&i915->mm.obj_lock, flags);
> + GEM_BUG_ON(list_empty(&obj->mm.link));
> +
> + list_del_init(&obj->mm.link);
> + i915->mm.shrink_count--;
> + i915->mm.shrink_memory -= obj->base.size;
> +
> + spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
> + }
> +}
> +
> +void i915_gem_object_make_shrinkable(struct drm_i915_gem_object *obj)
> +{
> + GEM_BUG_ON(!i915_gem_object_has_pages(obj));
> + GEM_BUG_ON(!list_empty(&obj->mm.link));
> +
> + if (i915_gem_object_is_shrinkable(obj)) {
> + struct drm_i915_private *i915 = to_i915(obj->base.dev);
> + unsigned long flags;
> +
> + spin_lock_irqsave(&i915->mm.obj_lock, flags);
> + GEM_BUG_ON(!kref_read(&obj->base.refcount));
> +
> + list_add_tail(&obj->mm.link, &i915->mm.shrink_list);
> + i915->mm.shrink_count++;
> + i915->mm.shrink_memory += obj->base.size;
> +
> + spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
> + }
> +}
> +
> +void i915_gem_object_make_purgeable(struct drm_i915_gem_object *obj)
> +{
> + GEM_BUG_ON(!i915_gem_object_has_pages(obj));
> + GEM_BUG_ON(!list_empty(&obj->mm.link));
> +
> + if (i915_gem_object_is_shrinkable(obj)) {
> + struct drm_i915_private *i915 = to_i915(obj->base.dev);
> + unsigned long flags;
> +
> + spin_lock_irqsave(&i915->mm.obj_lock, flags);
> + GEM_BUG_ON(!kref_read(&obj->base.refcount));
> +
> + list_add_tail(&obj->mm.link, &i915->mm.purge_list);
> + i915->mm.shrink_count++;
> + i915->mm.shrink_memory += obj->base.size;
> +
> + spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
> + }
> +}
Common helper for the above to passing in the correct list from each?
> diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c
> index 9e4f51ce52ff..9830edda1ade 100644
> --- a/drivers/gpu/drm/i915/gt/intel_context.c
> +++ b/drivers/gpu/drm/i915/gt/intel_context.c
> @@ -118,7 +118,7 @@ static int __context_pin_state(struct i915_vma *vma)
> * And mark it as a globally pinned object to let the shrinker know
> * it cannot reclaim the object until we release it.
> */
> - vma->obj->pin_global++;
> + i915_vma_make_unshrinkable(vma);
> vma->obj->mm.dirty = true;
>
> return 0;
> @@ -126,8 +126,8 @@ static int __context_pin_state(struct i915_vma *vma)
>
> static void __context_unpin_state(struct i915_vma *vma)
> {
> - vma->obj->pin_global--;
> __i915_vma_unpin(vma);
> + i915_vma_make_shrinkable(vma);
> }
>
> static void __intel_context_retire(struct i915_active *active)
> diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c
> index f7e69db4019d..5b16b233a059 100644
> --- a/drivers/gpu/drm/i915/gt/intel_gt.c
> +++ b/drivers/gpu/drm/i915/gt/intel_gt.c
> @@ -231,6 +231,8 @@ int intel_gt_init_scratch(struct intel_gt *gt, unsigned int size)
> if (ret)
> goto err_unref;
>
> + i915_gem_object_make_unshrinkable(obj);
> +
> gt->scratch = vma;
> return 0;
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c
> index 38ec11ae6ed7..d8efb88f33f3 100644
> --- a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c
> @@ -1238,7 +1238,7 @@ int intel_ring_pin(struct intel_ring *ring)
> goto err_ring;
> }
>
> - vma->obj->pin_global++;
> + i915_vma_make_unshrinkable(vma);
>
> GEM_BUG_ON(ring->vaddr);
> ring->vaddr = addr;
> @@ -1267,6 +1267,8 @@ void intel_ring_reset(struct intel_ring *ring, u32 tail)
>
> void intel_ring_unpin(struct intel_ring *ring)
> {
> + struct i915_vma *vma = ring->vma;
> +
> if (!atomic_dec_and_test(&ring->pin_count))
> return;
>
> @@ -1275,18 +1277,17 @@ void intel_ring_unpin(struct intel_ring *ring)
> /* Discard any unused bytes beyond that submitted to hw. */
> intel_ring_reset(ring, ring->tail);
>
> - GEM_BUG_ON(!ring->vma);
> - i915_vma_unset_ggtt_write(ring->vma);
> - if (i915_vma_is_map_and_fenceable(ring->vma))
> - i915_vma_unpin_iomap(ring->vma);
> + i915_vma_unset_ggtt_write(vma);
> + if (i915_vma_is_map_and_fenceable(vma))
> + i915_vma_unpin_iomap(vma);
> else
> - i915_gem_object_unpin_map(ring->vma->obj);
> + i915_gem_object_unpin_map(vma->obj);
>
> GEM_BUG_ON(!ring->vaddr);
> ring->vaddr = NULL;
>
> - ring->vma->obj->pin_global--;
> - i915_vma_unpin(ring->vma);
> + i915_vma_unpin(vma);
> + i915_vma_make_purgeable(vma);
Why is ring purgeable and scratch or context state shrinkable?
>
> intel_timeline_unpin(ring->timeline);
> }
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
> index 83f2c197375f..a5ba0164fd14 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
> @@ -597,6 +597,8 @@ struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size)
> goto err;
> }
>
> + i915_gem_object_make_unshrinkable(obj);
> +
> return vma;
>
> err:
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 6b84d04a6a28..c43f270085f5 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -363,8 +363,9 @@ static int i915_gem_object_info(struct seq_file *m, void *data)
> struct drm_i915_private *i915 = node_to_i915(m->private);
> int ret;
>
> - seq_printf(m, "%u shrinkable objects, %llu bytes\n",
> + seq_printf(m, "%u shrinkable [%u free] objects, %llu bytes\n",
> i915->mm.shrink_count,
> + atomic_read(&i915->mm.free_count),
> i915->mm.shrink_memory);
>
> seq_putc(m, '\n');
> diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
> index eb16a1a93bbc..e27ddbff487e 100644
> --- a/drivers/gpu/drm/i915/i915_vma.c
> +++ b/drivers/gpu/drm/i915/i915_vma.c
> @@ -1030,6 +1030,21 @@ int i915_vma_unbind(struct i915_vma *vma)
> return 0;
> }
>
> +void i915_vma_make_unshrinkable(struct i915_vma *vma)
> +{
> + i915_gem_object_make_unshrinkable(vma->obj);
> +}
> +
> +void i915_vma_make_shrinkable(struct i915_vma *vma)
> +{
> + i915_gem_object_make_shrinkable(vma->obj);
> +}
> +
> +void i915_vma_make_purgeable(struct i915_vma *vma)
> +{
> + i915_gem_object_make_purgeable(vma->obj);
> +}
Would i915_vma_make_*object*_... be a better name? I am thinking the
concept does not apply to vma's.
> +
> #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
> #include "selftests/i915_vma.c"
> #endif
> diff --git a/drivers/gpu/drm/i915/i915_vma.h b/drivers/gpu/drm/i915/i915_vma.h
> index 4b769db649bf..a24bd6787ef7 100644
> --- a/drivers/gpu/drm/i915/i915_vma.h
> +++ b/drivers/gpu/drm/i915/i915_vma.h
> @@ -459,4 +459,8 @@ void i915_vma_parked(struct drm_i915_private *i915);
> struct i915_vma *i915_vma_alloc(void);
> void i915_vma_free(struct i915_vma *vma);
>
> +void i915_vma_make_unshrinkable(struct i915_vma *vma);
> +void i915_vma_make_shrinkable(struct i915_vma *vma);
> +void i915_vma_make_purgeable(struct i915_vma *vma);
> +
> #endif
>
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] drm/i915: Hide unshrinkable context objects from the shrinker
2019-07-19 15:38 ` [PATCH] " Tvrtko Ursulin
@ 2019-07-19 15:50 ` Chris Wilson
0 siblings, 0 replies; 12+ messages in thread
From: Chris Wilson @ 2019-07-19 15:50 UTC (permalink / raw)
To: Tvrtko Ursulin, intel-gfx
Quoting Tvrtko Ursulin (2019-07-19 16:38:28)
>
> On 19/07/2019 14:04, Chris Wilson wrote:
> > +void i915_gem_object_make_unshrinkable(struct drm_i915_gem_object *obj)
> > +{
> > + if (!list_empty(&obj->mm.link)) {
>
> Which lock protects this list head?
Hmm, I was thinking this would be nicely ordered by the caller. But no,
not strongly protected against the shrinker...
> > + struct drm_i915_private *i915 = to_i915(obj->base.dev);
> > + unsigned long flags;
> > +
> > + spin_lock_irqsave(&i915->mm.obj_lock, flags);
> > + GEM_BUG_ON(list_empty(&obj->mm.link));
..and so this should be a regular if() not BUG_ON.
> > + list_del_init(&obj->mm.link);
> > + i915->mm.shrink_count--;
> > + i915->mm.shrink_memory -= obj->base.size;
> > +
> > + spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
> > + }
> > +}
> > +
> > +void i915_gem_object_make_shrinkable(struct drm_i915_gem_object *obj)
> > +{
> > + GEM_BUG_ON(!i915_gem_object_has_pages(obj));
> > + GEM_BUG_ON(!list_empty(&obj->mm.link));
> > +
> > + if (i915_gem_object_is_shrinkable(obj)) {
> > + struct drm_i915_private *i915 = to_i915(obj->base.dev);
> > + unsigned long flags;
> > +
> > + spin_lock_irqsave(&i915->mm.obj_lock, flags);
> > + GEM_BUG_ON(!kref_read(&obj->base.refcount));
> > +
> > + list_add_tail(&obj->mm.link, &i915->mm.shrink_list);
> > + i915->mm.shrink_count++;
> > + i915->mm.shrink_memory += obj->base.size;
> > +
> > + spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
> > + }
> > +}
> > +
> > +void i915_gem_object_make_purgeable(struct drm_i915_gem_object *obj)
> > +{
> > + GEM_BUG_ON(!i915_gem_object_has_pages(obj));
> > + GEM_BUG_ON(!list_empty(&obj->mm.link));
> > +
> > + if (i915_gem_object_is_shrinkable(obj)) {
> > + struct drm_i915_private *i915 = to_i915(obj->base.dev);
> > + unsigned long flags;
> > +
> > + spin_lock_irqsave(&i915->mm.obj_lock, flags);
> > + GEM_BUG_ON(!kref_read(&obj->base.refcount));
> > +
> > + list_add_tail(&obj->mm.link, &i915->mm.purge_list);
> > + i915->mm.shrink_count++;
> > + i915->mm.shrink_memory += obj->base.size;
> > +
> > + spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
> > + }
> > +}
>
> Common helper for the above to passing in the correct list from each?
It's also worth making that has_pages into a has_pinned_pages.
> > diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c
> > index 9e4f51ce52ff..9830edda1ade 100644
> > --- a/drivers/gpu/drm/i915/gt/intel_context.c
> > +++ b/drivers/gpu/drm/i915/gt/intel_context.c
> > @@ -118,7 +118,7 @@ static int __context_pin_state(struct i915_vma *vma)
> > * And mark it as a globally pinned object to let the shrinker know
> > * it cannot reclaim the object until we release it.
> > */
> > - vma->obj->pin_global++;
> > + i915_vma_make_unshrinkable(vma);
> > vma->obj->mm.dirty = true;
> >
> > return 0;
> > @@ -126,8 +126,8 @@ static int __context_pin_state(struct i915_vma *vma)
> >
> > static void __context_unpin_state(struct i915_vma *vma)
> > {
> > - vma->obj->pin_global--;
> > __i915_vma_unpin(vma);
> > + i915_vma_make_shrinkable(vma);
> > }
> >
> > static void __intel_context_retire(struct i915_active *active)
> > diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c
> > index f7e69db4019d..5b16b233a059 100644
> > --- a/drivers/gpu/drm/i915/gt/intel_gt.c
> > +++ b/drivers/gpu/drm/i915/gt/intel_gt.c
> > @@ -231,6 +231,8 @@ int intel_gt_init_scratch(struct intel_gt *gt, unsigned int size)
> > if (ret)
> > goto err_unref;
> >
> > + i915_gem_object_make_unshrinkable(obj);
> > +
> > gt->scratch = vma;
> > return 0;
> >
> > diff --git a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c
> > index 38ec11ae6ed7..d8efb88f33f3 100644
> > --- a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c
> > +++ b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c
> > @@ -1238,7 +1238,7 @@ int intel_ring_pin(struct intel_ring *ring)
> > goto err_ring;
> > }
> >
> > - vma->obj->pin_global++;
> > + i915_vma_make_unshrinkable(vma);
> >
> > GEM_BUG_ON(ring->vaddr);
> > ring->vaddr = addr;
> > @@ -1267,6 +1267,8 @@ void intel_ring_reset(struct intel_ring *ring, u32 tail)
> >
> > void intel_ring_unpin(struct intel_ring *ring)
> > {
> > + struct i915_vma *vma = ring->vma;
> > +
> > if (!atomic_dec_and_test(&ring->pin_count))
> > return;
> >
> > @@ -1275,18 +1277,17 @@ void intel_ring_unpin(struct intel_ring *ring)
> > /* Discard any unused bytes beyond that submitted to hw. */
> > intel_ring_reset(ring, ring->tail);
> >
> > - GEM_BUG_ON(!ring->vma);
> > - i915_vma_unset_ggtt_write(ring->vma);
> > - if (i915_vma_is_map_and_fenceable(ring->vma))
> > - i915_vma_unpin_iomap(ring->vma);
> > + i915_vma_unset_ggtt_write(vma);
> > + if (i915_vma_is_map_and_fenceable(vma))
> > + i915_vma_unpin_iomap(vma);
> > else
> > - i915_gem_object_unpin_map(ring->vma->obj);
> > + i915_gem_object_unpin_map(vma->obj);
> >
> > GEM_BUG_ON(!ring->vaddr);
> > ring->vaddr = NULL;
> >
> > - ring->vma->obj->pin_global--;
> > - i915_vma_unpin(ring->vma);
> > + i915_vma_unpin(vma);
> > + i915_vma_make_purgeable(vma);
>
> Why is ring purgeable and scratch or context state shrinkable?
Because the ring contains nothing, but context state must be preserved.
I was thinking the explicit selection would be clearer.
scratch will be thrown away at the end of the driver. I don't see an
instance where we make scratch shrinkable (except for a brief period it
is an internal object but is pinned).
> > +void i915_vma_make_unshrinkable(struct i915_vma *vma)
> > +{
> > + i915_gem_object_make_unshrinkable(vma->obj);
> > +}
> > +
> > +void i915_vma_make_shrinkable(struct i915_vma *vma)
> > +{
> > + i915_gem_object_make_shrinkable(vma->obj);
> > +}
> > +
> > +void i915_vma_make_purgeable(struct i915_vma *vma)
> > +{
> > + i915_gem_object_make_purgeable(vma->obj);
> > +}
>
> Would i915_vma_make_*object*_... be a better name? I am thinking the
> concept does not apply to vma's.
I'm planning ahead for a common backing store shared between objects and
vma, where vma doesn't operate on the object per-se, and we have a
first-class reference counted vma.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH] drm/i915: Hide unshrinkable context objects from the shrinker
2019-07-19 13:04 [PATCH] drm/i915: Hide unshrinkable context objects from the shrinker Chris Wilson
2019-07-19 14:29 ` ✓ Fi.CI.BAT: success for " Patchwork
2019-07-19 15:38 ` [PATCH] " Tvrtko Ursulin
@ 2019-07-19 16:32 ` Chris Wilson
2019-07-19 17:14 ` ✗ Fi.CI.BAT: failure for drm/i915: Hide unshrinkable context objects from the shrinker (rev2) Patchwork
` (4 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Chris Wilson @ 2019-07-19 16:32 UTC (permalink / raw)
To: intel-gfx
The shrinker cannot touch objects used by the contexts (logical state
and ring). Currently we mark those as "pin_global" to let the shrinker
skip over them, however, if we remove them from the shrinker lists
entirely, we don't event have to include them in our shrink accounting.
By keeping the unshrinkable objects in our shrinker tracking, we report
a large number of objects available to be shrunk, and leave the shrinker
deeply unsatisfied when we fail to reclaim those. The shrinker will
persist in trying to reclaim the unavailable objects, forcing the system
into a livelock (not even hitting the dread oomkiller).
v2: Extend unshrinkable protection for perma-pinned scratch and guc
allocations (Tvrtko)
v3: Notice that we should be pinned when marking unshrinkable and so the
link cannot be empty; merge duplicate paths.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/gem/i915_gem_object.c | 11 ++--
drivers/gpu/drm/i915/gem/i915_gem_object.h | 4 ++
drivers/gpu/drm/i915/gem/i915_gem_pages.c | 13 +----
drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 54 ++++++++++++++++++++
drivers/gpu/drm/i915/gt/intel_context.c | 4 +-
drivers/gpu/drm/i915/gt/intel_gt.c | 3 +-
drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 17 +++---
drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 +-
drivers/gpu/drm/i915/i915_debugfs.c | 3 +-
drivers/gpu/drm/i915/i915_vma.c | 16 ++++++
drivers/gpu/drm/i915/i915_vma.h | 4 ++
11 files changed, 98 insertions(+), 33 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c
index d5197a2a106f..4ea97fca9c35 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_object.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c
@@ -63,6 +63,8 @@ void i915_gem_object_init(struct drm_i915_gem_object *obj,
spin_lock_init(&obj->vma.lock);
INIT_LIST_HEAD(&obj->vma.list);
+ INIT_LIST_HEAD(&obj->mm.link);
+
INIT_LIST_HEAD(&obj->lut_list);
INIT_LIST_HEAD(&obj->batch_pool_link);
@@ -273,14 +275,7 @@ void i915_gem_free_object(struct drm_gem_object *gem_obj)
* or else we may oom whilst there are plenty of deferred
* freed objects.
*/
- if (i915_gem_object_has_pages(obj) &&
- i915_gem_object_is_shrinkable(obj)) {
- unsigned long flags;
-
- spin_lock_irqsave(&i915->mm.obj_lock, flags);
- list_del_init(&obj->mm.link);
- spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
- }
+ i915_gem_object_make_unshrinkable(obj);
/*
* Since we require blocking on struct_mutex to unbind the freed
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h
index 67aea07ea019..3714cf234d64 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_object.h
+++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h
@@ -394,6 +394,10 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,
unsigned int flags);
void i915_gem_object_unpin_from_display_plane(struct i915_vma *vma);
+void i915_gem_object_make_unshrinkable(struct drm_i915_gem_object *obj);
+void i915_gem_object_make_shrinkable(struct drm_i915_gem_object *obj);
+void i915_gem_object_make_purgeable(struct drm_i915_gem_object *obj);
+
static inline bool cpu_write_needs_clflush(struct drm_i915_gem_object *obj)
{
if (obj->cache_dirty)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pages.c b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
index b36ad269f4ea..92ad3cc220e3 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
@@ -153,24 +153,13 @@ static void __i915_gem_object_reset_page_iter(struct drm_i915_gem_object *obj)
struct sg_table *
__i915_gem_object_unset_pages(struct drm_i915_gem_object *obj)
{
- struct drm_i915_private *i915 = to_i915(obj->base.dev);
struct sg_table *pages;
pages = fetch_and_zero(&obj->mm.pages);
if (IS_ERR_OR_NULL(pages))
return pages;
- if (i915_gem_object_is_shrinkable(obj)) {
- unsigned long flags;
-
- spin_lock_irqsave(&i915->mm.obj_lock, flags);
-
- list_del(&obj->mm.link);
- i915->mm.shrink_count--;
- i915->mm.shrink_memory -= obj->base.size;
-
- spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
- }
+ i915_gem_object_make_unshrinkable(obj);
if (obj->mm.mapping) {
void *ptr;
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
index 3f4c6bdcc3c3..56f6d81c8e6a 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
@@ -530,3 +530,57 @@ void i915_gem_shrinker_taints_mutex(struct drm_i915_private *i915,
if (unlock)
mutex_release(&i915->drm.struct_mutex.dep_map, 0, _RET_IP_);
}
+
+#define obj_to_i915(obj__) to_i915((obj__)->base.dev)
+
+void i915_gem_object_make_unshrinkable(struct drm_i915_gem_object *obj)
+{
+ GEM_BUG_ON(!i915_gem_object_has_pinned_pages(obj));
+
+ if (!list_empty(&obj->mm.link)) { /* pinned by caller */
+ struct drm_i915_private *i915 = obj_to_i915(obj);
+ unsigned long flags;
+
+ spin_lock_irqsave(&i915->mm.obj_lock, flags);
+ GEM_BUG_ON(list_empty(&obj->mm.link));
+
+ list_del_init(&obj->mm.link);
+ i915->mm.shrink_count--;
+ i915->mm.shrink_memory -= obj->base.size;
+
+ spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
+ }
+}
+
+static void __i915_gem_object_make_shrinkable(struct drm_i915_gem_object *obj,
+ struct list_head *head)
+{
+ GEM_BUG_ON(!i915_gem_object_has_pages(obj));
+ GEM_BUG_ON(!list_empty(&obj->mm.link));
+
+ if (i915_gem_object_is_shrinkable(obj)) {
+ struct drm_i915_private *i915 = obj_to_i915(obj);
+ unsigned long flags;
+
+ spin_lock_irqsave(&i915->mm.obj_lock, flags);
+ GEM_BUG_ON(!kref_read(&obj->base.refcount));
+
+ list_add_tail(&obj->mm.link, head);
+ i915->mm.shrink_count++;
+ i915->mm.shrink_memory += obj->base.size;
+
+ spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
+ }
+}
+
+void i915_gem_object_make_shrinkable(struct drm_i915_gem_object *obj)
+{
+ __i915_gem_object_make_shrinkable(obj,
+ &obj_to_i915(obj)->mm.shrink_list);
+}
+
+void i915_gem_object_make_purgeable(struct drm_i915_gem_object *obj)
+{
+ __i915_gem_object_make_shrinkable(obj,
+ &obj_to_i915(obj)->mm.purge_list);
+}
diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c
index 9e4f51ce52ff..9830edda1ade 100644
--- a/drivers/gpu/drm/i915/gt/intel_context.c
+++ b/drivers/gpu/drm/i915/gt/intel_context.c
@@ -118,7 +118,7 @@ static int __context_pin_state(struct i915_vma *vma)
* And mark it as a globally pinned object to let the shrinker know
* it cannot reclaim the object until we release it.
*/
- vma->obj->pin_global++;
+ i915_vma_make_unshrinkable(vma);
vma->obj->mm.dirty = true;
return 0;
@@ -126,8 +126,8 @@ static int __context_pin_state(struct i915_vma *vma)
static void __context_unpin_state(struct i915_vma *vma)
{
- vma->obj->pin_global--;
__i915_vma_unpin(vma);
+ i915_vma_make_shrinkable(vma);
}
static void __intel_context_retire(struct i915_active *active)
diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c
index f7e69db4019d..de0d6ad5f93c 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt.c
@@ -231,7 +231,8 @@ int intel_gt_init_scratch(struct intel_gt *gt, unsigned int size)
if (ret)
goto err_unref;
- gt->scratch = vma;
+ gt->scratch = i915_vma_make_unshrinkable(vma);
+
return 0;
err_unref:
diff --git a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c
index 38ec11ae6ed7..d8efb88f33f3 100644
--- a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c
@@ -1238,7 +1238,7 @@ int intel_ring_pin(struct intel_ring *ring)
goto err_ring;
}
- vma->obj->pin_global++;
+ i915_vma_make_unshrinkable(vma);
GEM_BUG_ON(ring->vaddr);
ring->vaddr = addr;
@@ -1267,6 +1267,8 @@ void intel_ring_reset(struct intel_ring *ring, u32 tail)
void intel_ring_unpin(struct intel_ring *ring)
{
+ struct i915_vma *vma = ring->vma;
+
if (!atomic_dec_and_test(&ring->pin_count))
return;
@@ -1275,18 +1277,17 @@ void intel_ring_unpin(struct intel_ring *ring)
/* Discard any unused bytes beyond that submitted to hw. */
intel_ring_reset(ring, ring->tail);
- GEM_BUG_ON(!ring->vma);
- i915_vma_unset_ggtt_write(ring->vma);
- if (i915_vma_is_map_and_fenceable(ring->vma))
- i915_vma_unpin_iomap(ring->vma);
+ i915_vma_unset_ggtt_write(vma);
+ if (i915_vma_is_map_and_fenceable(vma))
+ i915_vma_unpin_iomap(vma);
else
- i915_gem_object_unpin_map(ring->vma->obj);
+ i915_gem_object_unpin_map(vma->obj);
GEM_BUG_ON(!ring->vaddr);
ring->vaddr = NULL;
- ring->vma->obj->pin_global--;
- i915_vma_unpin(ring->vma);
+ i915_vma_unpin(vma);
+ i915_vma_make_purgeable(vma);
intel_timeline_unpin(ring->timeline);
}
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
index 83f2c197375f..9c1712748527 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
@@ -597,7 +597,7 @@ struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size)
goto err;
}
- return vma;
+ return i915_vma_make_unshrinkable(vma);
err:
i915_gem_object_put(obj);
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 6b84d04a6a28..c43f270085f5 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -363,8 +363,9 @@ static int i915_gem_object_info(struct seq_file *m, void *data)
struct drm_i915_private *i915 = node_to_i915(m->private);
int ret;
- seq_printf(m, "%u shrinkable objects, %llu bytes\n",
+ seq_printf(m, "%u shrinkable [%u free] objects, %llu bytes\n",
i915->mm.shrink_count,
+ atomic_read(&i915->mm.free_count),
i915->mm.shrink_memory);
seq_putc(m, '\n');
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
index eb16a1a93bbc..b52f71e0ade6 100644
--- a/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@ -1030,6 +1030,22 @@ int i915_vma_unbind(struct i915_vma *vma)
return 0;
}
+struct i915_vma *i915_vma_make_unshrinkable(struct i915_vma *vma)
+{
+ i915_gem_object_make_unshrinkable(vma->obj);
+ return vma;
+}
+
+void i915_vma_make_shrinkable(struct i915_vma *vma)
+{
+ i915_gem_object_make_shrinkable(vma->obj);
+}
+
+void i915_vma_make_purgeable(struct i915_vma *vma)
+{
+ i915_gem_object_make_purgeable(vma->obj);
+}
+
#if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
#include "selftests/i915_vma.c"
#endif
diff --git a/drivers/gpu/drm/i915/i915_vma.h b/drivers/gpu/drm/i915/i915_vma.h
index 4b769db649bf..5c4224749bde 100644
--- a/drivers/gpu/drm/i915/i915_vma.h
+++ b/drivers/gpu/drm/i915/i915_vma.h
@@ -459,4 +459,8 @@ void i915_vma_parked(struct drm_i915_private *i915);
struct i915_vma *i915_vma_alloc(void);
void i915_vma_free(struct i915_vma *vma);
+struct i915_vma *i915_vma_make_unshrinkable(struct i915_vma *vma);
+void i915_vma_make_shrinkable(struct i915_vma *vma);
+void i915_vma_make_purgeable(struct i915_vma *vma);
+
#endif
--
2.22.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 12+ messages in thread
* ✗ Fi.CI.BAT: failure for drm/i915: Hide unshrinkable context objects from the shrinker (rev2)
2019-07-19 13:04 [PATCH] drm/i915: Hide unshrinkable context objects from the shrinker Chris Wilson
` (2 preceding siblings ...)
2019-07-19 16:32 ` Chris Wilson
@ 2019-07-19 17:14 ` Patchwork
2019-07-19 17:21 ` [PATCH] drm/i915: Hide unshrinkable context objects from the shrinker Chris Wilson
` (3 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2019-07-19 17:14 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Hide unshrinkable context objects from the shrinker (rev2)
URL : https://patchwork.freedesktop.org/series/63943/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_6513 -> Patchwork_13707
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_13707 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_13707, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13707/
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_13707:
### IGT changes ###
#### Possible regressions ####
* igt@gem_basic@create-close:
- fi-bwr-2160: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6513/fi-bwr-2160/igt@gem_basic@create-close.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13707/fi-bwr-2160/igt@gem_basic@create-close.html
- fi-ilk-650: [PASS][3] -> [INCOMPLETE][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6513/fi-ilk-650/igt@gem_basic@create-close.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13707/fi-ilk-650/igt@gem_basic@create-close.html
- fi-blb-e6850: [PASS][5] -> [INCOMPLETE][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6513/fi-blb-e6850/igt@gem_basic@create-close.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13707/fi-blb-e6850/igt@gem_basic@create-close.html
* igt@runner@aborted:
- fi-ilk-650: NOTRUN -> [FAIL][7]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13707/fi-ilk-650/igt@runner@aborted.html
- fi-pnv-d510: NOTRUN -> [FAIL][8]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13707/fi-pnv-d510/igt@runner@aborted.html
- fi-bdw-gvtdvm: NOTRUN -> [FAIL][9]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13707/fi-bdw-gvtdvm/igt@runner@aborted.html
- fi-gdg-551: NOTRUN -> [FAIL][10]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13707/fi-gdg-551/igt@runner@aborted.html
- fi-snb-2520m: NOTRUN -> [FAIL][11]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13707/fi-snb-2520m/igt@runner@aborted.html
- fi-bxt-j4205: NOTRUN -> [FAIL][12]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13707/fi-bxt-j4205/igt@runner@aborted.html
- fi-whl-u: NOTRUN -> [FAIL][13]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13707/fi-whl-u/igt@runner@aborted.html
- fi-cml-u2: NOTRUN -> [FAIL][14]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13707/fi-cml-u2/igt@runner@aborted.html
- fi-cml-u: NOTRUN -> [FAIL][15]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13707/fi-cml-u/igt@runner@aborted.html
- fi-ivb-3770: NOTRUN -> [FAIL][16]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13707/fi-ivb-3770/igt@runner@aborted.html
- fi-bxt-dsi: NOTRUN -> [FAIL][17]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13707/fi-bxt-dsi/igt@runner@aborted.html
- fi-byt-j1900: NOTRUN -> [FAIL][18]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13707/fi-byt-j1900/igt@runner@aborted.html
- fi-bsw-n3050: NOTRUN -> [FAIL][19]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13707/fi-bsw-n3050/igt@runner@aborted.html
- fi-blb-e6850: NOTRUN -> [FAIL][20]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13707/fi-blb-e6850/igt@runner@aborted.html
- fi-bsw-kefka: NOTRUN -> [FAIL][21]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13707/fi-bsw-kefka/igt@runner@aborted.html
- fi-apl-guc: NOTRUN -> [FAIL][22]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13707/fi-apl-guc/igt@runner@aborted.html
- fi-bdw-5557u: NOTRUN -> [FAIL][23]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13707/fi-bdw-5557u/igt@runner@aborted.html
- fi-byt-n2820: NOTRUN -> [FAIL][24]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13707/fi-byt-n2820/igt@runner@aborted.html
- fi-elk-e7500: NOTRUN -> [FAIL][25]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13707/fi-elk-e7500/igt@runner@aborted.html
Known issues
------------
Here are the changes found in Patchwork_13707 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_basic@create-close:
- fi-pnv-d510: [PASS][26] -> [INCOMPLETE][27] ([fdo#110740])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6513/fi-pnv-d510/igt@gem_basic@create-close.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13707/fi-pnv-d510/igt@gem_basic@create-close.html
- fi-elk-e7500: [PASS][28] -> [INCOMPLETE][29] ([fdo#103989])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6513/fi-elk-e7500/igt@gem_basic@create-close.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13707/fi-elk-e7500/igt@gem_basic@create-close.html
- fi-gdg-551: [PASS][30] -> [INCOMPLETE][31] ([fdo#108316])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6513/fi-gdg-551/igt@gem_basic@create-close.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13707/fi-gdg-551/igt@gem_basic@create-close.html
[fdo#103989]: https://bugs.freedesktop.org/show_bug.cgi?id=103989
[fdo#108316]: https://bugs.freedesktop.org/show_bug.cgi?id=108316
[fdo#110740]: https://bugs.freedesktop.org/show_bug.cgi?id=110740
Participating hosts (52 -> 47)
------------------------------
Additional (1): fi-bsw-n3050
Missing (6): fi-kbl-soraka fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_6513 -> Patchwork_13707
CI_DRM_6513: 4fd955732d1e51addeef52ae9f776818b10606d9 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5104: 10288a94dccead63efbd59d872c8c4ce9cf19788 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13707: 6afc31f0fd6501f76f2df4439771a08ed918e75e @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
6afc31f0fd65 drm/i915: Hide unshrinkable context objects from the shrinker
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13707/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH] drm/i915: Hide unshrinkable context objects from the shrinker
2019-07-19 13:04 [PATCH] drm/i915: Hide unshrinkable context objects from the shrinker Chris Wilson
` (3 preceding siblings ...)
2019-07-19 17:14 ` ✗ Fi.CI.BAT: failure for drm/i915: Hide unshrinkable context objects from the shrinker (rev2) Patchwork
@ 2019-07-19 17:21 ` Chris Wilson
2019-07-22 12:08 ` Tvrtko Ursulin
2019-07-19 18:09 ` ✓ Fi.CI.IGT: success for " Patchwork
` (2 subsequent siblings)
7 siblings, 1 reply; 12+ messages in thread
From: Chris Wilson @ 2019-07-19 17:21 UTC (permalink / raw)
To: intel-gfx
The shrinker cannot touch objects used by the contexts (logical state
and ring). Currently we mark those as "pin_global" to let the shrinker
skip over them, however, if we remove them from the shrinker lists
entirely, we don't event have to include them in our shrink accounting.
By keeping the unshrinkable objects in our shrinker tracking, we report
a large number of objects available to be shrunk, and leave the shrinker
deeply unsatisfied when we fail to reclaim those. The shrinker will
persist in trying to reclaim the unavailable objects, forcing the system
into a livelock (not even hitting the dread oomkiller).
v2: Extend unshrinkable protection for perma-pinned scratch and guc
allocations (Tvrtko)
v3: Notice that we should be pinned when marking unshrinkable and so the
link cannot be empty; merge duplicate paths.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/gem/i915_gem_object.c | 11 +---
drivers/gpu/drm/i915/gem/i915_gem_object.h | 4 ++
drivers/gpu/drm/i915/gem/i915_gem_pages.c | 13 +----
drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 58 ++++++++++++++++++++
drivers/gpu/drm/i915/gt/intel_context.c | 4 +-
drivers/gpu/drm/i915/gt/intel_gt.c | 3 +-
drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 17 +++---
drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 +-
drivers/gpu/drm/i915/i915_debugfs.c | 3 +-
drivers/gpu/drm/i915/i915_vma.c | 16 ++++++
drivers/gpu/drm/i915/i915_vma.h | 4 ++
11 files changed, 102 insertions(+), 33 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c
index d5197a2a106f..4ea97fca9c35 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_object.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c
@@ -63,6 +63,8 @@ void i915_gem_object_init(struct drm_i915_gem_object *obj,
spin_lock_init(&obj->vma.lock);
INIT_LIST_HEAD(&obj->vma.list);
+ INIT_LIST_HEAD(&obj->mm.link);
+
INIT_LIST_HEAD(&obj->lut_list);
INIT_LIST_HEAD(&obj->batch_pool_link);
@@ -273,14 +275,7 @@ void i915_gem_free_object(struct drm_gem_object *gem_obj)
* or else we may oom whilst there are plenty of deferred
* freed objects.
*/
- if (i915_gem_object_has_pages(obj) &&
- i915_gem_object_is_shrinkable(obj)) {
- unsigned long flags;
-
- spin_lock_irqsave(&i915->mm.obj_lock, flags);
- list_del_init(&obj->mm.link);
- spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
- }
+ i915_gem_object_make_unshrinkable(obj);
/*
* Since we require blocking on struct_mutex to unbind the freed
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h
index 67aea07ea019..3714cf234d64 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_object.h
+++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h
@@ -394,6 +394,10 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,
unsigned int flags);
void i915_gem_object_unpin_from_display_plane(struct i915_vma *vma);
+void i915_gem_object_make_unshrinkable(struct drm_i915_gem_object *obj);
+void i915_gem_object_make_shrinkable(struct drm_i915_gem_object *obj);
+void i915_gem_object_make_purgeable(struct drm_i915_gem_object *obj);
+
static inline bool cpu_write_needs_clflush(struct drm_i915_gem_object *obj)
{
if (obj->cache_dirty)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pages.c b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
index b36ad269f4ea..92ad3cc220e3 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
@@ -153,24 +153,13 @@ static void __i915_gem_object_reset_page_iter(struct drm_i915_gem_object *obj)
struct sg_table *
__i915_gem_object_unset_pages(struct drm_i915_gem_object *obj)
{
- struct drm_i915_private *i915 = to_i915(obj->base.dev);
struct sg_table *pages;
pages = fetch_and_zero(&obj->mm.pages);
if (IS_ERR_OR_NULL(pages))
return pages;
- if (i915_gem_object_is_shrinkable(obj)) {
- unsigned long flags;
-
- spin_lock_irqsave(&i915->mm.obj_lock, flags);
-
- list_del(&obj->mm.link);
- i915->mm.shrink_count--;
- i915->mm.shrink_memory -= obj->base.size;
-
- spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
- }
+ i915_gem_object_make_unshrinkable(obj);
if (obj->mm.mapping) {
void *ptr;
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
index 3f4c6bdcc3c3..5ab7df53c2a0 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
@@ -530,3 +530,61 @@ void i915_gem_shrinker_taints_mutex(struct drm_i915_private *i915,
if (unlock)
mutex_release(&i915->drm.struct_mutex.dep_map, 0, _RET_IP_);
}
+
+#define obj_to_i915(obj__) to_i915((obj__)->base.dev)
+
+void i915_gem_object_make_unshrinkable(struct drm_i915_gem_object *obj)
+{
+ /*
+ * We can only be called while the pages are pinned or when
+ * the pages are released. If pinned, we should only be called
+ * from a single caller under controlled conditions; and on release
+ * only one caller may release us. Neither the two may cross.
+ */
+ if (!list_empty(&obj->mm.link)) { /* pinned by caller */
+ struct drm_i915_private *i915 = obj_to_i915(obj);
+ unsigned long flags;
+
+ spin_lock_irqsave(&i915->mm.obj_lock, flags);
+ GEM_BUG_ON(list_empty(&obj->mm.link));
+
+ list_del_init(&obj->mm.link);
+ i915->mm.shrink_count--;
+ i915->mm.shrink_memory -= obj->base.size;
+
+ spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
+ }
+}
+
+static void __i915_gem_object_make_shrinkable(struct drm_i915_gem_object *obj,
+ struct list_head *head)
+{
+ GEM_BUG_ON(!i915_gem_object_has_pages(obj));
+ GEM_BUG_ON(!list_empty(&obj->mm.link));
+
+ if (i915_gem_object_is_shrinkable(obj)) {
+ struct drm_i915_private *i915 = obj_to_i915(obj);
+ unsigned long flags;
+
+ spin_lock_irqsave(&i915->mm.obj_lock, flags);
+ GEM_BUG_ON(!kref_read(&obj->base.refcount));
+
+ list_add_tail(&obj->mm.link, head);
+ i915->mm.shrink_count++;
+ i915->mm.shrink_memory += obj->base.size;
+
+ spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
+ }
+}
+
+void i915_gem_object_make_shrinkable(struct drm_i915_gem_object *obj)
+{
+ __i915_gem_object_make_shrinkable(obj,
+ &obj_to_i915(obj)->mm.shrink_list);
+}
+
+void i915_gem_object_make_purgeable(struct drm_i915_gem_object *obj)
+{
+ __i915_gem_object_make_shrinkable(obj,
+ &obj_to_i915(obj)->mm.purge_list);
+}
diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c
index 9e4f51ce52ff..9830edda1ade 100644
--- a/drivers/gpu/drm/i915/gt/intel_context.c
+++ b/drivers/gpu/drm/i915/gt/intel_context.c
@@ -118,7 +118,7 @@ static int __context_pin_state(struct i915_vma *vma)
* And mark it as a globally pinned object to let the shrinker know
* it cannot reclaim the object until we release it.
*/
- vma->obj->pin_global++;
+ i915_vma_make_unshrinkable(vma);
vma->obj->mm.dirty = true;
return 0;
@@ -126,8 +126,8 @@ static int __context_pin_state(struct i915_vma *vma)
static void __context_unpin_state(struct i915_vma *vma)
{
- vma->obj->pin_global--;
__i915_vma_unpin(vma);
+ i915_vma_make_shrinkable(vma);
}
static void __intel_context_retire(struct i915_active *active)
diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c
index f7e69db4019d..de0d6ad5f93c 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt.c
@@ -231,7 +231,8 @@ int intel_gt_init_scratch(struct intel_gt *gt, unsigned int size)
if (ret)
goto err_unref;
- gt->scratch = vma;
+ gt->scratch = i915_vma_make_unshrinkable(vma);
+
return 0;
err_unref:
diff --git a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c
index 38ec11ae6ed7..d8efb88f33f3 100644
--- a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c
@@ -1238,7 +1238,7 @@ int intel_ring_pin(struct intel_ring *ring)
goto err_ring;
}
- vma->obj->pin_global++;
+ i915_vma_make_unshrinkable(vma);
GEM_BUG_ON(ring->vaddr);
ring->vaddr = addr;
@@ -1267,6 +1267,8 @@ void intel_ring_reset(struct intel_ring *ring, u32 tail)
void intel_ring_unpin(struct intel_ring *ring)
{
+ struct i915_vma *vma = ring->vma;
+
if (!atomic_dec_and_test(&ring->pin_count))
return;
@@ -1275,18 +1277,17 @@ void intel_ring_unpin(struct intel_ring *ring)
/* Discard any unused bytes beyond that submitted to hw. */
intel_ring_reset(ring, ring->tail);
- GEM_BUG_ON(!ring->vma);
- i915_vma_unset_ggtt_write(ring->vma);
- if (i915_vma_is_map_and_fenceable(ring->vma))
- i915_vma_unpin_iomap(ring->vma);
+ i915_vma_unset_ggtt_write(vma);
+ if (i915_vma_is_map_and_fenceable(vma))
+ i915_vma_unpin_iomap(vma);
else
- i915_gem_object_unpin_map(ring->vma->obj);
+ i915_gem_object_unpin_map(vma->obj);
GEM_BUG_ON(!ring->vaddr);
ring->vaddr = NULL;
- ring->vma->obj->pin_global--;
- i915_vma_unpin(ring->vma);
+ i915_vma_unpin(vma);
+ i915_vma_make_purgeable(vma);
intel_timeline_unpin(ring->timeline);
}
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
index 83f2c197375f..9c1712748527 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
@@ -597,7 +597,7 @@ struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size)
goto err;
}
- return vma;
+ return i915_vma_make_unshrinkable(vma);
err:
i915_gem_object_put(obj);
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 6b84d04a6a28..c43f270085f5 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -363,8 +363,9 @@ static int i915_gem_object_info(struct seq_file *m, void *data)
struct drm_i915_private *i915 = node_to_i915(m->private);
int ret;
- seq_printf(m, "%u shrinkable objects, %llu bytes\n",
+ seq_printf(m, "%u shrinkable [%u free] objects, %llu bytes\n",
i915->mm.shrink_count,
+ atomic_read(&i915->mm.free_count),
i915->mm.shrink_memory);
seq_putc(m, '\n');
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
index eb16a1a93bbc..b52f71e0ade6 100644
--- a/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@ -1030,6 +1030,22 @@ int i915_vma_unbind(struct i915_vma *vma)
return 0;
}
+struct i915_vma *i915_vma_make_unshrinkable(struct i915_vma *vma)
+{
+ i915_gem_object_make_unshrinkable(vma->obj);
+ return vma;
+}
+
+void i915_vma_make_shrinkable(struct i915_vma *vma)
+{
+ i915_gem_object_make_shrinkable(vma->obj);
+}
+
+void i915_vma_make_purgeable(struct i915_vma *vma)
+{
+ i915_gem_object_make_purgeable(vma->obj);
+}
+
#if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
#include "selftests/i915_vma.c"
#endif
diff --git a/drivers/gpu/drm/i915/i915_vma.h b/drivers/gpu/drm/i915/i915_vma.h
index 4b769db649bf..5c4224749bde 100644
--- a/drivers/gpu/drm/i915/i915_vma.h
+++ b/drivers/gpu/drm/i915/i915_vma.h
@@ -459,4 +459,8 @@ void i915_vma_parked(struct drm_i915_private *i915);
struct i915_vma *i915_vma_alloc(void);
void i915_vma_free(struct i915_vma *vma);
+struct i915_vma *i915_vma_make_unshrinkable(struct i915_vma *vma);
+void i915_vma_make_shrinkable(struct i915_vma *vma);
+void i915_vma_make_purgeable(struct i915_vma *vma);
+
#endif
--
2.22.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 12+ messages in thread
* ✓ Fi.CI.IGT: success for drm/i915: Hide unshrinkable context objects from the shrinker
2019-07-19 13:04 [PATCH] drm/i915: Hide unshrinkable context objects from the shrinker Chris Wilson
` (4 preceding siblings ...)
2019-07-19 17:21 ` [PATCH] drm/i915: Hide unshrinkable context objects from the shrinker Chris Wilson
@ 2019-07-19 18:09 ` Patchwork
2019-07-19 18:13 ` ✓ Fi.CI.BAT: success for drm/i915: Hide unshrinkable context objects from the shrinker (rev3) Patchwork
2019-07-20 3:05 ` ✓ Fi.CI.IGT: " Patchwork
7 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2019-07-19 18:09 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Hide unshrinkable context objects from the shrinker
URL : https://patchwork.freedesktop.org/series/63943/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6511_full -> Patchwork_13701_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_13701_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_eio@in-flight-suspend:
- shard-skl: [PASS][1] -> [INCOMPLETE][2] ([fdo#104108]) +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6511/shard-skl9/igt@gem_eio@in-flight-suspend.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/shard-skl2/igt@gem_eio@in-flight-suspend.html
* igt@kms_cursor_crc@pipe-b-cursor-suspend:
- shard-apl: [PASS][3] -> [DMESG-WARN][4] ([fdo#108566]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6511/shard-apl4/igt@kms_cursor_crc@pipe-b-cursor-suspend.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/shard-apl8/igt@kms_cursor_crc@pipe-b-cursor-suspend.html
* igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-render:
- shard-iclb: [PASS][5] -> [FAIL][6] ([fdo#103167])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6511/shard-iclb5/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-render.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/shard-iclb2/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-render.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-plflip-blt:
- shard-iclb: [PASS][7] -> [INCOMPLETE][8] ([fdo#107713])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6511/shard-iclb4/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-plflip-blt.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/shard-iclb7/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-plflip-blt.html
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
- shard-skl: [PASS][9] -> [FAIL][10] ([fdo#108145])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6511/shard-skl6/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/shard-skl9/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html
* igt@kms_psr@no_drrs:
- shard-iclb: [PASS][11] -> [FAIL][12] ([fdo#108341])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6511/shard-iclb2/igt@kms_psr@no_drrs.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/shard-iclb1/igt@kms_psr@no_drrs.html
* igt@kms_psr@psr2_cursor_mmap_cpu:
- shard-iclb: [PASS][13] -> [SKIP][14] ([fdo#109441]) +2 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6511/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/shard-iclb1/igt@kms_psr@psr2_cursor_mmap_cpu.html
* igt@prime_busy@wait-hang-blt:
- shard-kbl: [PASS][15] -> [INCOMPLETE][16] ([fdo#103665])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6511/shard-kbl4/igt@prime_busy@wait-hang-blt.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/shard-kbl2/igt@prime_busy@wait-hang-blt.html
* igt@tools_test@tools_test:
- shard-kbl: [PASS][17] -> [SKIP][18] ([fdo#109271])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6511/shard-kbl6/igt@tools_test@tools_test.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/shard-kbl6/igt@tools_test@tools_test.html
#### Possible fixes ####
* igt@gem_exec_balancer@smoke:
- shard-iclb: [SKIP][19] ([fdo#110854]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6511/shard-iclb3/igt@gem_exec_balancer@smoke.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/shard-iclb4/igt@gem_exec_balancer@smoke.html
* igt@gem_tiled_swapping@non-threaded:
- shard-glk: [DMESG-WARN][21] ([fdo#108686]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6511/shard-glk2/igt@gem_tiled_swapping@non-threaded.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/shard-glk1/igt@gem_tiled_swapping@non-threaded.html
* igt@i915_suspend@sysfs-reader:
- shard-apl: [DMESG-WARN][23] ([fdo#108566]) -> [PASS][24] +2 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6511/shard-apl6/igt@i915_suspend@sysfs-reader.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/shard-apl2/igt@i915_suspend@sysfs-reader.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-skl: [FAIL][25] ([fdo#105363]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6511/shard-skl4/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/shard-skl5/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-indfb-pgflip-blt:
- shard-hsw: [INCOMPLETE][27] ([fdo#103540]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6511/shard-hsw6/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-indfb-pgflip-blt.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/shard-hsw6/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-indfb-pgflip-blt.html
* igt@kms_frontbuffer_tracking@fbc-badstride:
- shard-iclb: [FAIL][29] ([fdo#103167]) -> [PASS][30] +2 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6511/shard-iclb2/igt@kms_frontbuffer_tracking@fbc-badstride.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/shard-iclb4/igt@kms_frontbuffer_tracking@fbc-badstride.html
* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: [FAIL][31] ([fdo#108145]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6511/shard-skl5/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/shard-skl5/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
* igt@kms_psr@psr2_sprite_mmap_gtt:
- shard-iclb: [SKIP][33] ([fdo#109441]) -> [PASS][34] +2 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6511/shard-iclb5/igt@kms_psr@psr2_sprite_mmap_gtt.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/shard-iclb2/igt@kms_psr@psr2_sprite_mmap_gtt.html
* igt@kms_vblank@pipe-c-ts-continuation-dpms-suspend:
- shard-skl: [INCOMPLETE][35] ([fdo#104108]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6511/shard-skl6/igt@kms_vblank@pipe-c-ts-continuation-dpms-suspend.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/shard-skl2/igt@kms_vblank@pipe-c-ts-continuation-dpms-suspend.html
#### Warnings ####
* igt@kms_cursor_legacy@cursorb-vs-flipa-atomic-transitions-varying-size:
- shard-iclb: [SKIP][37] ([fdo#109274]) -> [INCOMPLETE][38] ([fdo#107713])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6511/shard-iclb2/igt@kms_cursor_legacy@cursorb-vs-flipa-atomic-transitions-varying-size.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/shard-iclb4/igt@kms_cursor_legacy@cursorb-vs-flipa-atomic-transitions-varying-size.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-gtt:
- shard-skl: [FAIL][39] ([fdo#108040]) -> [FAIL][40] ([fdo#103167])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6511/shard-skl2/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-gtt.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/shard-skl9/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-gtt.html
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#108040]: https://bugs.freedesktop.org/show_bug.cgi?id=108040
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108341]: https://bugs.freedesktop.org/show_bug.cgi?id=108341
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#108686]: https://bugs.freedesktop.org/show_bug.cgi?id=108686
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_6511 -> Patchwork_13701
CI_DRM_6511: dbedd493118204a194fbc480f86866ddebbc4723 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5103: 45c31e294b9d7874a9a21860f8a89c64bc853df2 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13701: f91fdb878d56bb5fc7ff6f123fd3bca37b32acfa @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13701/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Hide unshrinkable context objects from the shrinker (rev3)
2019-07-19 13:04 [PATCH] drm/i915: Hide unshrinkable context objects from the shrinker Chris Wilson
` (5 preceding siblings ...)
2019-07-19 18:09 ` ✓ Fi.CI.IGT: success for " Patchwork
@ 2019-07-19 18:13 ` Patchwork
2019-07-20 3:05 ` ✓ Fi.CI.IGT: " Patchwork
7 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2019-07-19 18:13 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Hide unshrinkable context objects from the shrinker (rev3)
URL : https://patchwork.freedesktop.org/series/63943/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6514 -> Patchwork_13708
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13708/
Known issues
------------
Here are the changes found in Patchwork_13708 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_mmap_gtt@basic-read-no-prefault:
- fi-glk-dsi: [PASS][1] -> [INCOMPLETE][2] ([fdo#103359] / [k.org#198133])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6514/fi-glk-dsi/igt@gem_mmap_gtt@basic-read-no-prefault.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13708/fi-glk-dsi/igt@gem_mmap_gtt@basic-read-no-prefault.html
* igt@kms_frontbuffer_tracking@basic:
- fi-icl-u2: [PASS][3] -> [FAIL][4] ([fdo#103167])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6514/fi-icl-u2/igt@kms_frontbuffer_tracking@basic.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13708/fi-icl-u2/igt@kms_frontbuffer_tracking@basic.html
* igt@vgem_basic@unload:
- fi-icl-u3: [PASS][5] -> [DMESG-WARN][6] ([fdo#107724])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6514/fi-icl-u3/igt@vgem_basic@unload.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13708/fi-icl-u3/igt@vgem_basic@unload.html
#### Possible fixes ####
* igt@gem_ctx_create@basic:
- fi-icl-u3: [DMESG-WARN][7] ([fdo#107724]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6514/fi-icl-u3/igt@gem_ctx_create@basic.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13708/fi-icl-u3/igt@gem_ctx_create@basic.html
* igt@gem_ctx_create@basic-files:
- fi-icl-guc: [INCOMPLETE][9] ([fdo#107713] / [fdo#109100]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6514/fi-icl-guc/igt@gem_ctx_create@basic-files.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13708/fi-icl-guc/igt@gem_ctx_create@basic-files.html
* {igt@gem_ctx_switch@rcs0}:
- fi-icl-dsi: [INCOMPLETE][11] ([fdo#107713]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6514/fi-icl-dsi/igt@gem_ctx_switch@rcs0.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13708/fi-icl-dsi/igt@gem_ctx_switch@rcs0.html
* igt@i915_selftest@live_contexts:
- fi-skl-iommu: [INCOMPLETE][13] ([fdo#111050]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6514/fi-skl-iommu/igt@i915_selftest@live_contexts.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13708/fi-skl-iommu/igt@i915_selftest@live_contexts.html
* igt@i915_selftest@live_execlists:
- fi-skl-gvtdvm: [DMESG-FAIL][15] ([fdo#111108]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6514/fi-skl-gvtdvm/igt@i915_selftest@live_execlists.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13708/fi-skl-gvtdvm/igt@i915_selftest@live_execlists.html
* igt@kms_chamelium@hdmi-edid-read:
- fi-icl-u2: [FAIL][17] -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6514/fi-icl-u2/igt@kms_chamelium@hdmi-edid-read.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13708/fi-icl-u2/igt@kms_chamelium@hdmi-edid-read.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
[fdo#111050]: https://bugs.freedesktop.org/show_bug.cgi?id=111050
[fdo#111108]: https://bugs.freedesktop.org/show_bug.cgi?id=111108
[k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133
Participating hosts (52 -> 46)
------------------------------
Missing (6): fi-byt-squawks fi-bsw-cyan fi-pnv-d510 fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_6514 -> Patchwork_13708
CI_DRM_6514: d4db68b0618363632332f3fe8b319a1b8eebf179 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5104: 10288a94dccead63efbd59d872c8c4ce9cf19788 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13708: c54c02ac374504d331ecb14e25b7b801d6793bf4 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
c54c02ac3745 drm/i915: Hide unshrinkable context objects from the shrinker
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13708/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* ✓ Fi.CI.IGT: success for drm/i915: Hide unshrinkable context objects from the shrinker (rev3)
2019-07-19 13:04 [PATCH] drm/i915: Hide unshrinkable context objects from the shrinker Chris Wilson
` (6 preceding siblings ...)
2019-07-19 18:13 ` ✓ Fi.CI.BAT: success for drm/i915: Hide unshrinkable context objects from the shrinker (rev3) Patchwork
@ 2019-07-20 3:05 ` Patchwork
7 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2019-07-20 3:05 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Hide unshrinkable context objects from the shrinker (rev3)
URL : https://patchwork.freedesktop.org/series/63943/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6514_full -> Patchwork_13708_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_13708_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_pipe_control_store_loop@reused-buffer:
- shard-iclb: [PASS][1] -> [INCOMPLETE][2] ([fdo#107713])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6514/shard-iclb8/igt@gem_pipe_control_store_loop@reused-buffer.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13708/shard-iclb7/igt@gem_pipe_control_store_loop@reused-buffer.html
* igt@kms_frontbuffer_tracking@fbc-badstride:
- shard-iclb: [PASS][3] -> [FAIL][4] ([fdo#103167]) +4 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6514/shard-iclb1/igt@kms_frontbuffer_tracking@fbc-badstride.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13708/shard-iclb2/igt@kms_frontbuffer_tracking@fbc-badstride.html
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [PASS][5] -> [FAIL][6] ([fdo#108145] / [fdo#110403])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6514/shard-skl10/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13708/shard-skl9/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
* igt@kms_psr@psr2_cursor_render:
- shard-iclb: [PASS][7] -> [SKIP][8] ([fdo#109441]) +5 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6514/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13708/shard-iclb7/igt@kms_psr@psr2_cursor_render.html
* igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend:
- shard-skl: [PASS][9] -> [INCOMPLETE][10] ([fdo#104108])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6514/shard-skl9/igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13708/shard-skl10/igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend.html
#### Possible fixes ####
* igt@gem_mmap_gtt@forked-big-copy-xy:
- shard-apl: [INCOMPLETE][11] ([fdo#103927]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6514/shard-apl2/igt@gem_mmap_gtt@forked-big-copy-xy.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13708/shard-apl7/igt@gem_mmap_gtt@forked-big-copy-xy.html
* igt@gem_softpin@noreloc-s3:
- shard-skl: [INCOMPLETE][13] ([fdo#104108]) -> [PASS][14] +1 similar issue
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6514/shard-skl8/igt@gem_softpin@noreloc-s3.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13708/shard-skl10/igt@gem_softpin@noreloc-s3.html
* igt@gem_tiled_swapping@non-threaded:
- shard-apl: [DMESG-WARN][15] ([fdo#108686]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6514/shard-apl4/igt@gem_tiled_swapping@non-threaded.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13708/shard-apl6/igt@gem_tiled_swapping@non-threaded.html
* igt@i915_suspend@fence-restore-untiled:
- shard-apl: [DMESG-WARN][17] ([fdo#108566]) -> [PASS][18] +1 similar issue
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6514/shard-apl7/igt@i915_suspend@fence-restore-untiled.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13708/shard-apl5/igt@i915_suspend@fence-restore-untiled.html
* igt@kms_draw_crc@draw-method-xrgb8888-blt-xtiled:
- shard-skl: [FAIL][19] ([fdo#103184] / [fdo#103232]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6514/shard-skl2/igt@kms_draw_crc@draw-method-xrgb8888-blt-xtiled.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13708/shard-skl8/igt@kms_draw_crc@draw-method-xrgb8888-blt-xtiled.html
* igt@kms_flip@dpms-vs-vblank-race-interruptible:
- shard-glk: [FAIL][21] ([fdo#103060]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6514/shard-glk9/igt@kms_flip@dpms-vs-vblank-race-interruptible.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13708/shard-glk3/igt@kms_flip@dpms-vs-vblank-race-interruptible.html
* igt@kms_frontbuffer_tracking@fbc-rgb565-draw-pwrite:
- shard-iclb: [FAIL][23] ([fdo#103167]) -> [PASS][24] +2 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6514/shard-iclb2/igt@kms_frontbuffer_tracking@fbc-rgb565-draw-pwrite.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13708/shard-iclb4/igt@kms_frontbuffer_tracking@fbc-rgb565-draw-pwrite.html
* igt@kms_psr@psr2_sprite_mmap_gtt:
- shard-iclb: [SKIP][25] ([fdo#109441]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6514/shard-iclb1/igt@kms_psr@psr2_sprite_mmap_gtt.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13708/shard-iclb2/igt@kms_psr@psr2_sprite_mmap_gtt.html
* igt@kms_setmode@basic:
- shard-kbl: [FAIL][27] ([fdo#99912]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6514/shard-kbl3/igt@kms_setmode@basic.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13708/shard-kbl4/igt@kms_setmode@basic.html
* igt@perf_pmu@rc6-runtime-pm-long:
- shard-iclb: [INCOMPLETE][29] ([fdo#107713]) -> [PASS][30] +1 similar issue
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6514/shard-iclb7/igt@perf_pmu@rc6-runtime-pm-long.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13708/shard-iclb5/igt@perf_pmu@rc6-runtime-pm-long.html
[fdo#103060]: https://bugs.freedesktop.org/show_bug.cgi?id=103060
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103184]: https://bugs.freedesktop.org/show_bug.cgi?id=103184
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#108686]: https://bugs.freedesktop.org/show_bug.cgi?id=108686
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_6514 -> Patchwork_13708
CI_DRM_6514: d4db68b0618363632332f3fe8b319a1b8eebf179 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5104: 10288a94dccead63efbd59d872c8c4ce9cf19788 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13708: c54c02ac374504d331ecb14e25b7b801d6793bf4 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13708/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] drm/i915: Hide unshrinkable context objects from the shrinker
2019-07-19 17:21 ` [PATCH] drm/i915: Hide unshrinkable context objects from the shrinker Chris Wilson
@ 2019-07-22 12:08 ` Tvrtko Ursulin
2019-07-22 21:51 ` Chris Wilson
0 siblings, 1 reply; 12+ messages in thread
From: Tvrtko Ursulin @ 2019-07-22 12:08 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On 19/07/2019 18:21, Chris Wilson wrote:
> The shrinker cannot touch objects used by the contexts (logical state
> and ring). Currently we mark those as "pin_global" to let the shrinker
> skip over them, however, if we remove them from the shrinker lists
> entirely, we don't event have to include them in our shrink accounting.
>
> By keeping the unshrinkable objects in our shrinker tracking, we report
> a large number of objects available to be shrunk, and leave the shrinker
> deeply unsatisfied when we fail to reclaim those. The shrinker will
> persist in trying to reclaim the unavailable objects, forcing the system
> into a livelock (not even hitting the dread oomkiller).
>
> v2: Extend unshrinkable protection for perma-pinned scratch and guc
> allocations (Tvrtko)
> v3: Notice that we should be pinned when marking unshrinkable and so the
> link cannot be empty; merge duplicate paths.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> ---
> drivers/gpu/drm/i915/gem/i915_gem_object.c | 11 +---
> drivers/gpu/drm/i915/gem/i915_gem_object.h | 4 ++
> drivers/gpu/drm/i915/gem/i915_gem_pages.c | 13 +----
> drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 58 ++++++++++++++++++++
> drivers/gpu/drm/i915/gt/intel_context.c | 4 +-
> drivers/gpu/drm/i915/gt/intel_gt.c | 3 +-
> drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 17 +++---
> drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 +-
> drivers/gpu/drm/i915/i915_debugfs.c | 3 +-
> drivers/gpu/drm/i915/i915_vma.c | 16 ++++++
> drivers/gpu/drm/i915/i915_vma.h | 4 ++
> 11 files changed, 102 insertions(+), 33 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c
> index d5197a2a106f..4ea97fca9c35 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_object.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c
> @@ -63,6 +63,8 @@ void i915_gem_object_init(struct drm_i915_gem_object *obj,
> spin_lock_init(&obj->vma.lock);
> INIT_LIST_HEAD(&obj->vma.list);
>
> + INIT_LIST_HEAD(&obj->mm.link);
> +
> INIT_LIST_HEAD(&obj->lut_list);
> INIT_LIST_HEAD(&obj->batch_pool_link);
>
> @@ -273,14 +275,7 @@ void i915_gem_free_object(struct drm_gem_object *gem_obj)
> * or else we may oom whilst there are plenty of deferred
> * freed objects.
> */
> - if (i915_gem_object_has_pages(obj) &&
> - i915_gem_object_is_shrinkable(obj)) {
> - unsigned long flags;
> -
> - spin_lock_irqsave(&i915->mm.obj_lock, flags);
> - list_del_init(&obj->mm.link);
> - spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
> - }
> + i915_gem_object_make_unshrinkable(obj);
>
> /*
> * Since we require blocking on struct_mutex to unbind the freed
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h
> index 67aea07ea019..3714cf234d64 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_object.h
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h
> @@ -394,6 +394,10 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,
> unsigned int flags);
> void i915_gem_object_unpin_from_display_plane(struct i915_vma *vma);
>
> +void i915_gem_object_make_unshrinkable(struct drm_i915_gem_object *obj);
> +void i915_gem_object_make_shrinkable(struct drm_i915_gem_object *obj);
> +void i915_gem_object_make_purgeable(struct drm_i915_gem_object *obj);
> +
> static inline bool cpu_write_needs_clflush(struct drm_i915_gem_object *obj)
> {
> if (obj->cache_dirty)
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pages.c b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
> index b36ad269f4ea..92ad3cc220e3 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
> @@ -153,24 +153,13 @@ static void __i915_gem_object_reset_page_iter(struct drm_i915_gem_object *obj)
> struct sg_table *
> __i915_gem_object_unset_pages(struct drm_i915_gem_object *obj)
> {
> - struct drm_i915_private *i915 = to_i915(obj->base.dev);
> struct sg_table *pages;
>
> pages = fetch_and_zero(&obj->mm.pages);
> if (IS_ERR_OR_NULL(pages))
> return pages;
>
> - if (i915_gem_object_is_shrinkable(obj)) {
> - unsigned long flags;
> -
> - spin_lock_irqsave(&i915->mm.obj_lock, flags);
> -
> - list_del(&obj->mm.link);
> - i915->mm.shrink_count--;
> - i915->mm.shrink_memory -= obj->base.size;
> -
> - spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
> - }
> + i915_gem_object_make_unshrinkable(obj);
>
> if (obj->mm.mapping) {
> void *ptr;
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
> index 3f4c6bdcc3c3..5ab7df53c2a0 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
> @@ -530,3 +530,61 @@ void i915_gem_shrinker_taints_mutex(struct drm_i915_private *i915,
> if (unlock)
> mutex_release(&i915->drm.struct_mutex.dep_map, 0, _RET_IP_);
> }
> +
> +#define obj_to_i915(obj__) to_i915((obj__)->base.dev)
> +
> +void i915_gem_object_make_unshrinkable(struct drm_i915_gem_object *obj)
> +{
> + /*
> + * We can only be called while the pages are pinned or when
> + * the pages are released. If pinned, we should only be called
> + * from a single caller under controlled conditions; and on release
> + * only one caller may release us. Neither the two may cross.
> + */
> + if (!list_empty(&obj->mm.link)) { /* pinned by caller */
It's making me nervous. Are you avoiding checking under the lock just as
an optimisation? It's not on any hot paths, or at least not very hot?
Ring/context pin and that..
Regards,
Tvrtko
> + struct drm_i915_private *i915 = obj_to_i915(obj);
> + unsigned long flags;
> +
> + spin_lock_irqsave(&i915->mm.obj_lock, flags);
> + GEM_BUG_ON(list_empty(&obj->mm.link));
> +
> + list_del_init(&obj->mm.link);
> + i915->mm.shrink_count--;
> + i915->mm.shrink_memory -= obj->base.size;
> +
> + spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
> + }
> +}
> +
> +static void __i915_gem_object_make_shrinkable(struct drm_i915_gem_object *obj,
> + struct list_head *head)
> +{
> + GEM_BUG_ON(!i915_gem_object_has_pages(obj));
> + GEM_BUG_ON(!list_empty(&obj->mm.link));
> +
> + if (i915_gem_object_is_shrinkable(obj)) {
> + struct drm_i915_private *i915 = obj_to_i915(obj);
> + unsigned long flags;
> +
> + spin_lock_irqsave(&i915->mm.obj_lock, flags);
> + GEM_BUG_ON(!kref_read(&obj->base.refcount));
> +
> + list_add_tail(&obj->mm.link, head);
> + i915->mm.shrink_count++;
> + i915->mm.shrink_memory += obj->base.size;
> +
> + spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
> + }
> +}
> +
> +void i915_gem_object_make_shrinkable(struct drm_i915_gem_object *obj)
> +{
> + __i915_gem_object_make_shrinkable(obj,
> + &obj_to_i915(obj)->mm.shrink_list);
> +}
> +
> +void i915_gem_object_make_purgeable(struct drm_i915_gem_object *obj)
> +{
> + __i915_gem_object_make_shrinkable(obj,
> + &obj_to_i915(obj)->mm.purge_list);
> +}
> diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c
> index 9e4f51ce52ff..9830edda1ade 100644
> --- a/drivers/gpu/drm/i915/gt/intel_context.c
> +++ b/drivers/gpu/drm/i915/gt/intel_context.c
> @@ -118,7 +118,7 @@ static int __context_pin_state(struct i915_vma *vma)
> * And mark it as a globally pinned object to let the shrinker know
> * it cannot reclaim the object until we release it.
> */
> - vma->obj->pin_global++;
> + i915_vma_make_unshrinkable(vma);
> vma->obj->mm.dirty = true;
>
> return 0;
> @@ -126,8 +126,8 @@ static int __context_pin_state(struct i915_vma *vma)
>
> static void __context_unpin_state(struct i915_vma *vma)
> {
> - vma->obj->pin_global--;
> __i915_vma_unpin(vma);
> + i915_vma_make_shrinkable(vma);
> }
>
> static void __intel_context_retire(struct i915_active *active)
> diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c
> index f7e69db4019d..de0d6ad5f93c 100644
> --- a/drivers/gpu/drm/i915/gt/intel_gt.c
> +++ b/drivers/gpu/drm/i915/gt/intel_gt.c
> @@ -231,7 +231,8 @@ int intel_gt_init_scratch(struct intel_gt *gt, unsigned int size)
> if (ret)
> goto err_unref;
>
> - gt->scratch = vma;
> + gt->scratch = i915_vma_make_unshrinkable(vma);
> +
> return 0;
>
> err_unref:
> diff --git a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c
> index 38ec11ae6ed7..d8efb88f33f3 100644
> --- a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c
> @@ -1238,7 +1238,7 @@ int intel_ring_pin(struct intel_ring *ring)
> goto err_ring;
> }
>
> - vma->obj->pin_global++;
> + i915_vma_make_unshrinkable(vma);
>
> GEM_BUG_ON(ring->vaddr);
> ring->vaddr = addr;
> @@ -1267,6 +1267,8 @@ void intel_ring_reset(struct intel_ring *ring, u32 tail)
>
> void intel_ring_unpin(struct intel_ring *ring)
> {
> + struct i915_vma *vma = ring->vma;
> +
> if (!atomic_dec_and_test(&ring->pin_count))
> return;
>
> @@ -1275,18 +1277,17 @@ void intel_ring_unpin(struct intel_ring *ring)
> /* Discard any unused bytes beyond that submitted to hw. */
> intel_ring_reset(ring, ring->tail);
>
> - GEM_BUG_ON(!ring->vma);
> - i915_vma_unset_ggtt_write(ring->vma);
> - if (i915_vma_is_map_and_fenceable(ring->vma))
> - i915_vma_unpin_iomap(ring->vma);
> + i915_vma_unset_ggtt_write(vma);
> + if (i915_vma_is_map_and_fenceable(vma))
> + i915_vma_unpin_iomap(vma);
> else
> - i915_gem_object_unpin_map(ring->vma->obj);
> + i915_gem_object_unpin_map(vma->obj);
>
> GEM_BUG_ON(!ring->vaddr);
> ring->vaddr = NULL;
>
> - ring->vma->obj->pin_global--;
> - i915_vma_unpin(ring->vma);
> + i915_vma_unpin(vma);
> + i915_vma_make_purgeable(vma);
>
> intel_timeline_unpin(ring->timeline);
> }
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
> index 83f2c197375f..9c1712748527 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
> @@ -597,7 +597,7 @@ struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size)
> goto err;
> }
>
> - return vma;
> + return i915_vma_make_unshrinkable(vma);
>
> err:
> i915_gem_object_put(obj);
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 6b84d04a6a28..c43f270085f5 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -363,8 +363,9 @@ static int i915_gem_object_info(struct seq_file *m, void *data)
> struct drm_i915_private *i915 = node_to_i915(m->private);
> int ret;
>
> - seq_printf(m, "%u shrinkable objects, %llu bytes\n",
> + seq_printf(m, "%u shrinkable [%u free] objects, %llu bytes\n",
> i915->mm.shrink_count,
> + atomic_read(&i915->mm.free_count),
> i915->mm.shrink_memory);
>
> seq_putc(m, '\n');
> diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
> index eb16a1a93bbc..b52f71e0ade6 100644
> --- a/drivers/gpu/drm/i915/i915_vma.c
> +++ b/drivers/gpu/drm/i915/i915_vma.c
> @@ -1030,6 +1030,22 @@ int i915_vma_unbind(struct i915_vma *vma)
> return 0;
> }
>
> +struct i915_vma *i915_vma_make_unshrinkable(struct i915_vma *vma)
> +{
> + i915_gem_object_make_unshrinkable(vma->obj);
> + return vma;
> +}
> +
> +void i915_vma_make_shrinkable(struct i915_vma *vma)
> +{
> + i915_gem_object_make_shrinkable(vma->obj);
> +}
> +
> +void i915_vma_make_purgeable(struct i915_vma *vma)
> +{
> + i915_gem_object_make_purgeable(vma->obj);
> +}
> +
> #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
> #include "selftests/i915_vma.c"
> #endif
> diff --git a/drivers/gpu/drm/i915/i915_vma.h b/drivers/gpu/drm/i915/i915_vma.h
> index 4b769db649bf..5c4224749bde 100644
> --- a/drivers/gpu/drm/i915/i915_vma.h
> +++ b/drivers/gpu/drm/i915/i915_vma.h
> @@ -459,4 +459,8 @@ void i915_vma_parked(struct drm_i915_private *i915);
> struct i915_vma *i915_vma_alloc(void);
> void i915_vma_free(struct i915_vma *vma);
>
> +struct i915_vma *i915_vma_make_unshrinkable(struct i915_vma *vma);
> +void i915_vma_make_shrinkable(struct i915_vma *vma);
> +void i915_vma_make_purgeable(struct i915_vma *vma);
> +
> #endif
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] drm/i915: Hide unshrinkable context objects from the shrinker
2019-07-22 12:08 ` Tvrtko Ursulin
@ 2019-07-22 21:51 ` Chris Wilson
0 siblings, 0 replies; 12+ messages in thread
From: Chris Wilson @ 2019-07-22 21:51 UTC (permalink / raw)
To: Tvrtko Ursulin, intel-gfx
Quoting Tvrtko Ursulin (2019-07-22 13:08:42)
>
> On 19/07/2019 18:21, Chris Wilson wrote:
> > The shrinker cannot touch objects used by the contexts (logical state
> > and ring). Currently we mark those as "pin_global" to let the shrinker
> > skip over them, however, if we remove them from the shrinker lists
> > entirely, we don't event have to include them in our shrink accounting.
> >
> > By keeping the unshrinkable objects in our shrinker tracking, we report
> > a large number of objects available to be shrunk, and leave the shrinker
> > deeply unsatisfied when we fail to reclaim those. The shrinker will
> > persist in trying to reclaim the unavailable objects, forcing the system
> > into a livelock (not even hitting the dread oomkiller).
> >
> > v2: Extend unshrinkable protection for perma-pinned scratch and guc
> > allocations (Tvrtko)
> > v3: Notice that we should be pinned when marking unshrinkable and so the
> > link cannot be empty; merge duplicate paths.
> >
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> > ---
> > drivers/gpu/drm/i915/gem/i915_gem_object.c | 11 +---
> > drivers/gpu/drm/i915/gem/i915_gem_object.h | 4 ++
> > drivers/gpu/drm/i915/gem/i915_gem_pages.c | 13 +----
> > drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 58 ++++++++++++++++++++
> > drivers/gpu/drm/i915/gt/intel_context.c | 4 +-
> > drivers/gpu/drm/i915/gt/intel_gt.c | 3 +-
> > drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 17 +++---
> > drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 +-
> > drivers/gpu/drm/i915/i915_debugfs.c | 3 +-
> > drivers/gpu/drm/i915/i915_vma.c | 16 ++++++
> > drivers/gpu/drm/i915/i915_vma.h | 4 ++
> > 11 files changed, 102 insertions(+), 33 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c
> > index d5197a2a106f..4ea97fca9c35 100644
> > --- a/drivers/gpu/drm/i915/gem/i915_gem_object.c
> > +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c
> > @@ -63,6 +63,8 @@ void i915_gem_object_init(struct drm_i915_gem_object *obj,
> > spin_lock_init(&obj->vma.lock);
> > INIT_LIST_HEAD(&obj->vma.list);
> >
> > + INIT_LIST_HEAD(&obj->mm.link);
> > +
> > INIT_LIST_HEAD(&obj->lut_list);
> > INIT_LIST_HEAD(&obj->batch_pool_link);
> >
> > @@ -273,14 +275,7 @@ void i915_gem_free_object(struct drm_gem_object *gem_obj)
> > * or else we may oom whilst there are plenty of deferred
> > * freed objects.
> > */
> > - if (i915_gem_object_has_pages(obj) &&
> > - i915_gem_object_is_shrinkable(obj)) {
> > - unsigned long flags;
> > -
> > - spin_lock_irqsave(&i915->mm.obj_lock, flags);
> > - list_del_init(&obj->mm.link);
> > - spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
> > - }
> > + i915_gem_object_make_unshrinkable(obj);
> >
> > /*
> > * Since we require blocking on struct_mutex to unbind the freed
> > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h
> > index 67aea07ea019..3714cf234d64 100644
> > --- a/drivers/gpu/drm/i915/gem/i915_gem_object.h
> > +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h
> > @@ -394,6 +394,10 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,
> > unsigned int flags);
> > void i915_gem_object_unpin_from_display_plane(struct i915_vma *vma);
> >
> > +void i915_gem_object_make_unshrinkable(struct drm_i915_gem_object *obj);
> > +void i915_gem_object_make_shrinkable(struct drm_i915_gem_object *obj);
> > +void i915_gem_object_make_purgeable(struct drm_i915_gem_object *obj);
> > +
> > static inline bool cpu_write_needs_clflush(struct drm_i915_gem_object *obj)
> > {
> > if (obj->cache_dirty)
> > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pages.c b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
> > index b36ad269f4ea..92ad3cc220e3 100644
> > --- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c
> > +++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
> > @@ -153,24 +153,13 @@ static void __i915_gem_object_reset_page_iter(struct drm_i915_gem_object *obj)
> > struct sg_table *
> > __i915_gem_object_unset_pages(struct drm_i915_gem_object *obj)
> > {
> > - struct drm_i915_private *i915 = to_i915(obj->base.dev);
> > struct sg_table *pages;
> >
> > pages = fetch_and_zero(&obj->mm.pages);
> > if (IS_ERR_OR_NULL(pages))
> > return pages;
> >
> > - if (i915_gem_object_is_shrinkable(obj)) {
> > - unsigned long flags;
> > -
> > - spin_lock_irqsave(&i915->mm.obj_lock, flags);
> > -
> > - list_del(&obj->mm.link);
> > - i915->mm.shrink_count--;
> > - i915->mm.shrink_memory -= obj->base.size;
> > -
> > - spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
> > - }
> > + i915_gem_object_make_unshrinkable(obj);
> >
> > if (obj->mm.mapping) {
> > void *ptr;
> > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
> > index 3f4c6bdcc3c3..5ab7df53c2a0 100644
> > --- a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
> > +++ b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
> > @@ -530,3 +530,61 @@ void i915_gem_shrinker_taints_mutex(struct drm_i915_private *i915,
> > if (unlock)
> > mutex_release(&i915->drm.struct_mutex.dep_map, 0, _RET_IP_);
> > }
> > +
> > +#define obj_to_i915(obj__) to_i915((obj__)->base.dev)
> > +
> > +void i915_gem_object_make_unshrinkable(struct drm_i915_gem_object *obj)
> > +{
> > + /*
> > + * We can only be called while the pages are pinned or when
> > + * the pages are released. If pinned, we should only be called
> > + * from a single caller under controlled conditions; and on release
> > + * only one caller may release us. Neither the two may cross.
> > + */
> > + if (!list_empty(&obj->mm.link)) { /* pinned by caller */
>
> It's making me nervous. Are you avoiding checking under the lock just as
> an optimisation? It's not on any hot paths, or at least not very hot?
> Ring/context pin and that..
Because it's called from inside the obj->mm.lock with pin_count==0, and
outside when pinned by the caller. This portion is easy as an atomic
read, it's the later elided check inside the lock that requires the
thought. I consider i915->mm.obj_lock taken frequently enough to be a
concern, especially in the context of this patch where we hit a livelock
in the shrinker that leaves it running 100%.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2019-07-22 21:51 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-19 13:04 [PATCH] drm/i915: Hide unshrinkable context objects from the shrinker Chris Wilson
2019-07-19 14:29 ` ✓ Fi.CI.BAT: success for " Patchwork
2019-07-19 15:38 ` [PATCH] " Tvrtko Ursulin
2019-07-19 15:50 ` Chris Wilson
2019-07-19 16:32 ` Chris Wilson
2019-07-19 17:14 ` ✗ Fi.CI.BAT: failure for drm/i915: Hide unshrinkable context objects from the shrinker (rev2) Patchwork
2019-07-19 17:21 ` [PATCH] drm/i915: Hide unshrinkable context objects from the shrinker Chris Wilson
2019-07-22 12:08 ` Tvrtko Ursulin
2019-07-22 21:51 ` Chris Wilson
2019-07-19 18:09 ` ✓ Fi.CI.IGT: success for " Patchwork
2019-07-19 18:13 ` ✓ Fi.CI.BAT: success for drm/i915: Hide unshrinkable context objects from the shrinker (rev3) Patchwork
2019-07-20 3:05 ` ✓ Fi.CI.IGT: " Patchwork
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.