From mboxrd@z Thu Jan 1 00:00:00 1970 From: Zhenyu Wang Subject: Re: [PATCHi v2] drm/i915: Enhanced disable access to stolen memory as a guest Date: Mon, 27 Mar 2017 10:21:42 +0800 Message-ID: <20170327022142.frngwpbaixo4esfo@zhen-hp.sh.intel.com> References: <1490340204-21319-1-git-send-email-xiong.y.zhang@intel.com> <1490351024-22347-1-git-send-email-xiong.y.zhang@intel.com> Reply-To: Zhenyu Wang Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0924021956==" Return-path: In-Reply-To: <1490351024-22347-1-git-send-email-xiong.y.zhang@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Xiong Zhang Cc: intel-gfx@lists.freedesktop.org, intel-gvt-dev@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org --===============0924021956== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="kuc5slqmv2d2rxw3" Content-Disposition: inline --kuc5slqmv2d2rxw3 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2017.03.24 18:23:44 +0800, Xiong Zhang wrote: > commit "04a68a3 drm/i915/gvt: Disable access to stolen memory as a guest" > isn't enough in GVT-d which will pass through IGD to guest and don't run > vgt code. While intel_vgpu_active() is true only when vgt code run on > host and guest in GVT-g. >=20 > v2:GVT-g may run in non qemu (Zhenyu) >=20 > Signed-off-by: Xiong Zhang > --- > drivers/gpu/drm/i915/i915_drv.c | 1 + > drivers/gpu/drm/i915/i915_drv.h | 1 + > drivers/gpu/drm/i915/i915_gem_stolen.c | 4 ++-- > 3 files changed, 4 insertions(+), 2 deletions(-) >=20 > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_= drv.c > index 03d9e45..8b807a9 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -223,6 +223,7 @@ static void intel_detect_pch(struct drm_i915_private = *dev_priv) > PCI_SUBVENDOR_ID_REDHAT_QUMRANET && > pch->subsystem_device =3D=3D > PCI_SUBDEVICE_ID_QEMU)) { > + dev_priv->run_on_qemu =3D true; > dev_priv->pch_type =3D > intel_virt_detect_pch(dev_priv); > } else > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_= drv.h > index a5947a4..ad95c87 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -2145,6 +2145,7 @@ struct drm_i915_private { > struct intel_uncore uncore; > =20 > struct i915_virtual_gpu vgpu; > + bool run_on_qemu; > =20 > struct intel_gvt *gvt; > =20 > diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i91= 5/i915_gem_stolen.c > index f3abdc2..6a011b0 100644 > --- a/drivers/gpu/drm/i915/i915_gem_stolen.c > +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c > @@ -409,8 +409,8 @@ int i915_gem_init_stolen(struct drm_i915_private *dev= _priv) > =20 > mutex_init(&dev_priv->mm.stolen_lock); > =20 > - if (intel_vgpu_active(dev_priv)) { > - DRM_INFO("iGVT-g active, disabling use of stolen memory\n"); > + if (dev_priv->run_on_qemu || intel_vgpu_active(dev_priv)) { > + DRM_INFO("Running in guest, disabling use of stolen memory\n"); > return 0; > } > =20 > --=20 Reviewed-by: Zhenyu Wang --=20 Open Source Technology Center, Intel ltd. $gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827 --kuc5slqmv2d2rxw3 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iEYEARECAAYFAljYdzYACgkQsQQaM014GCc4FACeM9vUlX8GD8hDK1oqzoG7DFur lSwAn2b3ARTdV5TrAZKEe6ySDUorzbJl =2n54 -----END PGP SIGNATURE----- --kuc5slqmv2d2rxw3-- --===============0924021956== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== --===============0924021956==--