- 24 Mar, 2021 40 commits
-
-
Maarten Lankhorst authored
We need to lock the global gtt dma_resv, use i915_vm_lock_objects to handle this correctly. Add ww handling for this where required. Add the object lock around unpin/put pages, and use the unlocked versions of pin_pages and pin_map where required. Signed-off-by:
Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by:
Thomas Hellström <thomas.hellstrom@linux.intel.com> Signed-off-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/msgid/20210323155059.628690-61-maarten.lankhorst@linux.intel.com
-
Maarten Lankhorst authored
Same as other tests, use pin_map_unlocked. Signed-off-by:
-
Maarten Lankhorst authored
Use the unlocked variants for pin_map and pin_pages, and add lock around unpinning/putting pages. Signed-off-by:
-
Maarten Lankhorst authored
Straightforward conversion by using unlocked versions. Signed-off-by:
-
Maarten Lankhorst authored
We can no longer call intel_timeline_pin with a null argument, so add a ww loop that locks the backing object. Signed-off-by:
-
Maarten Lankhorst authored
Use unlocked versions when the ww lock is not held. Signed-off-by:
-
Maarten Lankhorst authored
Use pin_map_unlocked when we're not holding locks. Signed-off-by:
-
Maarten Lankhorst authored
Convert normal functions to unlocked versions where needed. Signed-off-by:
-
Maarten Lankhorst authored
Convert a few calls to use the unlocked versions. Signed-off-by:
-
Maarten Lankhorst authored
Only needs to convert a single call to the unlocked version. Signed-off-by:
-
Maarten Lankhorst authored
igt_emit_store_dw needs to use the unlocked version, as it's not holding a lock. This fixes igt_gpu_fill_dw() which is used by some other selftests. Signed-off-by:
-
Maarten Lankhorst authored
Use some unlocked versions where we're not holding the ww lock. Signed-off-by:
-
Maarten Lankhorst authored
Convert a single pin_pages call to use the unlocked version. Signed-off-by:
-
Maarten Lankhorst authored
Ensure we hold the lock around put_pages, and use the unlocked wrappers for pinning pages and mappings. Signed-off-by:
-
Maarten Lankhorst authored
Also quite simple, a single call needs to use the unlocked version. Signed-off-by:
-
Maarten Lankhorst authored
Use pin_pages_unlocked() where we don't have a lock. Signed-off-by:
-
Maarten Lankhorst authored
Straightforward conversion, just convert a bunch of calls to unlocked versions. Signed-off-by:
-
Maarten Lankhorst authored
Straightforward conversion, just convert a bunch of calls to unlocked versions. Signed-off-by:
-
Maarten Lankhorst authored
Straightforward conversion, just convert a bunch of calls to unlocked versions. Signed-off-by:
-
Maarten Lankhorst authored
Straightforward conversion, just convert a bunch of calls to unlocked versions. Signed-off-by:
-
Maarten Lankhorst authored
We may create page table objects on the fly, but we may need to wait with the ww lock held. Instead of waiting on a freed obj lock, ensure we have the same lock for each object to keep -EDEADLK working. This ensures that i915_vma_pin_ww can lock the page tables when required. Signed-off-by:
-
Maarten Lankhorst authored
Quick fix, just use the unlocked version. Signed-off-by:
-
Maarten Lankhorst authored
Because of the long lifetime of the mapping, we cannot wrap this in a simple limited ww lock. Just use the unlocked version of pin_map, because we'll likely release the mapping a lot later, in a different thread. Signed-off-by:
-
Maarten Lankhorst authored
vmap is using pin_pages, but needs to use ww locking, add pin_pages_unlocked to correctly lock the mapping. Also add ww locking to begin/end cpu access. Changes since v1: - Fix i915_gem_map_dma_buf by using pin_pages_unlocked(). Signed-off-by:
-
Maarten Lankhorst authored
In the ucode functions, the calls are done before userspace runs, when debugging using debugfs, or when creating semi-permanent mappings; we can safely use the unlocked versions that does the ww dance for us. Because there is no pin_pages_unlocked yet, add it as convenience function. This removes possible lockdep splats about missing resv lock for ucode. Signed-off-by:
-
Maarten Lankhorst authored
We need to lock a few more objects, some temporarily, add ww lock where needed. Signed-off-by:
-
Maarten Lankhorst authored
i915_gem_object_pin_map potentially needs a ww context, so ensure we have one we can revoke. Signed-off-by:
-
Maarten Lankhorst authored
By default, we assume that it's called inside igt_create_request to keep existing selftests working, but allow for manual pinning when passing a ww context. Signed-off-by:
-
Thomas Hellström authored
Stolen objects need to lock, and we may call put_pages when refcount drops to 0, ensure all calls are handled correctly. Changes since v1: - Rebase on top of upstream changes. Idea-from: Thomas Hellström <thomas.hellstrom@intel.com> Signed-off-by:
Matthew Auld <matthew.auld@intel.com> Signed-off-by:
-
Maarten Lankhorst authored
pin_map needs the ww lock, so ensure we pin both before submission. Signed-off-by:
-
Maarten Lankhorst authored
We are removing obj->mm.lock, and need to take the reservation lock before we can pin pages. Move the pinning pages into the helper, and merge gtt pwrite/pread preparation and cleanup paths. The fence lock is also removed; it will conflict with fence annotations, because of memory allocations done when pagefaulting inside copy_*_user. Signed-off-by:
-
Maarten Lankhorst authored
We need to take the obj lock to pin pages, so wait until the callers have done so, before making the object unshrinkable. Signed-off-by:
-
Maarten Lankhorst authored
We need to lock the object to move it to the correct domain, add the missing lock. Signed-off-by:
-
Maarten Lankhorst authored
Take the ww lock around engine_unpark. Because of the many many places where rpm is used, I chose the safest option and used a trylock to opportunistically take this lock for __engine_unpark. Signed-off-by:
-
Maarten Lankhorst authored
Make creation separate from pinning, in order to take the lock only once, and pin the mapping with the lock held. Changes since v1: - Rebase on top of upstream changes. Changes since v2: - Fully clear wa_ctx on error. Signed-off-by:
-
Maarten Lankhorst authored
We previously complained when ww == NULL. This function is now only used in selftests to pin an object, and ww locking is now fixed. Signed-off-by:
-
Maarten Lankhorst authored
This should be done as part of the ww loop, in order to remove a i915_vma_pin that needs ww held. Now only i915_ggtt_pin() callers remaining. Signed-off-by:
-
Maarten Lankhorst authored
Take a simple lock so we hold ww around (un)pin_pages as needed. Signed-off-by:
-
Maarten Lankhorst authored
Instead of multiple lockings, lock the object once, and perform the ww dance around attach_phys and pin_pages. Signed-off-by:
-
Maarten Lankhorst authored
Pin in the caller, not in the work itself. This should also work better for dma-fence annotations. Signed-off-by:
-
