Skip to contentSkip to conversation

drm/i915/gvt: Fix mmap range check

PATCH In review Zhenyu Wang 2 participants 3 messages Jan 11, 2019 – Jan 17, 2019 1 message not in the archive

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915/gvt: Fix mmap range check

This is to fix missed mmap range check on vGPU bar2 region and only allow to map vGPU allocated GMADDR range, which means user space should support sparse mmap to get proper offset for mmap vGPU aperture. And this takes care of actual pgoff in mmap request as original code always does from beginning of vGPU aperture.

Fixes 659643f7d814 ("drm/i915/gvt/kvmgt: add vfio/mdev support to KVMGT")
Cc "Monroy, Rodrigo Axel" <[email protected]>
Cc "Orrala Contreras, Alfredo" <[email protected]>
Cc [email protected] # v4.10+
---
 drivers/gpu/drm/i915/gvt/kvmgt.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gvt/kvmgt.c +12 -2
index a19e684e621a..5488c2e2a3ff 100644
@@ -1005,7 +1005,7 @@ static int intel_vgpu_mmap(struct mdev_device *mdev, struct vm_area_struct *vma)
 {
 	unsigned int index;
 	u64 virtaddr;
-	unsigned long req_size, pgoff = 0;
+	unsigned long req_size, pgoff, req_start;
 	pgprot_t pg_prot;
 	struct intel_vgpu *vgpu = mdev_get_drvdata(mdev);
 
@@ -1023,7 +1023,17 @@ static int intel_vgpu_mmap(struct mdev_device *mdev, struct vm_area_struct *vma)
 	pg_prot = vma->vm_page_prot;
 	virtaddr = vma->vm_start;
 	req_size = vma->vm_end - vma->vm_start;
-	pgoff = vgpu_aperture_pa_base(vgpu) >> PAGE_SHIFT;
+	pgoff = vma->vm_pgoff &
+		((1U << (VFIO_PCI_OFFSET_SHIFT - PAGE_SHIFT)) - 1);
+	req_start = pgoff << PAGE_SHIFT;
+
+	if (!intel_vgpu_in_aperture(vgpu, req_start))
+		return -EINVAL;
+	if (req_start + req_size >
+	    vgpu_aperture_offset(vgpu) + vgpu_aperture_sz(vgpu))
+		return -EINVAL;
+
+	pgoff = (gvt_aperture_pa_base(vgpu->gvt) >> PAGE_SHIFT) + pgoff;
 
 	return remap_pfn_range(vma, virtaddr, pgoff, req_size, pg_prot);
 }
Signature · 1 line
2.19.1
Reviewed-by on v1 1/1
#1 lore raw

Looks fine to me. Thanks.

Quoted 66 lines

-----Original Message-----
From: intel-gvt-dev [mailto:[email protected]] On Behalf Of Zhenyu Wang
Sent: Friday, January 11, 2019 1:59 PM
To: [email protected]
Cc: Monroy, Rodrigo Axel <[email protected]>; Orrala Contreras, Alfredo <[email protected]>; [email protected]
Subject: [PATCH] drm/i915/gvt: Fix mmap range check

This is to fix missed mmap range check on vGPU bar2 region and only allow to map vGPU allocated GMADDR range, which means user space should support sparse mmap to get proper offset for mmap vGPU aperture. And this takes care of actual pgoff in mmap request as original code always does from beginning of vGPU aperture.

Fixes 659643f7d814 ("drm/i915/gvt/kvmgt: add vfio/mdev support to

KVMGT")

Cc "Monroy, Rodrigo Axel" <[email protected]>
Cc "Orrala Contreras, Alfredo" <[email protected]>
Cc [email protected] # v4.10+
---
 drivers/gpu/drm/i915/gvt/kvmgt.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gvt/kvmgt.c +12 -3
index a19e684e621a..5488c2e2a3ff 100644
@@ -1005,7 +1005,7 @@ static int intel_vgpu_mmap(struct mdev_device
 *mdev, struct vm_area_struct *vma)  {
 	unsigned int index;
 	u64 virtaddr;
-	unsigned long req_size, pgoff = 0;
+	unsigned long req_size, pgoff, req_start;
 	pgprot_t pg_prot;
 	struct intel_vgpu *vgpu = mdev_get_drvdata(mdev);
 
@@ -1023,7 +1023,17 @@ static int intel_vgpu_mmap(struct mdev_device
 *mdev, struct vm_area_struct *vma)
 	pg_prot = vma->vm_page_prot;
 	virtaddr = vma->vm_start;
 	req_size = vma->vm_end - vma->vm_start;
-	pgoff = vgpu_aperture_pa_base(vgpu) >> PAGE_SHIFT;
+	pgoff = vma->vm_pgoff &
+		((1U << (VFIO_PCI_OFFSET_SHIFT - PAGE_SHIFT)) - 1);
+	req_start = pgoff << PAGE_SHIFT;
+
+	if (!intel_vgpu_in_aperture(vgpu, req_start))
+		return -EINVAL;
+	if (req_start + req_size >
+	    vgpu_aperture_offset(vgpu) + vgpu_aperture_sz(vgpu))
+		return -EINVAL;
+
+	pgoff = (gvt_aperture_pa_base(vgpu->gvt) >> PAGE_SHIFT) + pgoff;
 
 	return remap_pfn_range(vma, virtaddr, pgoff, req_size, pg_prot);  }
--

2.19.1

_______________________________________________
intel-gvt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gvt-dev

#3 lore raw
In reply to a message not in the archive
Quoted 9 lines · Sasha Levin

Hi,

[This is an automated email]

This commit has been processed because it contains a "Fixes:" tag, fixing commit: 659643f7d814 drm/i915/gvt/kvmgt: add vfio/mdev support to KVMGT.

The bot has tested the following trees: v4.20.2, v4.19.15, v4.14.93.

Quoted 8 lines

v4.20.2: Build OK!
v4.19.15: Build OK!
v4.14.93: Build failed! Errors:
drivers/gpu/drm/i915/gvt/kvmgt.c:836:7: error: implicit declaration of function ???intel_vgpu_in_aperture???; did you mean ???intel_vgpu_create???? [-Werror=implicit-function-declaration]

How should we proceed with this patch?

I'll prepare a backport version once this one hits linux master.

Thanks.

Signature · 3 lines
Open Source Technology Center, Intel ltd.

$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827