[PATCH 1/4] drm/i915/gvt: refine ggtt range validation

[Zhenyu Wang]

On 2019.05.27 13:45:50 +0800, Xiong Zhang wrote:
> The vgpu ggtt range should be in vgpu aperture or hidden range. This
> patch enforce begin and end address check and guarantee both of them are
> in the valid range.
> 
> For size=0, it will regress to vgpu_gmadr_is_valid(), will refine
> this usage in a later fix.
> 
> Fixes: 2707e4446688 ("drm/i915/gvt: vGPU graphics memory virtualization")
> Signed-off-by: Xiong Zhang <xiong.y.zhang at intel.com>
> ---

Ack for this series.

Reviewed-by: Zhenyu Wang <zhenyuw at linux.intel.com>

>  drivers/gpu/drm/i915/gvt/gtt.c | 20 +++++++++++++-------
>  1 file changed, 13 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c
> index f3a75bb..d767c45 100644
> --- a/drivers/gpu/drm/i915/gvt/gtt.c
> +++ b/drivers/gpu/drm/i915/gvt/gtt.c
> @@ -53,13 +53,19 @@ static int preallocated_oos_pages = 8192;
>   */
>  bool intel_gvt_ggtt_validate_range(struct intel_vgpu *vgpu, u64 addr, u32 size)
>  {
> -	if ((!vgpu_gmadr_is_valid(vgpu, addr)) || (size
> -			&& !vgpu_gmadr_is_valid(vgpu, addr + size - 1))) {
> -		gvt_vgpu_err("invalid range gmadr 0x%llx size 0x%x\n",
> -				addr, size);
> -		return false;
> -	}
> -	return true;
> +	if (size == 0)
> +		return vgpu_gmadr_is_valid(vgpu, addr);
> +
> +	if (vgpu_gmadr_is_aperture(vgpu, addr) &&
> +	    vgpu_gmadr_is_aperture(vgpu, addr + size - 1))
> +		return true;
> +	else if (vgpu_gmadr_is_hidden(vgpu, addr) &&
> +		 vgpu_gmadr_is_hidden(vgpu, addr + size - 1))
> +		return true;
> +
> +	gvt_dbg_mm("Invalid ggtt range at 0x%llx, size: 0x%x\n",
> +		     addr, size);
> +	return false;
>  }
>  
>  /* translate a guest gmadr to host gmadr */
> -- 
> 2.7.4
> 
> _______________________________________________
> intel-gvt-dev mailing list
> intel-gvt-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gvt-dev

-- 
Open Source Technology Center, Intel ltd.

$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/intel-gvt-dev/attachments/20190528/a5dda89d/attachment.sig>