lkml.org 
[lkml]   [2012]   [Oct]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 079/180] atl1: fix kernel panic in case of DMA errors
    2.6.32-longterm review patch.  If anyone has any objections, please let me know.

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

    From: Tony Zelenoff <antonz@parallels.com>

    [ Upstream commit 03662e41c7cff64a776bfb1b3816de4be43de881 ]

    Problem:
    There was two separate work_struct structures which share one
    handler. Unfortunately getting atl1_adapter structure from
    work_struct in case of DMA error was done from incorrect
    offset which cause kernel panics.

    Solution:
    The useless work_struct for DMA error removed and
    handler name changed to more generic one.

    Signed-off-by: Tony Zelenoff <antonz@parallels.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Willy Tarreau <w@1wt.eu>
    ---
    drivers/net/atlx/atl1.c | 12 +++++-------
    drivers/net/atlx/atl1.h | 3 +--
    drivers/net/atlx/atlx.c | 2 +-
    3 files changed, 7 insertions(+), 10 deletions(-)

    diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
    index 403bfb6..adc862f 100644
    --- a/drivers/net/atlx/atl1.c
    +++ b/drivers/net/atlx/atl1.c
    @@ -2478,7 +2478,7 @@ static irqreturn_t atl1_intr(int irq, void *data)
    "pcie phy link down %x\n", status);
    if (netif_running(adapter->netdev)) { /* reset MAC */
    iowrite32(0, adapter->hw.hw_addr + REG_IMR);
    - schedule_work(&adapter->pcie_dma_to_rst_task);
    + schedule_work(&adapter->reset_dev_task);
    return IRQ_HANDLED;
    }
    }
    @@ -2490,7 +2490,7 @@ static irqreturn_t atl1_intr(int irq, void *data)
    "pcie DMA r/w error (status = 0x%x)\n",
    status);
    iowrite32(0, adapter->hw.hw_addr + REG_IMR);
    - schedule_work(&adapter->pcie_dma_to_rst_task);
    + schedule_work(&adapter->reset_dev_task);
    return IRQ_HANDLED;
    }

    @@ -2635,10 +2635,10 @@ static void atl1_down(struct atl1_adapter *adapter)
    atl1_clean_rx_ring(adapter);
    }

    -static void atl1_tx_timeout_task(struct work_struct *work)
    +static void atl1_reset_dev_task(struct work_struct *work)
    {
    struct atl1_adapter *adapter =
    - container_of(work, struct atl1_adapter, tx_timeout_task);
    + container_of(work, struct atl1_adapter, reset_dev_task);
    struct net_device *netdev = adapter->netdev;

    netif_device_detach(netdev);
    @@ -3050,12 +3050,10 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
    (unsigned long)adapter);
    adapter->phy_timer_pending = false;

    - INIT_WORK(&adapter->tx_timeout_task, atl1_tx_timeout_task);
    + INIT_WORK(&adapter->reset_dev_task, atl1_reset_dev_task);

    INIT_WORK(&adapter->link_chg_task, atlx_link_chg_task);

    - INIT_WORK(&adapter->pcie_dma_to_rst_task, atl1_tx_timeout_task);
    -
    err = register_netdev(netdev);
    if (err)
    goto err_common;
    diff --git a/drivers/net/atlx/atl1.h b/drivers/net/atlx/atl1.h
    index 146372f..0494e514 100644
    --- a/drivers/net/atlx/atl1.h
    +++ b/drivers/net/atlx/atl1.h
    @@ -762,9 +762,8 @@ struct atl1_adapter {
    u16 link_speed;
    u16 link_duplex;
    spinlock_t lock;
    - struct work_struct tx_timeout_task;
    + struct work_struct reset_dev_task;
    struct work_struct link_chg_task;
    - struct work_struct pcie_dma_to_rst_task;

    struct timer_list phy_config_timer;
    bool phy_timer_pending;
    diff --git a/drivers/net/atlx/atlx.c b/drivers/net/atlx/atlx.c
    index 3dc0142..ce09b95 100644
    --- a/drivers/net/atlx/atlx.c
    +++ b/drivers/net/atlx/atlx.c
    @@ -189,7 +189,7 @@ static void atlx_tx_timeout(struct net_device *netdev)
    {
    struct atlx_adapter *adapter = netdev_priv(netdev);
    /* Do the reset outside of interrupt context */
    - schedule_work(&adapter->tx_timeout_task);
    + schedule_work(&adapter->reset_dev_task);
    }

    /*
    --
    1.7.2.1.45.g54fbc




    \
     
     \ /
      Last update: 2012-10-02 01:41    [W:4.112 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site