From: Chris Wilson <chris@chris-wilson.co.uk>
To: intel-gfx@lists.freedesktop.org, torvalds@linux-foundation.org
Cc: Martin.Wilck@suse.com, MKoutny@suse.com, leho@kraav.com,
tiwai@suse.de, linux-kernel@vger.kernel.org,
Chris Wilson <chris@chris-wilson.co.uk>,
Lionel Landwerlin <lionel.g.landwerlin@intel.com>,
Tvrtko Ursulin <tvrtko.ursulin@intel.com>,
Jani Nikula <jani.nikula@intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
stable@vger.kernel.org
Subject: [PATCH] Revert "drm/i915/userptr: Acquire the page lock around set_page_dirty()"
Date: Thu, 12 Sep 2019 13:56:34 +0100 [thread overview]
Message-ID: <20190912125634.29054-1-chris@chris-wilson.co.uk> (raw)
In-Reply-To: <CAHk-=wjKv_Zw2zGHduyrQH_VQzxXYzwKdwwzzpsdnsdx=EK30Q@mail.gmail.com>
The userptr put_pages can be called from inside try_to_unmap, and so
enters with the page lock held on one of the object's backing pages. We
cannot take the page lock ourselves for fear of recursion.
Reported-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reported-by: Martin Wilck <Martin.Wilck@suse.com>
Reported-by: Leo Kraav <leho@kraav.com>
Fixes: aa56a292ce62 ("drm/i915/userptr: Acquire the page lock around set_page_dirty()")
References: https://bugzilla.kernel.org/show_bug.cgi?id=203317
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: stable@vger.kernel.org
---
drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
index 74da35611d7c..11b231c187c5 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
@@ -672,15 +672,7 @@ i915_gem_userptr_put_pages(struct drm_i915_gem_object *obj,
for_each_sgt_page(page, sgt_iter, pages) {
if (obj->mm.dirty)
- /*
- * As this may not be anonymous memory (e.g. shmem)
- * but exist on a real mapping, we have to lock
- * the page in order to dirty it -- holding
- * the page reference is not sufficient to
- * prevent the inode from being truncated.
- * Play safe and take the lock.
- */
- set_page_dirty_lock(page);
+ set_page_dirty(page);
mark_page_accessed(page);
put_page(page);
--
2.23.0
next prev parent reply other threads:[~2019-09-12 12:56 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-09 12:41 5.3-rc3: Frozen graphics with kcompactd migrating i915 pages Martin Wilck
2019-08-09 12:53 ` Chris Wilson
2019-09-10 14:20 ` Leho Kraav
2019-09-12 11:23 ` Martin Wilck
2019-09-12 11:58 ` leho
2019-09-12 11:59 ` Linus Torvalds
2019-09-12 11:59 ` Linus Torvalds
2019-09-12 12:47 ` Chris Wilson
2019-09-12 12:56 ` Chris Wilson [this message]
2019-09-12 14:39 ` [Intel-gfx] [PATCH] Revert "drm/i915/userptr: Acquire the page lock around set_page_dirty()" Tvrtko Ursulin
2019-09-12 14:39 ` Tvrtko Ursulin
2019-09-12 18:05 ` ✓ Fi.CI.BAT: success for " Patchwork
2019-09-13 8:06 ` ✓ Fi.CI.IGT: " 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=20190912125634.29054-1-chris@chris-wilson.co.uk \
--to=chris@chris-wilson.co.uk \
--cc=MKoutny@suse.com \
--cc=Martin.Wilck@suse.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=leho@kraav.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lionel.g.landwerlin@intel.com \
--cc=stable@vger.kernel.org \
--cc=tiwai@suse.de \
--cc=torvalds@linux-foundation.org \
--cc=tvrtko.ursulin@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.