lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 436/563] scsi: sr: Dont use GFP_DMA
    Date
    From: Christoph Hellwig <hch@lst.de>

    [ Upstream commit d94d94969a4ba07a43d62429c60372320519c391 ]

    The allocated buffers are used as a command payload, for which the block
    layer and/or DMA API do the proper bounce buffering if needed.

    Link: https://lore.kernel.org/r/20211222090842.920724-1-hch@lst.de
    Reported-by: Baoquan He <bhe@redhat.com>
    Reviewed-by: Baoquan He <bhe@redhat.com>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/sr.c | 2 +-
    drivers/scsi/sr_vendor.c | 4 ++--
    2 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
    index 4cb4ab9c6137e..464418413ced0 100644
    --- a/drivers/scsi/sr.c
    +++ b/drivers/scsi/sr.c
    @@ -917,7 +917,7 @@ static void get_capabilities(struct scsi_cd *cd)


    /* allocate transfer buffer */
    - buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);
    + buffer = kmalloc(512, GFP_KERNEL);
    if (!buffer) {
    sr_printk(KERN_ERR, cd, "out of memory.\n");
    return;
    diff --git a/drivers/scsi/sr_vendor.c b/drivers/scsi/sr_vendor.c
    index 1f988a1b9166f..a61635326ae0a 100644
    --- a/drivers/scsi/sr_vendor.c
    +++ b/drivers/scsi/sr_vendor.c
    @@ -131,7 +131,7 @@ int sr_set_blocklength(Scsi_CD *cd, int blocklength)
    if (cd->vendor == VENDOR_TOSHIBA)
    density = (blocklength > 2048) ? 0x81 : 0x83;

    - buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);
    + buffer = kmalloc(512, GFP_KERNEL);
    if (!buffer)
    return -ENOMEM;

    @@ -179,7 +179,7 @@ int sr_cd_check(struct cdrom_device_info *cdi)
    if (cd->cdi.mask & CDC_MULTI_SESSION)
    return 0;

    - buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);
    + buffer = kmalloc(512, GFP_KERNEL);
    if (!buffer)
    return -ENOMEM;

    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-25 04:39    [W:2.057 / U:0.728 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site