lkml.org 
[lkml]   [2018]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.4 024/162] scsi: megaraid: Fix a sleep-in-atomic bug
    Date
    From: Jia-Ju Bai <baijiaju1990@163.com>

    [ Upstream commit 896f6966fc815abe71f85fb26f0193875df8a035 ]

    The driver may sleep under a spin lock, and the function call path is:
    mraid_mm_attach_buf (acquire the lock by spin_lock_irqsave)
    pci_pool_alloc(GFP_KERNEL) --> may sleep

    To fix it, the "GFP_KERNEL" is replaced with "GFP_ATOMIC".

    [mkp: fixed whitespace]

    Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com>
    Acked-by: Sumit Saxena <sumit.saxena@broadcom.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/scsi/megaraid/megaraid_mm.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c
    index a70692779a16..bfc7984a1c17 100644
    --- a/drivers/scsi/megaraid/megaraid_mm.c
    +++ b/drivers/scsi/megaraid/megaraid_mm.c
    @@ -570,7 +570,7 @@ mraid_mm_attach_buf(mraid_mmadp_t *adp, uioc_t *kioc, int xferlen)

    kioc->pool_index = right_pool;
    kioc->free_buf = 1;
    - kioc->buf_vaddr = pci_pool_alloc(pool->handle, GFP_KERNEL,
    + kioc->buf_vaddr = pci_pool_alloc(pool->handle, GFP_ATOMIC,
    &kioc->buf_paddr);
    spin_unlock_irqrestore(&pool->lock, flags);

    --
    2.15.1
    \
     
     \ /
      Last update: 2018-04-09 03:36    [W:4.051 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site