lkml.org 
[lkml]   [2019]   [Feb]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 14/28] nvme-pci: use the same attributes when freeing host_mem_desc_bufs.
    Date
    From: Liviu Dudau <liviu@dudau.co.uk>

    [ Upstream commit cc667f6d5de023ee131e96bb88e5cddca23272bd ]

    When using HMB the PCIe host driver allocates host_mem_desc_bufs using
    dma_alloc_attrs() but frees them using dma_free_coherent(). Use the
    correct dma_free_attrs() function to free the buffers.

    Signed-off-by: Liviu Dudau <liviu@dudau.co.uk>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/nvme/host/pci.c | 10 ++++++----
    1 file changed, 6 insertions(+), 4 deletions(-)

    diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
    index d668682f91df..40f76b4f08fc 100644
    --- a/drivers/nvme/host/pci.c
    +++ b/drivers/nvme/host/pci.c
    @@ -1727,8 +1727,9 @@ static void nvme_free_host_mem(struct nvme_dev *dev)
    struct nvme_host_mem_buf_desc *desc = &dev->host_mem_descs[i];
    size_t size = le32_to_cpu(desc->size) * dev->ctrl.page_size;

    - dma_free_coherent(dev->dev, size, dev->host_mem_desc_bufs[i],
    - le64_to_cpu(desc->addr));
    + dma_free_attrs(dev->dev, size, dev->host_mem_desc_bufs[i],
    + le64_to_cpu(desc->addr),
    + DMA_ATTR_NO_KERNEL_MAPPING | DMA_ATTR_NO_WARN);
    }

    kfree(dev->host_mem_desc_bufs);
    @@ -1794,8 +1795,9 @@ static int __nvme_alloc_host_mem(struct nvme_dev *dev, u64 preferred,
    while (--i >= 0) {
    size_t size = le32_to_cpu(descs[i].size) * dev->ctrl.page_size;

    - dma_free_coherent(dev->dev, size, bufs[i],
    - le64_to_cpu(descs[i].addr));
    + dma_free_attrs(dev->dev, size, bufs[i],
    + le64_to_cpu(descs[i].addr),
    + DMA_ATTR_NO_KERNEL_MAPPING | DMA_ATTR_NO_WARN);
    }

    kfree(bufs);
    --
    2.19.1
    \
     
     \ /
      Last update: 2019-02-09 19:50    [W:2.469 / U:0.176 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site