lkml.org 
[lkml]   [2021]   [Jun]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/2] Revert "swiotlb-xen: remove xen_swiotlb_dma_mmap and xen_swiotlb_dma_get_sgtable"
    Date
    This reverts commit 922659ea771b3fd728149262c5ea15608fab9719.

    Signed-off-by: Roman Skakun <roman_skakun@epam.com>
    ---
    drivers/xen/swiotlb-xen.c | 29 +++++++++++++++++++++++++++--
    1 file changed, 27 insertions(+), 2 deletions(-)

    diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
    index 2b385c1b4a99..90bc5fc321bc 100644
    --- a/drivers/xen/swiotlb-xen.c
    +++ b/drivers/xen/swiotlb-xen.c
    @@ -563,6 +563,31 @@ xen_swiotlb_dma_supported(struct device *hwdev, u64 mask)
    return xen_virt_to_bus(hwdev, xen_io_tlb_end - 1) <= mask;
    }

    +/*
    + * Create userspace mapping for the DMA-coherent memory.
    + * This function should be called with the pages from the current domain only,
    + * passing pages mapped from other domains would lead to memory corruption.
    + */
    +static int
    +xen_swiotlb_dma_mmap(struct device *dev, struct vm_area_struct *vma,
    + void *cpu_addr, dma_addr_t dma_addr, size_t size,
    + unsigned long attrs)
    +{
    + return dma_common_mmap(dev, vma, cpu_addr, dma_addr, size, attrs);
    +}
    +
    +/*
    + * This function should be called with the pages from the current domain only,
    + * passing pages mapped from other domains would lead to memory corruption.
    + */
    +static int
    +xen_swiotlb_get_sgtable(struct device *dev, struct sg_table *sgt,
    + void *cpu_addr, dma_addr_t handle, size_t size,
    + unsigned long attrs)
    +{
    + return dma_common_get_sgtable(dev, sgt, cpu_addr, handle, size, attrs);
    +}
    +
    const struct dma_map_ops xen_swiotlb_dma_ops = {
    .alloc = xen_swiotlb_alloc_coherent,
    .free = xen_swiotlb_free_coherent,
    @@ -575,8 +600,8 @@ const struct dma_map_ops xen_swiotlb_dma_ops = {
    .map_page = xen_swiotlb_map_page,
    .unmap_page = xen_swiotlb_unmap_page,
    .dma_supported = xen_swiotlb_dma_supported,
    - .mmap = dma_common_mmap,
    - .get_sgtable = dma_common_get_sgtable,
    + .mmap = xen_swiotlb_dma_mmap,
    + .get_sgtable = xen_swiotlb_get_sgtable,
    .alloc_pages = dma_common_alloc_pages,
    .free_pages = dma_common_free_pages,
    };
    --
    2.25.1
    \
     
     \ /
      Last update: 2021-06-16 13:43    [W:4.379 / U:0.464 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site