lkml.org 
[lkml]   [2017]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 036/164] scsi: use dma_get_cache_alignment() as minimum DMA alignment
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Huacai Chen <chenhc@lemote.com>

    commit 90addc6b3c9cda0146fbd62a08e234c2b224a80c upstream.

    In non-coherent DMA mode, kernel uses cache flushing operations to
    maintain I/O coherency, so scsi's block queue should be aligned to the
    value returned by dma_get_cache_alignment(). Otherwise, If a DMA buffer
    and a kernel structure share a same cache line, and if the kernel
    structure has dirty data, cache_invalidate (no writeback) will cause
    data corruption.

    Signed-off-by: Huacai Chen <chenhc@lemote.com>
    [hch: rebased and updated the comment and changelog]
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/scsi/scsi_lib.c | 10 ++++++----
    1 file changed, 6 insertions(+), 4 deletions(-)

    --- a/drivers/scsi/scsi_lib.c
    +++ b/drivers/scsi/scsi_lib.c
    @@ -2126,11 +2126,13 @@ void __scsi_init_queue(struct Scsi_Host
    q->limits.cluster = 0;

    /*
    - * set a reasonable default alignment on word boundaries: the
    - * host and device may alter it using
    - * blk_queue_update_dma_alignment() later.
    + * Set a reasonable default alignment: The larger of 32-byte (dword),
    + * which is a common minimum for HBAs, and the minimum DMA alignment,
    + * which is set by the platform.
    + *
    + * Devices that require a bigger alignment can increase it later.
    */
    - blk_queue_dma_alignment(q, 0x03);
    + blk_queue_dma_alignment(q, max(4, dma_get_cache_alignment()) - 1);
    }
    EXPORT_SYMBOL_GPL(__scsi_init_queue);


    \
     
     \ /
      Last update: 2017-12-12 14:56    [W:3.430 / U:0.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site