[PATCH v2] drm/xe: Use vmalloc for array of bind allocation in bind IOCTL

[Thomas Hellström]

On Mon, 2024-02-26 at 07:55 -0800, Matthew Brost wrote:
> Use vmalloc in effort to allow a user pass in a large number of binds
> in
> an IOCTL (mesa use case). Also use array allocations rather open
> coding
> the size calculation.
> 
> v2: Use __GFP_ACCOUNT for allocations (Thomas)
> 
> Fixes: dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel
> GPUs")
> Signed-off-by: Matthew Brost <matthew.brost at intel.com>

Reviewed-by: Thomas Hellström <thomas.hellstrom at linux.intel.com>

> ---
>  drivers/gpu/drm/xe/xe_vm.c | 25 ++++++++++++++-----------
>  1 file changed, 14 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
> index db3f049a47dc..4154ef75e369 100644
> --- a/drivers/gpu/drm/xe/xe_vm.c
> +++ b/drivers/gpu/drm/xe/xe_vm.c
> @@ -2770,8 +2770,9 @@ static int vm_bind_ioctl_check_args(struct
> xe_device *xe,
>  		u64 __user *bind_user =
>  			u64_to_user_ptr(args->vector_of_binds);
>  
> -		*bind_ops = kmalloc(sizeof(struct drm_xe_vm_bind_op)
> *
> -				    args->num_binds, GFP_KERNEL);
> +		*bind_ops = kvmalloc_array(args->num_binds,
> +					   sizeof(struct
> drm_xe_vm_bind_op),
> +					   GFP_KERNEL |
> __GFP_ACCOUNT);
>  		if (!*bind_ops)
>  			return -ENOMEM;
>  
> @@ -2861,7 +2862,7 @@ static int vm_bind_ioctl_check_args(struct
> xe_device *xe,
>  
>  free_bind_ops:
>  	if (args->num_binds > 1)
> -		kfree(*bind_ops);
> +		kvfree(*bind_ops);
>  	return err;
>  }
>  
> @@ -2949,13 +2950,15 @@ int xe_vm_bind_ioctl(struct drm_device *dev,
> void *data, struct drm_file *file)
>  	}
>  
>  	if (args->num_binds) {
> -		bos = kcalloc(args->num_binds, sizeof(*bos),
> GFP_KERNEL);
> +		bos = kvcalloc(args->num_binds, sizeof(*bos),
> +			       GFP_KERNEL | __GFP_ACCOUNT);
>  		if (!bos) {
>  			err = -ENOMEM;
>  			goto release_vm_lock;
>  		}
>  
> -		ops = kcalloc(args->num_binds, sizeof(*ops),
> GFP_KERNEL);
> +		ops = kvcalloc(args->num_binds, sizeof(*ops),
> +			       GFP_KERNEL | __GFP_ACCOUNT);
>  		if (!ops) {
>  			err = -ENOMEM;
>  			goto release_vm_lock;
> @@ -3096,10 +3099,10 @@ int xe_vm_bind_ioctl(struct drm_device *dev,
> void *data, struct drm_file *file)
>  	for (i = 0; bos && i < args->num_binds; ++i)
>  		xe_bo_put(bos[i]);
>  
> -	kfree(bos);
> -	kfree(ops);
> +	kvfree(bos);
> +	kvfree(ops);
>  	if (args->num_binds > 1)
> -		kfree(bind_ops);
> +		kvfree(bind_ops);
>  
>  	return err;
>  
> @@ -3123,10 +3126,10 @@ int xe_vm_bind_ioctl(struct drm_device *dev,
> void *data, struct drm_file *file)
>  	if (q)
>  		xe_exec_queue_put(q);
>  free_objs:
> -	kfree(bos);
> -	kfree(ops);
> +	kvfree(bos);
> +	kvfree(ops);
>  	if (args->num_binds > 1)
> -		kfree(bind_ops);
> +		kvfree(bind_ops);
>  	return err;
>  }
>