Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1509846
| From | Kirti Wankhede <kwankhede@nvidia.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v10 07/19] vfio iommu type1: Update argument of vaddr_get_pfn() |
| Date | 2016-10-26 23:30 +0200 |
| Message-ID | <swDVM-UP-43@gated-at.bofh.it> (permalink) |
| References | <swDVL-UP-7@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Update arguments of vaddr_get_pfn() to take struct mm_struct *mm as input
argument.
Signed-off-by: Kirti Wankhede <kwankhede@nvidia.com>
Signed-off-by: Neo Jia <cjia@nvidia.com>
Change-Id: I885fd4cd4a9f66f4ee2c1caf58267464ec239f52
---
drivers/vfio/vfio_iommu_type1.c | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
index 72fee415044a..3d916b965492 100644
--- a/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@ -228,20 +228,31 @@ static int put_pfn(unsigned long pfn, int prot)
return 0;
}
-static int vaddr_get_pfn(unsigned long vaddr, int prot, unsigned long *pfn)
+static int vaddr_get_pfn(struct mm_struct *remote_mm, unsigned long vaddr,
+ int prot, unsigned long *pfn)
{
struct page *page[1];
struct vm_area_struct *vma;
+ struct mm_struct *mm = (remote_mm ? remote_mm : current->mm);
int ret = -EFAULT;
- if (get_user_pages_fast(vaddr, 1, !!(prot & IOMMU_WRITE), page) == 1) {
+ if (remote_mm) {
+ down_read(&mm->mmap_sem);
+ ret = get_user_pages_remote(NULL, mm, vaddr, 1,
+ !!(prot & IOMMU_WRITE), 0, page, NULL);
+ up_read(&mm->mmap_sem);
+ } else
+ ret = get_user_pages_fast(vaddr, 1,
+ !!(prot & IOMMU_WRITE), page);
+
+ if (ret == 1) {
*pfn = page_to_pfn(page[0]);
return 0;
}
- down_read(¤t->mm->mmap_sem);
+ down_read(&mm->mmap_sem);
- vma = find_vma_intersection(current->mm, vaddr, vaddr + 1);
+ vma = find_vma_intersection(mm, vaddr, vaddr + 1);
if (vma && vma->vm_flags & VM_PFNMAP) {
*pfn = ((vaddr - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
@@ -249,7 +260,7 @@ static int vaddr_get_pfn(unsigned long vaddr, int prot, unsigned long *pfn)
ret = 0;
}
- up_read(¤t->mm->mmap_sem);
+ up_read(&mm->mmap_sem);
return ret;
}
@@ -270,7 +281,7 @@ static long vfio_pin_pages(unsigned long vaddr, long npage,
if (!current->mm)
return -ENODEV;
- ret = vaddr_get_pfn(vaddr, prot, pfn_base);
+ ret = vaddr_get_pfn(NULL, vaddr, prot, pfn_base);
if (ret)
return ret;
@@ -293,7 +304,7 @@ static long vfio_pin_pages(unsigned long vaddr, long npage,
for (i = 1, vaddr += PAGE_SIZE; i < npage; i++, vaddr += PAGE_SIZE) {
unsigned long pfn = 0;
- ret = vaddr_get_pfn(vaddr, prot, &pfn);
+ ret = vaddr_get_pfn(NULL, vaddr, prot, &pfn);
if (ret)
break;
--
2.7.0
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v10 00/19] Add Mediated device support Kirti Wankhede <kwankhede@nvidia.com> - 2016-10-26 23:30 +0200
[PATCH v10 07/19] vfio iommu type1: Update argument of vaddr_get_pfn() Kirti Wankhede <kwankhede@nvidia.com> - 2016-10-26 23:30 +0200
Re: [PATCH v10 07/19] vfio iommu type1: Update argument of vaddr_get_pfn() Jike Song <jike.song@intel.com> - 2016-10-27 16:00 +0200
Re: [PATCH v10 07/19] vfio iommu type1: Update argument of vaddr_get_pfn() Kirti Wankhede <kwankhede@nvidia.com> - 2016-10-27 17:50 +0200
Re: [PATCH v10 07/19] vfio iommu type1: Update argument of vaddr_get_pfn() Jike Song <jike.song@intel.com> - 2016-10-28 08:10 +0200
Re: [PATCH v10 07/19] vfio iommu type1: Update argument of vaddr_get_pfn() Kirti Wankhede <kwankhede@nvidia.com> - 2016-11-02 09:10 +0100
[PATCH v10 01/19] vfio: Mediated device Core driver Kirti Wankhede <kwankhede@nvidia.com> - 2016-10-26 23:30 +0200
Re: [PATCH v10 01/19] vfio: Mediated device Core driver Jike Song <jike.song@intel.com> - 2016-10-29 06:40 +0200
Re: [PATCH v10 01/19] vfio: Mediated device Core driver Kirti Wankhede <kwankhede@nvidia.com> - 2016-10-29 12:10 +0200
Re: [PATCH v10 01/19] vfio: Mediated device Core driver Jike Song <jike.song@intel.com> - 2016-10-29 20:20 +0200
Re: [PATCH v10 01/19] vfio: Mediated device Core driver Kirti Wankhede <kwankhede@nvidia.com> - 2016-11-02 09:10 +0100
Re: [Qemu-devel] [PATCH v10 01/19] vfio: Mediated device Core driver Jike Song <jike.song@intel.com> - 2016-11-02 11:40 +0100
Re: [PATCH v10 01/19] vfio: Mediated device Core driver Jike Song <jike.song@intel.com> - 2016-11-01 04:20 +0100
Re: [PATCH v10 01/19] vfio: Mediated device Core driver Alex Williamson <alex.williamson@redhat.com> - 2016-11-01 04:50 +0100
Re: [PATCH v10 01/19] vfio: Mediated device Core driver Jike Song <jike.song@intel.com> - 2016-11-01 06:40 +0100
[PATCH v10 17/19] docs: Add Documentation for Mediated devices Kirti Wankhede <kwankhede@nvidia.com> - 2016-10-26 23:40 +0200
[PATCH v10 03/19] vfio: Rearrange functions to get vfio_group from dev Kirti Wankhede <kwankhede@nvidia.com> - 2016-10-26 23:40 +0200
Re: [PATCH v10 03/19] vfio: Rearrange functions to get vfio_group from dev Jike Song <jike.song@intel.com> - 2016-11-02 11:50 +0100
[PATCH v10 18/19] docs: Sysfs ABI for mediated device framework Kirti Wankhede <kwankhede@nvidia.com> - 2016-10-26 23:40 +0200
Re: [PATCH v10 18/19] docs: Sysfs ABI for mediated device framework Jike Song <jike.song@intel.com> - 2016-10-31 08:30 +0100
Re: [PATCH v10 18/19] docs: Sysfs ABI for mediated device framework Kirti Wankhede <kwankhede@nvidia.com> - 2016-11-02 09:00 +0100
[PATCH v10 09/19] vfio iommu type1: Add support for mediated devices Kirti Wankhede <kwankhede@nvidia.com> - 2016-10-26 23:40 +0200
Re: [PATCH v10 09/19] vfio iommu type1: Add support for mediated devices Alex Williamson <alex.williamson@redhat.com> - 2016-10-28 01:10 +0200
Re: [PATCH v10 09/19] vfio iommu type1: Add support for mediated devices Jike Song <jike.song@intel.com> - 2016-11-02 14:40 +0100
[PATCH v10 16/19] vfio: Define device_api strings Kirti Wankhede <kwankhede@nvidia.com> - 2016-10-26 23:40 +0200
[PATCH v10 14/19] vfio_pci: Updated to use vfio_set_irqs_validate_and_prepare() Kirti Wankhede <kwankhede@nvidia.com> - 2016-10-26 23:40 +0200
[PATCH v10 15/19] vfio_platform: Updated to use vfio_set_irqs_validate_and_prepare() Kirti Wankhede <kwankhede@nvidia.com> - 2016-10-26 23:40 +0200
[PATCH v10 11/19] vfio: Introduce common function to add capabilities Kirti Wankhede <kwankhede@nvidia.com> - 2016-10-26 23:40 +0200
[PATCH v10 06/19] vfio iommu type1: Update arguments of vfio_lock_acct Kirti Wankhede <kwankhede@nvidia.com> - 2016-10-26 23:40 +0200
[PATCH v10 13/19] vfio: Introduce vfio_set_irqs_validate_and_prepare() Kirti Wankhede <kwankhede@nvidia.com> - 2016-10-26 23:40 +0200
[PATCH v10 12/19] vfio_pci: Update vfio_pci to use vfio_info_add_capability() Kirti Wankhede <kwankhede@nvidia.com> - 2016-10-26 23:40 +0200
[PATCH v10 02/19] vfio: VFIO based driver for Mediated devices Kirti Wankhede <kwankhede@nvidia.com> - 2016-10-26 23:40 +0200
Re: [PATCH v10 02/19] vfio: VFIO based driver for Mediated devices Jike Song <jike.song@intel.com> - 2016-11-02 11:50 +0100
[PATCH v10 10/19] vfio iommu: Add blocking notifier to notify DMA_UNMAP Kirti Wankhede <kwankhede@nvidia.com> - 2016-10-26 23:40 +0200
Re: [PATCH v10 10/19] vfio iommu: Add blocking notifier to notify DMA_UNMAP Jike Song <jike.song@intel.com> - 2016-10-28 09:40 +0200
Re: [PATCH v10 10/19] vfio iommu: Add blocking notifier to notify DMA_UNMAP Kirti Wankhede <kwankhede@nvidia.com> - 2016-10-28 14:40 +0200
Re: [PATCH v10 10/19] vfio iommu: Add blocking notifier to notify DMA_UNMAP Alex Williamson <alex.williamson@redhat.com> - 2016-10-28 14:50 +0200
Re: [PATCH v10 10/19] vfio iommu: Add blocking notifier to notify DMA_UNMAP Kirti Wankhede <kwankhede@nvidia.com> - 2016-10-28 22:10 +0200
Re: [PATCH v10 10/19] vfio iommu: Add blocking notifier to notify DMA_UNMAP Alex Williamson <alex.williamson@redhat.com> - 2016-10-28 22:40 +0200
Re: [PATCH v10 10/19] vfio iommu: Add blocking notifier to notify DMA_UNMAP Kirti Wankhede <kwankhede@nvidia.com> - 2016-10-29 12:40 +0200
Re: [PATCH v10 10/19] vfio iommu: Add blocking notifier to notify DMA_UNMAP Alex Williamson <alex.williamson@redhat.com> - 2016-10-29 16:10 +0200
Re: [PATCH v10 10/19] vfio iommu: Add blocking notifier to notify DMA_UNMAP Kirti Wankhede <kwankhede@nvidia.com> - 2016-11-01 08:50 +0100
Re: [PATCH v10 10/19] vfio iommu: Add blocking notifier to notify DMA_UNMAP Jike Song <jike.song@intel.com> - 2016-10-31 05:00 +0100
Re: [PATCH v10 10/19] vfio iommu: Add blocking notifier to notify DMA_UNMAP Jike Song <jike.song@intel.com> - 2016-10-31 07:10 +0100
Re: [PATCH v10 10/19] vfio iommu: Add blocking notifier to notify DMA_UNMAP Kirti Wankhede <kwankhede@nvidia.com> - 2016-10-31 07:10 +0100
Re: [PATCH v10 19/19] docs: Sample driver to demonstrate how to use Mediated device framework. Jonathan Corbet <corbet@lwn.net> - 2016-10-27 16:40 +0200
Re: [PATCH v10 00/19] Add Mediated device support Jike Song <jike.song@intel.com> - 2016-11-01 09:40 +0100
Re: [PATCH v10 00/19] Add Mediated device support Gerd Hoffmann <kraxel@redhat.com> - 2016-11-01 16:30 +0100
Re: [Qemu-devel] [PATCH v10 00/19] Add Mediated device support Jike Song <jike.song@intel.com> - 2016-11-02 02:10 +0100
csiph-web