lkml.org 
[lkml]   [2014]   [May]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.14 131/158] mtip32xx: Unmap the DMA segments before completing the IO request
    Date
    3.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Felipe Franciosi <felipe@paradoxo.org>

    commit 368c89d7ac70f937c93cd6f3b65bcfdfb3ba794f upstream.

    If the buffers are unmapped after completing a request, then stale data
    might be in the request.

    Signed-off-by: Felipe Franciosi <felipe@paradoxo.org>
    Signed-off-by: Jens Axboe <axboe@fb.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/block/mtip32xx/mtip32xx.c | 24 ++++++++++++------------
    1 file changed, 12 insertions(+), 12 deletions(-)

    --- a/drivers/block/mtip32xx/mtip32xx.c
    +++ b/drivers/block/mtip32xx/mtip32xx.c
    @@ -266,6 +266,12 @@ static void mtip_async_complete(struct m
    "Command tag %d failed due to TFE\n", tag);
    }

    + /* Unmap the DMA scatter list entries */
    + dma_unmap_sg(&dd->pdev->dev,
    + command->sg,
    + command->scatter_ents,
    + command->direction);
    +
    /* Upper layer callback */
    if (likely(command->async_callback))
    command->async_callback(command->async_data, cb_status);
    @@ -273,12 +279,6 @@ static void mtip_async_complete(struct m
    command->async_callback = NULL;
    command->comp_func = NULL;

    - /* Unmap the DMA scatter list entries */
    - dma_unmap_sg(&dd->pdev->dev,
    - command->sg,
    - command->scatter_ents,
    - command->direction);
    -
    /* Clear the allocated and active bits for the command */
    atomic_set(&port->commands[tag].active, 0);
    release_slot(port, tag);
    @@ -709,6 +709,12 @@ static void mtip_timeout_function(unsign
    */
    writel(1 << bit, port->completed[group]);

    + /* Unmap the DMA scatter list entries */
    + dma_unmap_sg(&port->dd->pdev->dev,
    + command->sg,
    + command->scatter_ents,
    + command->direction);
    +
    /* Call the async completion callback. */
    if (likely(command->async_callback))
    command->async_callback(command->async_data,
    @@ -716,12 +722,6 @@ static void mtip_timeout_function(unsign
    command->async_callback = NULL;
    command->comp_func = NULL;

    - /* Unmap the DMA scatter list entries */
    - dma_unmap_sg(&port->dd->pdev->dev,
    - command->sg,
    - command->scatter_ents,
    - command->direction);
    -
    /*
    * Clear the allocated bit and active tag for the
    * command.



    \
     
     \ /
      Last update: 2014-05-04 19:41    [W:4.064 / U:0.344 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site