lkml.org 
[lkml]   [2013]   [Sep]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[028/251] printk: Fix rq->lock vs logbuf_lock unlock lock inversion
    3.6.11.9-rc1 stable review patch.
    If anyone has any objections, please let me know.

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

    From: "Bu, Yitian" <ybu@qti.qualcomm.com>

    [ Upstream commit dbda92d16f8655044e082930e4e9d244b87fde77 ]

    commit 07354eb1a74d1 ("locking printk: Annotate logbuf_lock as raw")
    reintroduced a lock inversion problem which was fixed in commit
    0b5e1c5255 ("printk: Release console_sem after logbuf_lock"). This
    happened probably when fixing up patch rejects.

    Restore the ordering and unlock logbuf_lock before releasing
    console_sem.

    Signed-off-by: ybu <ybu@qti.qualcomm.com>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: stable@vger.kernel.org
    Link: http://lkml.kernel.org/r/E807E903FE6CBE4D95E420FBFCC273B827413C@nasanexd01h.na.qualcomm.com
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    kernel/printk.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/kernel/printk.c b/kernel/printk.c
    index 2d3fc0e..74a3afb 100644
    --- a/kernel/printk.c
    +++ b/kernel/printk.c
    @@ -1364,9 +1364,9 @@ static int console_trylock_for_printk(unsigned int cpu)
    }
    }
    logbuf_cpu = UINT_MAX;
    + raw_spin_unlock(&logbuf_lock);
    if (wake)
    up(&console_sem);
    - raw_spin_unlock(&logbuf_lock);
    return retval;
    }

    --
    1.7.10.4



    \
     
     \ /
      Last update: 2013-09-11 06:41    [W:4.974 / U:0.312 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site