lkml.org 
[lkml]   [2011]   [May]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[12/24] libertas: fix cmdpendingq locking
    2.6.33-longterm review patch.  If anyone has any objections, please let us know.

    ------------------
    Content-Length: 2150
    Lines: 56

    From: Paul Fox <pgf@laptop.org>

    commit 2ae1b8b35faba31a59b153cbad07f9c15de99740 upstream.

    We occasionally see list corruption using libertas.

    While we haven't been able to diagnose this precisely, we have spotted
    a possible cause: cmdpendingq is generally modified with driver_lock
    held. However, there are a couple of points where this is not the case.

    Fix up those operations to execute under the lock, it seems like
    the correct thing to do and will hopefully improve the situation.

    Signed-off-by: Paul Fox <pgf@laptop.org>
    Signed-off-by: Daniel Drake <dsd@laptop.org>
    Acked-by: Dan Williams <dcbw@redhat.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/net/wireless/libertas/cmd.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    --- a/drivers/net/wireless/libertas/cmd.c
    +++ b/drivers/net/wireless/libertas/cmd.c
    @@ -1278,8 +1278,8 @@ int lbs_execute_next_command(struct lbs_
    cpu_to_le16(CMD_SUBCMD_EXIT_PS)) {
    lbs_deb_host(
    "EXEC_NEXT_CMD: ignore ENTER_PS cmd\n");
    - list_del(&cmdnode->list);
    spin_lock_irqsave(&priv->driver_lock, flags);
    + list_del(&cmdnode->list);
    lbs_complete_command(priv, cmdnode, 0);
    spin_unlock_irqrestore(&priv->driver_lock, flags);

    @@ -1291,8 +1291,8 @@ int lbs_execute_next_command(struct lbs_
    (priv->psstate == PS_STATE_PRE_SLEEP)) {
    lbs_deb_host(
    "EXEC_NEXT_CMD: ignore EXIT_PS cmd in sleep\n");
    - list_del(&cmdnode->list);
    spin_lock_irqsave(&priv->driver_lock, flags);
    + list_del(&cmdnode->list);
    lbs_complete_command(priv, cmdnode, 0);
    spin_unlock_irqrestore(&priv->driver_lock, flags);
    priv->needtowakeup = 1;
    @@ -1305,7 +1305,9 @@ int lbs_execute_next_command(struct lbs_
    "EXEC_NEXT_CMD: sending EXIT_PS\n");
    }
    }
    + spin_lock_irqsave(&priv->driver_lock, flags);
    list_del(&cmdnode->list);
    + spin_unlock_irqrestore(&priv->driver_lock, flags);
    lbs_deb_host("EXEC_NEXT_CMD: sending command 0x%04x\n",
    le16_to_cpu(cmd->command));
    lbs_submit_command(priv, cmdnode);



    \
     
     \ /
      Last update: 2011-05-19 20:39    [W:0.025 / U:154.492 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site