lkml.org 
[lkml]   [2021]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 016/292] drm/i915/gt: Fix -EDEADLK handling regression
    Date
    From: Ville Syrjälä <ville.syrjala@linux.intel.com>

    commit 2feeb52859fc1ab94cd35b61ada3a6ac4ff24243 upstream.

    The conversion to ww mutexes failed to address the fence code which
    already returns -EDEADLK when we run out of fences. Ww mutexes on
    the other hand treat -EDEADLK as an internal errno value indicating
    a need to restart the operation due to a deadlock. So now when the
    fence code returns -EDEADLK the higher level code erroneously
    restarts everything instead of returning the error to userspace
    as is expected.

    To remedy this let's switch the fence code to use a different errno
    value for this. -ENOBUFS seems like a semi-reasonable unique choice.
    Apart from igt the only user of this I could find is sna, and even
    there all we do is dump the current fence registers from debugfs
    into the X server log. So no user visible functionality is affected.
    If we really cared about preserving this we could of course convert
    back to -EDEADLK higher up, but doesn't seem like that's worth
    the hassle here.

    Not quite sure which commit specifically broke this, but I'll
    just attribute it to the general gem ww mutex work.

    Cc: stable@vger.kernel.org
    Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
    Cc: Thomas Hellström <thomas.hellstrom@intel.com>
    Testcase: igt/gem_pread/exhaustion
    Testcase: igt/gem_pwrite/basic-exhaustion
    Testcase: igt/gem_fenced_exec_thrash/too-many-fences
    Fixes: 80f0b679d6f0 ("drm/i915: Add an implementation for i915_gem_ww_ctx locking, v2.")
    Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
    Link: https://patchwork.freedesktop.org/patch/msgid/20210630164413.25481-1-ville.syrjala@linux.intel.com
    Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
    (cherry picked from commit 78d2ad7eb4e1f0e9cd5d79788446b6092c21d3e0)
    Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c
    +++ b/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c
    @@ -366,7 +366,7 @@ static struct i915_fence_reg *fence_find
    if (intel_has_pending_fb_unpin(ggtt->vm.i915))
    return ERR_PTR(-EAGAIN);

    - return ERR_PTR(-EDEADLK);
    + return ERR_PTR(-ENOBUFS);
    }

    int __i915_vma_pin_fence(struct i915_vma *vma)

    \
     
     \ /
      Last update: 2021-07-19 19:59    [W:4.098 / U:0.468 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site