All of lore.kernel.org
 help / color / mirror / Atom feed
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>,
	dri-devel@lists.freedesktop.org
Subject: [PATCH v3 02/17] drm/i915: Change shrink ordering to use locking around unbinding.
Date: Thu, 16 Dec 2021 15:27:34 +0100	[thread overview]
Message-ID: <20211216142749.1966107-3-maarten.lankhorst@linux.intel.com> (raw)
In-Reply-To: <20211216142749.1966107-1-maarten.lankhorst@linux.intel.com>

Call drop_pages with the gem object lock held, instead of the other
way around. This will allow us to drop the vma bindings with the
gem object lock held.

We plan to require the object lock for unpinning in the future,
and this is an easy target.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
---
 drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 38 ++++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
index 157a9765f483..eebff4735781 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
@@ -36,8 +36,8 @@ static bool can_release_pages(struct drm_i915_gem_object *obj)
 	return swap_available() || obj->mm.madv == I915_MADV_DONTNEED;
 }
 
-static bool unsafe_drop_pages(struct drm_i915_gem_object *obj,
-			      unsigned long shrink, bool trylock_vm)
+static int drop_pages(struct drm_i915_gem_object *obj,
+		       unsigned long shrink, bool trylock_vm)
 {
 	unsigned long flags;
 
@@ -214,26 +214,24 @@ i915_gem_shrink(struct i915_gem_ww_ctx *ww,
 
 			spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
 
-			err = 0;
-			if (unsafe_drop_pages(obj, shrink, trylock_vm)) {
-				/* May arrive from get_pages on another bo */
-				if (!ww) {
-					if (!i915_gem_object_trylock(obj))
-						goto skip;
-				} else {
-					err = i915_gem_object_lock(obj, ww);
-					if (err)
-						goto skip;
-				}
-
-				if (!__i915_gem_object_put_pages(obj)) {
-					if (!try_to_writeback(obj, shrink))
-						count += obj->base.size >> PAGE_SHIFT;
-				}
-				if (!ww)
-					i915_gem_object_unlock(obj);
+			/* May arrive from get_pages on another bo */
+			if (!ww) {
+				if (!i915_gem_object_trylock(obj))
+					goto skip;
+			} else {
+				err = i915_gem_object_lock(obj, ww);
+				if (err)
+					goto skip;
 			}
 
+			if (drop_pages(obj, shrink, trylock_vm) &&
+			    !__i915_gem_object_put_pages(obj) &&
+			    !try_to_writeback(obj, shrink))
+				count += obj->base.size >> PAGE_SHIFT;
+
+			if (!ww)
+				i915_gem_object_unlock(obj);
+
 			scanned += obj->base.size >> PAGE_SHIFT;
 skip:
 			i915_gem_object_put(obj);
-- 
2.34.1


WARNING: multiple messages have this Message-ID (diff)
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH v3 02/17] drm/i915: Change shrink ordering to use locking around unbinding.
Date: Thu, 16 Dec 2021 15:27:34 +0100	[thread overview]
Message-ID: <20211216142749.1966107-3-maarten.lankhorst@linux.intel.com> (raw)
In-Reply-To: <20211216142749.1966107-1-maarten.lankhorst@linux.intel.com>

Call drop_pages with the gem object lock held, instead of the other
way around. This will allow us to drop the vma bindings with the
gem object lock held.

We plan to require the object lock for unpinning in the future,
and this is an easy target.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
---
 drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 38 ++++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
index 157a9765f483..eebff4735781 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
@@ -36,8 +36,8 @@ static bool can_release_pages(struct drm_i915_gem_object *obj)
 	return swap_available() || obj->mm.madv == I915_MADV_DONTNEED;
 }
 
-static bool unsafe_drop_pages(struct drm_i915_gem_object *obj,
-			      unsigned long shrink, bool trylock_vm)
+static int drop_pages(struct drm_i915_gem_object *obj,
+		       unsigned long shrink, bool trylock_vm)
 {
 	unsigned long flags;
 
@@ -214,26 +214,24 @@ i915_gem_shrink(struct i915_gem_ww_ctx *ww,
 
 			spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
 
-			err = 0;
-			if (unsafe_drop_pages(obj, shrink, trylock_vm)) {
-				/* May arrive from get_pages on another bo */
-				if (!ww) {
-					if (!i915_gem_object_trylock(obj))
-						goto skip;
-				} else {
-					err = i915_gem_object_lock(obj, ww);
-					if (err)
-						goto skip;
-				}
-
-				if (!__i915_gem_object_put_pages(obj)) {
-					if (!try_to_writeback(obj, shrink))
-						count += obj->base.size >> PAGE_SHIFT;
-				}
-				if (!ww)
-					i915_gem_object_unlock(obj);
+			/* May arrive from get_pages on another bo */
+			if (!ww) {
+				if (!i915_gem_object_trylock(obj))
+					goto skip;
+			} else {
+				err = i915_gem_object_lock(obj, ww);
+				if (err)
+					goto skip;
 			}
 
+			if (drop_pages(obj, shrink, trylock_vm) &&
+			    !__i915_gem_object_put_pages(obj) &&
+			    !try_to_writeback(obj, shrink))
+				count += obj->base.size >> PAGE_SHIFT;
+
+			if (!ww)
+				i915_gem_object_unlock(obj);
+
 			scanned += obj->base.size >> PAGE_SHIFT;
 skip:
 			i915_gem_object_put(obj);
-- 
2.34.1


  parent reply	other threads:[~2021-12-16 14:28 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-16 14:27 [PATCH v3 00/17] drm/i915: Remove short term pins from execbuf by requiring lock to unbind Maarten Lankhorst
2021-12-16 14:27 ` [Intel-gfx] " Maarten Lankhorst
2021-12-16 14:27 ` [PATCH v3 01/17] drm/i915: Remove unused bits of i915_vma/active api Maarten Lankhorst
2021-12-16 14:27   ` [Intel-gfx] " Maarten Lankhorst
2021-12-16 14:27 ` Maarten Lankhorst [this message]
2021-12-16 14:27   ` [Intel-gfx] [PATCH v3 02/17] drm/i915: Change shrink ordering to use locking around unbinding Maarten Lankhorst
2021-12-16 14:27 ` [PATCH v3 03/17] drm/i915: Remove pages_mutex and intel_gtt->vma_ops.set/clear_pages members, v3 Maarten Lankhorst
2021-12-16 14:27   ` [Intel-gfx] " Maarten Lankhorst
2021-12-17 15:21   ` Matthew Auld
2021-12-16 14:27 ` [PATCH v3 04/17] drm/i915: Take object lock in i915_ggtt_pin if ww is not set Maarten Lankhorst
2021-12-16 14:27   ` [Intel-gfx] " Maarten Lankhorst
2021-12-17 10:44   ` Matthew Auld
2021-12-17 10:44     ` [Intel-gfx] " Matthew Auld
2021-12-16 14:27 ` [PATCH v3 05/17] drm/i915: Force ww lock for i915_gem_object_ggtt_pin_ww, v2 Maarten Lankhorst
2021-12-16 14:27   ` [Intel-gfx] " Maarten Lankhorst
2021-12-17 10:46   ` Matthew Auld
2021-12-16 14:27 ` [PATCH v3 06/17] drm/i915: Ensure gem_contexts selftests work with unbind changes, v2 Maarten Lankhorst
2021-12-16 14:27   ` [Intel-gfx] " Maarten Lankhorst
2021-12-16 14:27 ` [PATCH v3 07/17] drm/i915: Ensure i915_vma tests do not get -ENOSPC with the locking changes Maarten Lankhorst
2021-12-16 14:27   ` [Intel-gfx] " Maarten Lankhorst
2021-12-17 11:25   ` Matthew Auld
2021-12-17 11:25     ` [Intel-gfx] " Matthew Auld
2021-12-16 14:27 ` [PATCH v3 08/17] drm/i915: Call i915_gem_evict_vm in vm_fault_gtt to prevent new ENOSPC errors Maarten Lankhorst
2021-12-16 14:27   ` [Intel-gfx] " Maarten Lankhorst
2021-12-17 11:58   ` Matthew Auld
2021-12-17 11:58     ` [Intel-gfx] " Matthew Auld
2021-12-17 15:29     ` Maarten Lankhorst
2021-12-17 15:29       ` [Intel-gfx] " Maarten Lankhorst
2021-12-16 14:27 ` [PATCH v3 09/17] drm/i915: Trylock the object when shrinking Maarten Lankhorst
2021-12-16 14:27   ` [Intel-gfx] " Maarten Lankhorst
2021-12-17 12:53   ` Matthew Auld
2021-12-17 12:53     ` [Intel-gfx] " Matthew Auld
2021-12-16 14:27 ` [Intel-gfx] [PATCH v3 10/17] drm/i915: Require object lock when freeing pages during destruction Maarten Lankhorst
2021-12-16 14:27   ` Maarten Lankhorst
2021-12-16 14:27 ` [Intel-gfx] [PATCH v3 11/17] drm/i915: Add ww ctx to i915_gem_object_trylock Maarten Lankhorst
2021-12-16 14:27   ` Maarten Lankhorst
2021-12-17 12:55   ` [Intel-gfx] " Matthew Auld
2021-12-16 14:27 ` [Intel-gfx] [PATCH v3 12/17] drm/i915: Add locking to i915_gem_evict_vm() Maarten Lankhorst
2021-12-16 14:27   ` Maarten Lankhorst
2021-12-17 13:19   ` [Intel-gfx] " Matthew Auld
2021-12-16 14:27 ` [Intel-gfx] [PATCH v3 13/17] drm/i915: Add object locking to i915_gem_evict_for_node and i915_gem_evict_something Maarten Lankhorst
2021-12-16 14:27   ` Maarten Lankhorst
2021-12-17 13:55   ` [Intel-gfx] " Matthew Auld
2021-12-17 15:04     ` Maarten Lankhorst
2021-12-16 14:27 ` [PATCH v3 14/17] drm/i915: Add i915_vma_unbind_unlocked, and take obj lock for i915_vma_unbind, v2 Maarten Lankhorst
2021-12-16 14:27   ` [Intel-gfx] " Maarten Lankhorst
2021-12-16 14:27 ` [PATCH v3 15/17] drm/i915: Remove assert_object_held_shared Maarten Lankhorst
2021-12-16 14:27   ` [Intel-gfx] " Maarten Lankhorst
2021-12-16 14:27 ` [Intel-gfx] [PATCH v3 16/17] drm/i915: Remove support for unlocked i915_vma unbind Maarten Lankhorst
2021-12-16 14:27   ` Maarten Lankhorst
2021-12-16 14:27 ` [PATCH v3 17/17] drm/i915: Remove short-term pins from execbuf, v5 Maarten Lankhorst
2021-12-16 14:27   ` [Intel-gfx] " Maarten Lankhorst
2021-12-17  8:46 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Remove short term pins from execbuf by requiring lock to unbind Patchwork
2021-12-17  8:47 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-12-17  8:51 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork
2021-12-17  9:10 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-12-17 10:48 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211216142749.1966107-3-maarten.lankhorst@linux.intel.com \
    --to=maarten.lankhorst@linux.intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=niranjana.vishwanathapura@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is 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.