• Tvrtko Ursulin's avatar
    drm/i915: Do not disable preemption for resets · 1e975e59
    Tvrtko Ursulin authored
    Commit ade8a0f5 ("drm/i915: Make all GPU resets atomic") added a
    preempt disable section over the hardware reset callback to prepare the
    driver for being able to reset from atomic contexts.
    
    In retrospect I can see that the work item at a time was about removing
    the struct mutex from the reset path. Code base also briefly entertained
    the idea of doing the reset under stop_machine in order to serialize
    userspace mmap and temporary glitch in the fence registers (see
    eb8d0f5a ("drm/i915: Remove GPU reset dependence on struct_mutex"),
    but that never materialized and was soon removed in 2caffbf1
    ("drm/i915: Revoke mmaps and prevent access to fence registers across
    reset") and replaced with a SRCU based solution.
    
    As such, as far as I can see, today we still have a requirement that
    resets must not sleep (invoked from submission tasklets), but no need to
    support invoking them from a truly atomic context.
    
    Given that the preemption section is problematic on RT kernels, since the
    uncore lock becomes a sleeping lock and so is invalid in such section,
    lets try and remove it. Potential downside is that our short waits on GPU
    to complete the reset may get extended if CPU scheduling interferes, but
    in practice that probably isn't a deal breaker.
    
    In terms of mechanics, since the preemption disabled block is being
    removed we just need to replace a few of the wait_for_atomic macros into
    busy looping versions which will work (and not complain) when called from
    non-atomic sections.
    
    v2:
     * Fix timeouts which are now in us. (Andi)
     * Update one comment as a drive by. (Andi)
    Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
    Cc: Chris Wilson <chris.p.wilson@intel.com>
    Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
    Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
    Cc: Andi Shyti <andi.shyti@linux.intel.com>
    Reviewed-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
    Link: https://patchwork.freedesktop.org/patch/msgid/20230926100855.61722-1-tvrtko.ursulin@linux.intel.com
    1e975e59
intel_reset.c 43.1 KB