Patch "drm/i915/gvt: Disable access to stolen memory as a guest" has been added to the 4.4-stable tree

Patch "drm/i915/gvt: Disable access to stolen memory as a guest" has been added to the 4.4-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    drm/i915/gvt: Disable access to stolen memory as a guest

to the 4.4-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     drm-i915-gvt-disable-access-to-stolen-memory-as-a-guest.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 04a68a35ce6d7b54749989f943993020f48fed62 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 9 Nov 2016 10:39:05 +0000
Subject: drm/i915/gvt: Disable access to stolen memory as a guest

From: Chris Wilson <chris@chris-wilson.co.uk>

commit 04a68a35ce6d7b54749989f943993020f48fed62 upstream.

Explicitly disable stolen memory when running as a guest in a virtual
machine, since the memory is not mediated between clients and reserved
entirely for the host. The actual size should be reported as zero, but
like every other quirk we want to tell the user what is happening.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99028
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Zhenyu Wang <zhenyuw@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161109103905.17860-1-chris@chris-wilson.co.uk
Reviewed-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/gpu/drm/i915/i915_gem_stolen.c |    5 +++++
 1 file changed, 5 insertions(+)

--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
@@ -405,6 +405,11 @@ int i915_gem_init_stolen(struct drm_devi
 
 	mutex_init(&dev_priv->mm.stolen_lock);
 
+	if (intel_vgpu_active(dev_priv)) {
+		DRM_INFO("iGVT-g active, disabling use of stolen memory\n");
+		return 0;
+	}
+
 #ifdef CONFIG_INTEL_IOMMU
 	if (intel_iommu_gfx_mapped && INTEL_INFO(dev)->gen < 8) {
 		DRM_INFO("DMAR active, disabling use of stolen memory\n");


Patches currently in stable-queue which might be from chris@chris-wilson.co.uk are

queue-4.4/drm-i915-gvt-disable-access-to-stolen-memory-as-a-guest.patch

Re: Patch "drm/i915/gvt: Disable access to stolen memory as a guest" has been added to the 4.4-stable tree

[Greg KH]

Ugh, this broke the build on 4.4, so I'm dropping it from there...

I try to include just a few i915 patches into the stable tree this time,
and all of them break or don't even apply...

Ugh.

greg k-h

On Tue, May 23, 2017 at 08:37:30PM +0200, gregkh@linuxfoundation.org wrote:
> 
> This is a note to let you know that I've just added the patch titled
> 
>     drm/i915/gvt: Disable access to stolen memory as a guest
> 
> to the 4.4-stable tree which can be found at:
>     http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
> 
> The filename of the patch is:
>      drm-i915-gvt-disable-access-to-stolen-memory-as-a-guest.patch
> and it can be found in the queue-4.4 subdirectory.
> 
> If you, or anyone else, feels it should not be added to the stable tree,
> please let <stable@vger.kernel.org> know about it.
> 
> 
> >From 04a68a35ce6d7b54749989f943993020f48fed62 Mon Sep 17 00:00:00 2001
> From: Chris Wilson <chris@chris-wilson.co.uk>
> Date: Wed, 9 Nov 2016 10:39:05 +0000
> Subject: drm/i915/gvt: Disable access to stolen memory as a guest
> 
> From: Chris Wilson <chris@chris-wilson.co.uk>
> 
> commit 04a68a35ce6d7b54749989f943993020f48fed62 upstream.
> 
> Explicitly disable stolen memory when running as a guest in a virtual
> machine, since the memory is not mediated between clients and reserved
> entirely for the host. The actual size should be reported as zero, but
> like every other quirk we want to tell the user what is happening.
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99028
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Zhenyu Wang <zhenyuw@linux.intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Link: http://patchwork.freedesktop.org/patch/msgid/20161109103905.17860-1-chris@chris-wilson.co.uk
> Reviewed-by: Zhenyu Wang <zhenyuw@linux.intel.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> 
> ---
>  drivers/gpu/drm/i915/i915_gem_stolen.c |    5 +++++
>  1 file changed, 5 insertions(+)
> 
> --- a/drivers/gpu/drm/i915/i915_gem_stolen.c
> +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
> @@ -405,6 +405,11 @@ int i915_gem_init_stolen(struct drm_devi
>  
>  	mutex_init(&dev_priv->mm.stolen_lock);
>  
> +	if (intel_vgpu_active(dev_priv)) {
> +		DRM_INFO("iGVT-g active, disabling use of stolen memory\n");
> +		return 0;
> +	}
> +
>  #ifdef CONFIG_INTEL_IOMMU
>  	if (intel_iommu_gfx_mapped && INTEL_INFO(dev)->gen < 8) {
>  		DRM_INFO("DMAR active, disabling use of stolen memory\n");
> 
> 
> Patches currently in stable-queue which might be from chris@chris-wilson.co.uk are
> 
> queue-4.4/drm-i915-gvt-disable-access-to-stolen-memory-as-a-guest.patch