lkml.org 
[lkml]   [2017]   [Jun]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.11 133/150] drm/nouveau/tmr: fully separate alarm execution/pending lists
    Date
    4.11-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Ben Skeggs <bskeggs@redhat.com>

    commit b4e382ca7586a63b6c1e5221ce0863ff867c2df6 upstream.

    Reusing the list_head for both is a bad idea. Callback execution is done
    with the lock dropped so that alarms can be rescheduled from the callback,
    which means that with some unfortunate timing, lists can get corrupted.

    The execution list should not require its own locking, the single function
    that uses it can only be called from a single context.

    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h | 1 +
    drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c | 7 ++++---
    2 files changed, 5 insertions(+), 3 deletions(-)

    --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h
    +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h
    @@ -4,6 +4,7 @@

    struct nvkm_alarm {
    struct list_head head;
    + struct list_head exec;
    u64 timestamp;
    void (*func)(struct nvkm_alarm *);
    };
    --- a/drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c
    +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c
    @@ -50,7 +50,8 @@ nvkm_timer_alarm_trigger(struct nvkm_tim
    /* Move to completed list. We'll drop the lock before
    * executing the callback so it can reschedule itself.
    */
    - list_move_tail(&alarm->head, &exec);
    + list_del_init(&alarm->head);
    + list_add(&alarm->exec, &exec);
    }

    /* Shut down interrupt if no more pending alarms. */
    @@ -59,8 +60,8 @@ nvkm_timer_alarm_trigger(struct nvkm_tim
    spin_unlock_irqrestore(&tmr->lock, flags);

    /* Execute completed callbacks. */
    - list_for_each_entry_safe(alarm, atemp, &exec, head) {
    - list_del_init(&alarm->head);
    + list_for_each_entry_safe(alarm, atemp, &exec, exec) {
    + list_del(&alarm->exec);
    alarm->func(alarm);
    }
    }

    \
     
     \ /
      Last update: 2017-06-12 20:55    [W:4.697 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site