lkml.org 
[lkml]   [2006]   [Oct]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 2/2] lockdep: annotate bcsp driver
    From
    Date

    =============================================
    [ INFO: possible recursive locking detected ]
    2.6.18-1.2699.fc6 #1
    ---------------------------------------------
    swapper/0 is trying to acquire lock:
    (&list->lock#3){+...}, at: [<c05ad307>] skb_dequeue+0x12/0x43

    but task is already holding lock:
    (&list->lock#3){+...}, at: [<df98cd79>] bcsp_dequeue+0x6a/0x11e [hci_uart]


    Two different list locks nest, annotate so.

    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    ---
    drivers/bluetooth/hci_bcsp.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    Index: linux-2.6/drivers/bluetooth/hci_bcsp.c
    ===================================================================
    --- linux-2.6.orig/drivers/bluetooth/hci_bcsp.c
    +++ linux-2.6/drivers/bluetooth/hci_bcsp.c
    @@ -330,7 +330,7 @@ static struct sk_buff *bcsp_dequeue(stru
    reliable packet if the number of packets sent but not yet ack'ed
    is < than the winsize */

    - spin_lock_irqsave(&bcsp->unack.lock, flags);
    + spin_lock_irqsave_nested(&bcsp->unack.lock, flags, SINGLE_DEPTH_NESTING);

    if (bcsp->unack.qlen < BCSP_TXWINSIZE && (skb = skb_dequeue(&bcsp->rel)) != NULL) {
    struct sk_buff *nskb = bcsp_prepare_pkt(bcsp, skb->data, skb->len, bt_cb(skb)->pkt_type);

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-10-30 10:09    [W:9.221 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site