Re: [Intel-xe] [PATCH] drm/xe: Rely on kmalloc/kzalloc log message

[Rodrigo Vivi <rodrigo.vivi@intel.com>]

On Wed, Jul 19, 2023 at 01:20:59PM +0000, Francois Dugast wrote:
> Those messages are unnecessary because a generic message is already
> produced in case of allocation failure. Besides, this also removes a
> misuse of the XE_IOCTL_DBG macro.

this could be 2 separated patches, but anyway:

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

> 
> Signed-off-by: Francois Dugast <francois.dugast@intel.com>
> ---
>  drivers/gpu/drm/xe/xe_gt_debugfs.c  | 1 -
>  drivers/gpu/drm/xe/xe_guc_debugfs.c | 1 -
>  drivers/gpu/drm/xe/xe_huc_debugfs.c | 1 -
>  drivers/gpu/drm/xe/xe_query.c       | 8 ++++----
>  4 files changed, 4 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_gt_debugfs.c b/drivers/gpu/drm/xe/xe_gt_debugfs.c
> index f9f653243f20..30a031356b4e 100644
> --- a/drivers/gpu/drm/xe/xe_gt_debugfs.c
> +++ b/drivers/gpu/drm/xe/xe_gt_debugfs.c
> @@ -174,7 +174,6 @@ void xe_gt_debugfs_register(struct xe_gt *gt)
>  #define DEBUGFS_SIZE	(ARRAY_SIZE(debugfs_list) * sizeof(struct drm_info_list))
>  	local = drmm_kmalloc(&gt_to_xe(gt)->drm, DEBUGFS_SIZE, GFP_KERNEL);
>  	if (!local) {
> -		XE_WARN_ON("Couldn't allocate memory");
>  		return;
>  	}
>  
> diff --git a/drivers/gpu/drm/xe/xe_guc_debugfs.c b/drivers/gpu/drm/xe/xe_guc_debugfs.c
> index 0178b1a2d367..069afb52343c 100644
> --- a/drivers/gpu/drm/xe/xe_guc_debugfs.c
> +++ b/drivers/gpu/drm/xe/xe_guc_debugfs.c
> @@ -90,7 +90,6 @@ void xe_guc_debugfs_register(struct xe_guc *guc, struct dentry *parent)
>  #define DEBUGFS_SIZE	(ARRAY_SIZE(debugfs_list) * sizeof(struct drm_info_list))
>  	local = drmm_kmalloc(&guc_to_xe(guc)->drm, DEBUGFS_SIZE, GFP_KERNEL);
>  	if (!local) {
> -		XE_WARN_ON("Couldn't allocate memory");
>  		return;
>  	}
>  
> diff --git a/drivers/gpu/drm/xe/xe_huc_debugfs.c b/drivers/gpu/drm/xe/xe_huc_debugfs.c
> index ae3c21315d59..9478edc4c39a 100644
> --- a/drivers/gpu/drm/xe/xe_huc_debugfs.c
> +++ b/drivers/gpu/drm/xe/xe_huc_debugfs.c
> @@ -56,7 +56,6 @@ void xe_huc_debugfs_register(struct xe_huc *huc, struct dentry *parent)
>  #define DEBUGFS_SIZE	(ARRAY_SIZE(debugfs_list) * sizeof(struct drm_info_list))
>  	local = drmm_kmalloc(&huc_to_xe(huc)->drm, DEBUGFS_SIZE, GFP_KERNEL);
>  	if (!local) {
> -		XE_WARN_ON("Couldn't allocate memory");
>  		return;
>  	}
>  
> diff --git a/drivers/gpu/drm/xe/xe_query.c b/drivers/gpu/drm/xe/xe_query.c
> index 4b7869596ba8..f880c9af1651 100644
> --- a/drivers/gpu/drm/xe/xe_query.c
> +++ b/drivers/gpu/drm/xe/xe_query.c
> @@ -65,7 +65,7 @@ static int query_engines(struct xe_device *xe,
>  	}
>  
>  	hw_engine_info = kmalloc(size, GFP_KERNEL);
> -	if (XE_IOCTL_DBG(xe, !hw_engine_info))
> +	if (!hw_engine_info)
>  		return -ENOMEM;
>  
>  	for_each_gt(gt, xe, gt_id)
> @@ -182,7 +182,7 @@ static int query_config(struct xe_device *xe, struct drm_xe_device_query *query)
>  	}
>  
>  	config = kzalloc(size, GFP_KERNEL);
> -	if (XE_IOCTL_DBG(xe, !config))
> +	if (!config)
>  		return -ENOMEM;
>  
>  	config->num_params = num_params;
> @@ -231,7 +231,7 @@ static int query_gts(struct xe_device *xe, struct drm_xe_device_query *query)
>  	}
>  
>  	gts = kzalloc(size, GFP_KERNEL);
> -	if (XE_IOCTL_DBG(xe, !gts))
> +	if (!gts)
>  		return -ENOMEM;
>  
>  	gts->num_gt = xe->info.gt_count;
> @@ -278,7 +278,7 @@ static int query_hwconfig(struct xe_device *xe,
>  	}
>  
>  	hwconfig = kzalloc(size, GFP_KERNEL);
> -	if (XE_IOCTL_DBG(xe, !hwconfig))
> +	if (!hwconfig)
>  		return -ENOMEM;
>  
>  	xe_device_mem_access_get(xe);
> -- 
> 2.34.1
>