mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-23 18:48:01 +07:00
42d1051130
Once inside a request, inside the timeline->mutex, pinning is verboten. <4> [896.032829] ====================================================== <4> [896.032831] WARNING: possible circular locking dependency detected <4> [896.032835] 5.4.0-rc8-CI-Patchwork_15533+ #1 Tainted: G U <4> [896.032838] ------------------------------------------------------ <4> [896.032841] gem_exec_parall/3720 is trying to acquire lock: <4> [896.032844] ffff888401863270 (&kernel#2){+.+.}, at: i915_request_create+0x16/0x1c0 [i915] <4> [896.032915] but task is already holding lock: <4> [896.032917] ffff8883ec1c93c0 (&vm->mutex){+.+.}, at: i915_vma_pin+0xf3/0x11c0 [i915] <4> [896.032952] which lock already depends on the new lock. <4> [896.032954] the existing dependency chain (in reverse order) is: <4> [896.032956] -> #1 (&vm->mutex){+.+.}: <4> [896.032961] __mutex_lock+0x9a/0x9d0 <4> [896.032995] i915_vma_pin+0xf3/0x11c0 [i915] <4> [896.033033] intel_renderstate_emit+0xb9/0x9e0 [i915] <4> [896.033081] i915_gem_init+0x5a9/0xa50 [i915] <4> [896.033112] i915_driver_probe+0xb00/0x15f0 [i915] <4> [896.033144] i915_pci_probe+0x43/0x1c0 [i915] <4> [896.033149] pci_device_probe+0x9e/0x120 <4> [896.033154] really_probe+0xea/0x420 <4> [896.033158] driver_probe_device+0x10b/0x120 <4> [896.033161] device_driver_attach+0x4a/0x50 <4> [896.033164] __driver_attach+0x97/0x130 <4> [896.033168] bus_for_each_dev+0x74/0xc0 <4> [896.033171] bus_add_driver+0x142/0x220 <4> [896.033174] driver_register+0x56/0xf0 <4> [896.033178] do_one_initcall+0x58/0x2ff <4> [896.033183] do_init_module+0x56/0x1f8 <4> [896.033187] load_module+0x243e/0x29f0 <4> [896.033190] __do_sys_finit_module+0xe9/0x110 <4> [896.033194] do_syscall_64+0x4f/0x210 <4> [896.033197] entry_SYSCALL_64_after_hwframe+0x49/0xbe <4> [896.033200] -> #0 (&kernel#2){+.+.}: <4> [896.033206] __lock_acquire+0x1328/0x15d0 <4> [896.033209] lock_acquire+0xa7/0x1c0 <4> [896.033213] __mutex_lock+0x9a/0x9d0 <4> [896.033255] i915_request_create+0x16/0x1c0 [i915] <4> [896.033287] intel_engine_flush_barriers+0x4c/0x100 [i915] <4> [896.033327] ggtt_flush+0x37/0x60 [i915] <4> [896.033366] i915_gem_evict_something+0x46b/0x5a0 [i915] <4> [896.033407] i915_gem_gtt_insert+0x21d/0x6a0 [i915] <4> [896.033449] i915_vma_pin+0xb36/0x11c0 [i915] <4> [896.033488] gen6_ppgtt_pin+0xd5/0x170 [i915] <4> [896.033523] ring_context_pin+0x2e/0xc0 [i915] <4> [896.033554] __intel_context_do_pin+0x6b/0x190 [i915] <4> [896.033591] i915_gem_do_execbuffer+0x1814/0x26c0 [i915] <4> [896.033627] i915_gem_execbuffer2_ioctl+0x11b/0x460 [i915] <4> [896.033632] drm_ioctl_kernel+0xa7/0xf0 <4> [896.033635] drm_ioctl+0x2e1/0x390 <4> [896.033638] do_vfs_ioctl+0xa0/0x6f0 <4> [896.033641] ksys_ioctl+0x35/0x60 <4> [896.033644] __x64_sys_ioctl+0x11/0x20 <4> [896.033647] do_syscall_64+0x4f/0x210 <4> [896.033650] entry_SYSCALL_64_after_hwframe+0x49/0xbe Lift the object allocation and pin prior to the request construction. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20191202204316.2665847-1-chris@chris-wilson.co.uk
251 lines
6.3 KiB
C
251 lines
6.3 KiB
C
/*
|
|
* Copyright © 2014 Intel Corporation
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
* IN THE SOFTWARE.
|
|
*
|
|
* Authors:
|
|
* Mika Kuoppala <mika.kuoppala@intel.com>
|
|
*
|
|
*/
|
|
|
|
#include "i915_drv.h"
|
|
#include "intel_renderstate.h"
|
|
#include "intel_ring.h"
|
|
|
|
static const struct intel_renderstate_rodata *
|
|
render_state_get_rodata(const struct intel_engine_cs *engine)
|
|
{
|
|
if (engine->class != RENDER_CLASS)
|
|
return NULL;
|
|
|
|
switch (INTEL_GEN(engine->i915)) {
|
|
case 6:
|
|
return &gen6_null_state;
|
|
case 7:
|
|
return &gen7_null_state;
|
|
case 8:
|
|
return &gen8_null_state;
|
|
case 9:
|
|
return &gen9_null_state;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/*
|
|
* Macro to add commands to auxiliary batch.
|
|
* This macro only checks for page overflow before inserting the commands,
|
|
* this is sufficient as the null state generator makes the final batch
|
|
* with two passes to build command and state separately. At this point
|
|
* the size of both are known and it compacts them by relocating the state
|
|
* right after the commands taking care of alignment so we should sufficient
|
|
* space below them for adding new commands.
|
|
*/
|
|
#define OUT_BATCH(batch, i, val) \
|
|
do { \
|
|
if ((i) >= PAGE_SIZE / sizeof(u32)) \
|
|
goto err; \
|
|
(batch)[(i)++] = (val); \
|
|
} while(0)
|
|
|
|
static int render_state_setup(struct intel_renderstate *so,
|
|
struct drm_i915_private *i915)
|
|
{
|
|
const struct intel_renderstate_rodata *rodata = so->rodata;
|
|
unsigned int i = 0, reloc_index = 0;
|
|
unsigned int needs_clflush;
|
|
u32 *d;
|
|
int ret;
|
|
|
|
ret = i915_gem_object_prepare_write(so->vma->obj, &needs_clflush);
|
|
if (ret)
|
|
return ret;
|
|
|
|
d = kmap_atomic(i915_gem_object_get_dirty_page(so->vma->obj, 0));
|
|
|
|
while (i < rodata->batch_items) {
|
|
u32 s = rodata->batch[i];
|
|
|
|
if (i * 4 == rodata->reloc[reloc_index]) {
|
|
u64 r = s + so->vma->node.start;
|
|
s = lower_32_bits(r);
|
|
if (HAS_64BIT_RELOC(i915)) {
|
|
if (i + 1 >= rodata->batch_items ||
|
|
rodata->batch[i + 1] != 0)
|
|
goto err;
|
|
|
|
d[i++] = s;
|
|
s = upper_32_bits(r);
|
|
}
|
|
|
|
reloc_index++;
|
|
}
|
|
|
|
d[i++] = s;
|
|
}
|
|
|
|
if (rodata->reloc[reloc_index] != -1) {
|
|
DRM_ERROR("only %d relocs resolved\n", reloc_index);
|
|
goto err;
|
|
}
|
|
|
|
so->batch_offset = i915_ggtt_offset(so->vma);
|
|
so->batch_size = rodata->batch_items * sizeof(u32);
|
|
|
|
while (i % CACHELINE_DWORDS)
|
|
OUT_BATCH(d, i, MI_NOOP);
|
|
|
|
so->aux_offset = i * sizeof(u32);
|
|
|
|
if (HAS_POOLED_EU(i915)) {
|
|
/*
|
|
* We always program 3x6 pool config but depending upon which
|
|
* subslice is disabled HW drops down to appropriate config
|
|
* shown below.
|
|
*
|
|
* In the below table 2x6 config always refers to
|
|
* fused-down version, native 2x6 is not available and can
|
|
* be ignored
|
|
*
|
|
* SNo subslices config eu pool configuration
|
|
* -----------------------------------------------------------
|
|
* 1 3 subslices enabled (3x6) - 0x00777000 (9+9)
|
|
* 2 ss0 disabled (2x6) - 0x00777000 (3+9)
|
|
* 3 ss1 disabled (2x6) - 0x00770000 (6+6)
|
|
* 4 ss2 disabled (2x6) - 0x00007000 (9+3)
|
|
*/
|
|
u32 eu_pool_config = 0x00777000;
|
|
|
|
OUT_BATCH(d, i, GEN9_MEDIA_POOL_STATE);
|
|
OUT_BATCH(d, i, GEN9_MEDIA_POOL_ENABLE);
|
|
OUT_BATCH(d, i, eu_pool_config);
|
|
OUT_BATCH(d, i, 0);
|
|
OUT_BATCH(d, i, 0);
|
|
OUT_BATCH(d, i, 0);
|
|
}
|
|
|
|
OUT_BATCH(d, i, MI_BATCH_BUFFER_END);
|
|
so->aux_size = i * sizeof(u32) - so->aux_offset;
|
|
so->aux_offset += so->batch_offset;
|
|
/*
|
|
* Since we are sending length, we need to strictly conform to
|
|
* all requirements. For Gen2 this must be a multiple of 8.
|
|
*/
|
|
so->aux_size = ALIGN(so->aux_size, 8);
|
|
|
|
if (needs_clflush)
|
|
drm_clflush_virt_range(d, i * sizeof(u32));
|
|
kunmap_atomic(d);
|
|
|
|
ret = 0;
|
|
out:
|
|
i915_gem_object_finish_access(so->vma->obj);
|
|
return ret;
|
|
|
|
err:
|
|
kunmap_atomic(d);
|
|
ret = -EINVAL;
|
|
goto out;
|
|
}
|
|
|
|
#undef OUT_BATCH
|
|
|
|
int intel_renderstate_init(struct intel_renderstate *so,
|
|
struct intel_engine_cs *engine)
|
|
{
|
|
struct drm_i915_gem_object *obj;
|
|
int err;
|
|
|
|
memset(so, 0, sizeof(*so));
|
|
|
|
so->rodata = render_state_get_rodata(engine);
|
|
if (!so->rodata)
|
|
return 0;
|
|
|
|
if (so->rodata->batch_items * 4 > PAGE_SIZE)
|
|
return -EINVAL;
|
|
|
|
obj = i915_gem_object_create_internal(engine->i915, PAGE_SIZE);
|
|
if (IS_ERR(obj))
|
|
return PTR_ERR(obj);
|
|
|
|
so->vma = i915_vma_instance(obj, &engine->gt->ggtt->vm, NULL);
|
|
if (IS_ERR(so->vma)) {
|
|
err = PTR_ERR(so->vma);
|
|
goto err_obj;
|
|
}
|
|
|
|
err = i915_vma_pin(so->vma, 0, 0, PIN_GLOBAL | PIN_HIGH);
|
|
if (err)
|
|
goto err_vma;
|
|
|
|
err = render_state_setup(so, engine->i915);
|
|
if (err)
|
|
goto err_unpin;
|
|
|
|
return 0;
|
|
|
|
err_unpin:
|
|
i915_vma_unpin(so->vma);
|
|
err_vma:
|
|
i915_vma_close(so->vma);
|
|
err_obj:
|
|
i915_gem_object_put(obj);
|
|
so->vma = NULL;
|
|
return err;
|
|
}
|
|
|
|
int intel_renderstate_emit(struct intel_renderstate *so,
|
|
struct i915_request *rq)
|
|
{
|
|
struct intel_engine_cs *engine = rq->engine;
|
|
int err;
|
|
|
|
if (!so->vma)
|
|
return 0;
|
|
|
|
err = engine->emit_bb_start(rq,
|
|
so->batch_offset, so->batch_size,
|
|
I915_DISPATCH_SECURE);
|
|
if (err)
|
|
return err;
|
|
|
|
if (so->aux_size > 8) {
|
|
err = engine->emit_bb_start(rq,
|
|
so->aux_offset, so->aux_size,
|
|
I915_DISPATCH_SECURE);
|
|
if (err)
|
|
return err;
|
|
}
|
|
|
|
i915_vma_lock(so->vma);
|
|
err = i915_request_await_object(rq, so->vma->obj, false);
|
|
if (err == 0)
|
|
err = i915_vma_move_to_active(so->vma, rq, 0);
|
|
i915_vma_unlock(so->vma);
|
|
|
|
return err;
|
|
}
|
|
|
|
void intel_renderstate_fini(struct intel_renderstate *so)
|
|
{
|
|
i915_vma_unpin_and_release(&so->vma, 0);
|
|
}
|