lkml.org 
[lkml]   [2018]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.4 115/167] qlcnic: Fix a sleep-in-atomic bug in qlcnic_82xx_hw_write_wx_2M and qlcnic_82xx_hw_read_wx_2M
    Date
    From: Jia-Ju Bai <baijiaju1990@163.com>

    [ Upstream commit 5ea6d691aac6c93b790f0905e3460d44cc4c449b ]

    The driver may sleep under a write spin lock, and the function
    call path is:
    qlcnic_82xx_hw_write_wx_2M (acquire the lock by write_lock_irqsave)
    crb_win_lock
    qlcnic_pcie_sem_lock
    usleep_range
    qlcnic_82xx_hw_read_wx_2M (acquire the lock by write_lock_irqsave)
    crb_win_lock
    qlcnic_pcie_sem_lock
    usleep_range

    To fix it, the usleep_range is replaced with udelay.

    Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
    index 509b596cf1e8..bd1ec70fb736 100644
    --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
    +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
    @@ -341,7 +341,7 @@ qlcnic_pcie_sem_lock(struct qlcnic_adapter *adapter, int sem, u32 id_reg)
    }
    return -EIO;
    }
    - usleep_range(1000, 1500);
    + udelay(1200);
    }

    if (id_reg)
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-19 18:14    [W:3.207 / U:0.468 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site