• Adrián Larumbe's avatar
    drm/panfrost: Fix dma_resv deadlock at drm object pin time · e57f2187
    Adrián Larumbe authored
    When Panfrost must pin an object that is being prepared a dma-buf
    attachment for on behalf of another driver, the core drm gem object pinning
    code already takes a lock on the object's dma reservation.
    
    However, Panfrost GEM object's pinning callback would eventually try taking
    the lock on the same dma reservation when delegating pinning of the object
    onto the shmem subsystem, which led to a deadlock.
    
    This can be shown by enabling CONFIG_DEBUG_WW_MUTEX_SLOWPATH, which throws
    the following recursive locking situation:
    
    weston/3440 is trying to acquire lock:
    ffff000000e235a0 (reservation_ww_class_mutex){+.+.}-{3:3}, at: drm_gem_shmem_pin+0x34/0xb8 [drm_shmem_helper]
    but task is already holding lock:
    ffff000000e235a0 (reservation_ww_class_mutex){+.+.}-{3:3}, at: drm_gem_pin+0x2c/0x80 [drm]
    
    Fix it by replacing drm_gem_shmem_pin with its locked version, as the lock
    had already been taken by drm_gem_pin().
    
    Cc: Thomas Zimmermann <tzimmermann@suse.de>
    Cc: Dmitry Osipenko <dmitry.osipenko@collabora.com>
    Cc: Boris Brezillon <boris.brezillon@collabora.com>
    Cc: Steven Price <steven.price@arm.com>
    Fixes: a7802784 ("drm/gem: Acquire reservation lock in drm_gem_{pin/unpin}()")
    Signed-off-by: default avatarAdrián Larumbe <adrian.larumbe@collabora.com>
    Reviewed-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
    Signed-off-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
    Link: https://patchwork.freedesktop.org/patch/msgid/20240523113236.432585-2-adrian.larumbe@collabora.com
    e57f2187
panfrost_gem.c 7.6 KB