lkml.org 
[lkml]   [2021]   [Feb]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[RFC PATCH 09/10] vfio/type1: Pass iommu and dma objects through to vaddr_get_pfn
    From
    Date
    We'll need these to track vfio device mappings.

    Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
    ---
    drivers/vfio/vfio_iommu_type1.c | 30 +++++++++++++++++-------------
    1 file changed, 17 insertions(+), 13 deletions(-)

    diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
    index 5099b3c9dce0..b34ee4b96a4a 100644
    --- a/drivers/vfio/vfio_iommu_type1.c
    +++ b/drivers/vfio/vfio_iommu_type1.c
    @@ -517,15 +517,16 @@ static int unmap_dma_pfn_list(struct vfio_iommu *iommu, struct vfio_dma *dma,
    return 0;
    }

    -static int vaddr_get_pfn(struct mm_struct *mm, unsigned long vaddr,
    - int prot, unsigned long *pfn)
    +static int vaddr_get_pfn(struct vfio_iommu *iommu, struct vfio_dma *dma,
    + struct mm_struct *mm, unsigned long vaddr,
    + unsigned long *pfn)
    {
    struct page *page[1];
    struct vm_area_struct *vma;
    unsigned int flags = 0;
    int ret;

    - if (prot & IOMMU_WRITE)
    + if (dma->prot & IOMMU_WRITE)
    flags |= FOLL_WRITE;

    mmap_read_lock(mm);
    @@ -543,7 +544,8 @@ static int vaddr_get_pfn(struct mm_struct *mm, unsigned long vaddr,
    vma = find_vma_intersection(mm, vaddr, vaddr + 1);

    if (vma && vma->vm_flags & VM_PFNMAP) {
    - ret = follow_fault_pfn(vma, mm, vaddr, pfn, prot & IOMMU_WRITE);
    + ret = follow_fault_pfn(vma, mm, vaddr, pfn,
    + dma->prot & IOMMU_WRITE);
    if (ret == -EAGAIN)
    goto retry;

    @@ -615,7 +617,8 @@ static int vfio_wait_all_valid(struct vfio_iommu *iommu)
    * the iommu can only map chunks of consecutive pfns anyway, so get the
    * first page and all consecutive pages with the same locking.
    */
    -static long vfio_pin_pages_remote(struct vfio_dma *dma, unsigned long vaddr,
    +static long vfio_pin_pages_remote(struct vfio_iommu *iommu,
    + struct vfio_dma *dma, unsigned long vaddr,
    long npage, unsigned long *pfn_base,
    unsigned long limit)
    {
    @@ -628,7 +631,7 @@ static long vfio_pin_pages_remote(struct vfio_dma *dma, unsigned long vaddr,
    if (!current->mm)
    return -ENODEV;

    - ret = vaddr_get_pfn(current->mm, vaddr, dma->prot, pfn_base);
    + ret = vaddr_get_pfn(iommu, dma, current->mm, vaddr, pfn_base);
    if (ret)
    return ret;

    @@ -655,7 +658,7 @@ static long vfio_pin_pages_remote(struct vfio_dma *dma, unsigned long vaddr,
    /* Lock all the consecutive pages from pfn_base */
    for (vaddr += PAGE_SIZE, iova += PAGE_SIZE; pinned < npage;
    pinned++, vaddr += PAGE_SIZE, iova += PAGE_SIZE) {
    - ret = vaddr_get_pfn(current->mm, vaddr, dma->prot, &pfn);
    + ret = vaddr_get_pfn(iommu, dma, current->mm, vaddr, &pfn);
    if (ret)
    break;

    @@ -715,7 +718,8 @@ static long vfio_unpin_pages_remote(struct vfio_dma *dma, dma_addr_t iova,
    return unlocked;
    }

    -static int vfio_pin_page_external(struct vfio_dma *dma, unsigned long vaddr,
    +static int vfio_pin_page_external(struct vfio_iommu *iommu,
    + struct vfio_dma *dma, unsigned long vaddr,
    unsigned long *pfn_base, bool do_accounting)
    {
    struct mm_struct *mm;
    @@ -725,7 +729,7 @@ static int vfio_pin_page_external(struct vfio_dma *dma, unsigned long vaddr,
    if (!mm)
    return -ENODEV;

    - ret = vaddr_get_pfn(mm, vaddr, dma->prot, pfn_base);
    + ret = vaddr_get_pfn(iommu, dma, mm, vaddr, pfn_base);
    if (!ret && do_accounting && !is_invalid_reserved_pfn(*pfn_base)) {
    ret = vfio_lock_acct(dma, 1, true);
    if (ret) {
    @@ -833,8 +837,8 @@ static int vfio_iommu_type1_pin_pages(void *iommu_data,
    }

    remote_vaddr = dma->vaddr + (iova - dma->iova);
    - ret = vfio_pin_page_external(dma, remote_vaddr, &phys_pfn[i],
    - do_accounting);
    + ret = vfio_pin_page_external(iommu, dma, remote_vaddr,
    + &phys_pfn[i], do_accounting);
    if (ret)
    goto pin_unwind;

    @@ -1404,7 +1408,7 @@ static int vfio_pin_map_dma(struct vfio_iommu *iommu, struct vfio_dma *dma,

    while (size) {
    /* Pin a contiguous chunk of memory */
    - npage = vfio_pin_pages_remote(dma, vaddr + dma->size,
    + npage = vfio_pin_pages_remote(iommu, dma, vaddr + dma->size,
    size >> PAGE_SHIFT, &pfn, limit);
    if (npage <= 0) {
    WARN_ON(!npage);
    @@ -1660,7 +1664,7 @@ static int vfio_iommu_replay(struct vfio_iommu *iommu,
    size_t n = dma->iova + dma->size - iova;
    long npage;

    - npage = vfio_pin_pages_remote(dma, vaddr,
    + npage = vfio_pin_pages_remote(iommu, dma, vaddr,
    n >> PAGE_SHIFT,
    &pfn, limit);
    if (npage <= 0) {
    \
     
     \ /
      Last update: 2021-02-22 17:57    [W:3.727 / U:0.468 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site