From mboxrd@z Thu Jan 1 00:00:00 1970 From: Zhenyu Wang Subject: Re: [PATCH v2] drm/i915: Move vgpu balloon info into i915_virtual_gpu struct Date: Wed, 28 Aug 2019 14:06:59 +0800 Message-ID: <20190828060659.GA4868@zhen-hp.sh.intel.com> References: <1566279978-9659-2-git-send-email-xiong.y.zhang@intel.com> <1566357790-5003-1-git-send-email-xiong.y.zhang@intel.com> Reply-To: Zhenyu Wang Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1534726268==" Return-path: In-Reply-To: <1566357790-5003-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 --===============1534726268== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="tThc/1wpZn/ma/RB" Content-Disposition: inline --tThc/1wpZn/ma/RB Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2019.08.21 11:23:10 +0800, Xiong Zhang wrote: > vgpu ballon info consists of four drm_mm_node which is used to reserve > ggtt space, then linux guest won't use these reserved ggtt space. >=20 > Each vgpu has its own ballon info, so move ballon info into > i915_virtual_gpu structure. >=20 > v2: Fix dim PARENTHESIS_ALIGNMENT check warning >=20 > Signed-off-by: Xiong Zhang > --- Looks fine to me. You need to refresh after deballoon fix merged. Reviewed-by: Zhenyu Wang > drivers/gpu/drm/i915/i915_drv.h | 14 ++++++++++++++ > drivers/gpu/drm/i915/i915_vgpu.c | 40 +++++++++++++++++-----------------= ------ > 2 files changed, 31 insertions(+), 23 deletions(-) >=20 > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_= drv.h > index 18be8b2..9c14095 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -1024,6 +1024,20 @@ struct i915_frontbuffer_tracking { > struct i915_virtual_gpu { > bool active; > u32 caps; > + > + struct balloon_info { > + /* > + * There are up to 2 regions per mappable/unmappable graphic > + * memory that might be ballooned. Here, index 0/1 is for > + * mappable graphic memory, 2/3 for unmappable graphic memory. > + */ > +#define VGPU_MAPPABLE_BALLOON_LOW 0 > +#define VGPU_MAPPABLE_BALLOON_HIGH 1 > +#define VGPU_UNMAPPABLE_BALLOON_LOW 2 > +#define VGPU_UNMAPPABLE_BALLOON_HIGH 3 > +#define VGPU_MAX_BALLOON_NUM 4 > + struct drm_mm_node space[VGPU_MAX_BALLOON_NUM]; > + } bl_info; > }; > =20 > /* used in computing the new watermarks state */ > diff --git a/drivers/gpu/drm/i915/i915_vgpu.c b/drivers/gpu/drm/i915/i915= _vgpu.c > index d2fd66f..0ed35f4 100644 > --- a/drivers/gpu/drm/i915/i915_vgpu.c > +++ b/drivers/gpu/drm/i915/i915_vgpu.c > @@ -105,17 +105,6 @@ bool intel_vgpu_has_full_ppgtt(struct drm_i915_priva= te *dev_priv) > return dev_priv->vgpu.caps & VGT_CAPS_FULL_PPGTT; > } > =20 > -struct _balloon_info_ { > - /* > - * There are up to 2 regions per mappable/unmappable graphic > - * memory that might be ballooned. Here, index 0/1 is for mappable > - * graphic memory, 2/3 for unmappable graphic memory. > - */ > - struct drm_mm_node space[4]; > -}; > - > -static struct _balloon_info_ bl_info; > - > static void vgt_deballoon_space(struct i915_ggtt *ggtt, > struct drm_mm_node *node) > { > @@ -140,15 +129,16 @@ static void vgt_deballoon_space(struct i915_ggtt *g= gtt, > */ > void intel_vgt_deballoon(struct i915_ggtt *ggtt) > { > + struct drm_i915_private *dev_priv =3D ggtt->vm.i915; > int i; > =20 > - if (!intel_vgpu_active(ggtt->vm.i915)) > + if (!intel_vgpu_active(dev_priv)) > return; > =20 > DRM_DEBUG("VGT deballoon.\n"); > =20 > - for (i =3D 0; i < 4; i++) > - vgt_deballoon_space(ggtt, &bl_info.space[i]); > + for (i =3D 0; i < VGPU_MAX_BALLOON_NUM; i++) > + vgt_deballoon_space(ggtt, &dev_priv->vgpu.bl_info.space[i]); > } > =20 > static int vgt_balloon_space(struct i915_ggtt *ggtt, > @@ -219,6 +209,7 @@ static int vgt_balloon_space(struct i915_ggtt *ggtt, > int intel_vgt_balloon(struct i915_ggtt *ggtt) > { > struct intel_uncore *uncore =3D &ggtt->vm.i915->uncore; > + struct drm_mm_node *space; > unsigned long ggtt_end =3D ggtt->vm.total; > =20 > unsigned long mappable_base, mappable_size, mappable_end; > @@ -253,9 +244,11 @@ int intel_vgt_balloon(struct i915_ggtt *ggtt) > return -EINVAL; > } > =20 > + space =3D ggtt->vm.i915->vgpu.bl_info.space; > /* Unmappable graphic memory ballooning */ > if (unmappable_base > ggtt->mappable_end) { > - ret =3D vgt_balloon_space(ggtt, &bl_info.space[2], > + ret =3D vgt_balloon_space(ggtt, > + &space[VGPU_UNMAPPABLE_BALLOON_LOW], > ggtt->mappable_end, unmappable_base); > =20 > if (ret) > @@ -263,7 +256,8 @@ int intel_vgt_balloon(struct i915_ggtt *ggtt) > } > =20 > if (unmappable_end < ggtt_end) { > - ret =3D vgt_balloon_space(ggtt, &bl_info.space[3], > + ret =3D vgt_balloon_space(ggtt, > + &space[VGPU_UNMAPPABLE_BALLOON_HIGH], > unmappable_end, ggtt_end); > if (ret) > goto err_upon_mappable; > @@ -271,17 +265,17 @@ int intel_vgt_balloon(struct i915_ggtt *ggtt) > =20 > /* Mappable graphic memory ballooning */ > if (mappable_base) { > - ret =3D vgt_balloon_space(ggtt, &bl_info.space[0], > + ret =3D vgt_balloon_space(ggtt, > + &space[VGPU_MAPPABLE_BALLOON_LOW], > 0, mappable_base); > - > if (ret) > goto err_upon_unmappable; > } > =20 > if (mappable_end < ggtt->mappable_end) { > - ret =3D vgt_balloon_space(ggtt, &bl_info.space[1], > + ret =3D vgt_balloon_space(ggtt, > + &space[VGPU_MAPPABLE_BALLOON_HIGH], > mappable_end, ggtt->mappable_end); > - > if (ret) > goto err_below_mappable; > } > @@ -290,11 +284,11 @@ int intel_vgt_balloon(struct i915_ggtt *ggtt) > return 0; > =20 > err_below_mappable: > - vgt_deballoon_space(ggtt, &bl_info.space[0]); > + vgt_deballoon_space(ggtt, &space[VGPU_MAPPABLE_BALLOON_LOW]); > err_upon_unmappable: > - vgt_deballoon_space(ggtt, &bl_info.space[3]); > + vgt_deballoon_space(ggtt, &space[VGPU_UNMAPPABLE_BALLOON_HIGH]); > err_upon_mappable: > - vgt_deballoon_space(ggtt, &bl_info.space[2]); > + vgt_deballoon_space(ggtt, &space[VGPU_UNMAPPABLE_BALLOON_LOW]); > err: > DRM_ERROR("VGT balloon fail\n"); > return ret; > --=20 > 2.7.4 >=20 > _______________________________________________ > intel-gvt-dev mailing list > intel-gvt-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gvt-dev --=20 Open Source Technology Center, Intel ltd. $gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827 --tThc/1wpZn/ma/RB Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EARECAB0WIQTXuabgHDW6LPt9CICxBBozTXgYJwUCXWYaAwAKCRCxBBozTXgY J0EeAJ0RouK01hZJND7Ax0clEh1wsclGXgCfRgD/Wlj5vlhr/t7EgXIHzYPVJww= =Bsgs -----END PGP SIGNATURE----- --tThc/1wpZn/ma/RB-- --===============1534726268== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 --===============1534726268==--