[PATCH] drm/amdgpu: don't map BO in reserved region

Christian König christian.koenig at amd.com
Fri Oct 16 12:35:17 UTC 2020


Am 16.10.20 um 14:33 schrieb Madhav Chauhan:
> 2MB area is reserved at top inside VM.
>
> Suggested-by: Christian König <christian.koenig at amd.com>
> Signed-off-by: Madhav Chauhan <madhav.chauhan at amd.com>

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 10 ++++++++++
>   1 file changed, 10 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> index 5047989fe941..5b50860eece4 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> @@ -596,6 +596,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,
>   	struct ww_acquire_ctx ticket;
>   	struct list_head list, duplicates;
>   	uint64_t va_flags;
> +	uint64_t vm_size;
>   	int r = 0;
>   
>   	if (args->va_address < AMDGPU_VA_RESERVED_SIZE) {
> @@ -616,6 +617,15 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,
>   
>   	args->va_address &= AMDGPU_GMC_HOLE_MASK;
>   
> +	vm_size = adev->vm_manager.max_pfn * AMDGPU_GPU_PAGE_SIZE;
> +	vm_size -= AMDGPU_VA_RESERVED_SIZE;
> +	if (args->va_address + args->map_size > vm_size) {
> +		dev_dbg(&dev->pdev->dev,
> +			"va_address 0x%llx is in top reserved area 0x%llx\n",
> +			args->va_address + args->map_size, vm_size);
> +		return -EINVAL;
> +	}
> +
>   	if ((args->flags & ~valid_flags) && (args->flags & ~prt_flags)) {
>   		dev_dbg(&dev->pdev->dev, "invalid flags combination 0x%08X\n",
>   			args->flags);



More information about the amd-gfx mailing list