[lkml]   [2009]   [Nov]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Patch in this message
    Subject[PATCH 2/2] lockdep: Don't only check recursive read locks once in a sequence
    Say we have the following locks:
    A (rwlock, Aw: writelock, Ar: recursive read lock)
    B (normal lock)

    and the following sequences:
    Ar -> B -> Ar
    Aw -> B

    This won't be detected as a lock inversion because in the sequence
    of locks held by the current task, if we have a same class acquired
    as read-recursive several times, only the first one will be checked
    in the tree (although all of them are checked for deadlocks in the
    current held sequence).

    Fix it by always adding recursive read locks in the dependency tree.

    Signed-off-by: Frederic Weisbecker <>
    Cc: Peter Zijlstra <>
    Cc: Thomas Gleixner <>
    Cc: Ming Lei <>
    kernel/lockdep.c | 4 ++--
    1 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/kernel/lockdep.c b/kernel/lockdep.c
    index a6f7440..13d1d54 100644
    --- a/kernel/lockdep.c
    +++ b/kernel/lockdep.c
    @@ -1949,9 +1949,9 @@ static int validate_chain(struct task_struct *curr, struct lockdep_map *lock,
    hlock->read = 2;
    * Add dependency only if this lock is not the head
    - * of the chain, and if it's not a secondary read-lock:
    + * of the chain.
    - if (!chain_head && ret != 2)
    + if (!chain_head)
    if (!check_prevs_add(curr, hlock))
    return 0;

     \ /
      Last update: 2009-11-18 02:11    [W:0.043 / U:21.236 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site