Re: [PATCH 4/6] bus: fsl-mc: fsl-mc-allocator: Improve error reporting

[Nathan Chancellor <nathan@kernel.org>]

Hi Uwe,

On Fri, Mar 10, 2023 at 11:41:26PM +0100, Uwe Kleine-König wrote:
> Instead of silently returning an error in the remove callback (which yields
> a generic and little informing error message), annotate each error path of
> fsl_mc_resource_pool_remove_device() with an error message and return zero
> in the remove callback to suppress the error message.
> 
> Note that changing the return value has no other effect than suppressing
> the error message by the fsl_mc bus driver.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

I apologize if this has already been reported or fixed somewhere, I did
a search of lore.kernel.org and did not find anything. This change as
commit b3134039c5b3 ("bus: fsl-mc: fsl-mc-allocator: Improve error
reporting") causes the following warning/error with clang:

  drivers/bus/fsl-mc/fsl-mc-allocator.c:108:12: error: variable 'mc_bus_dev' is uninitialized when used here [-Werror,-Wuninitialized]
    108 |                 dev_err(&mc_bus_dev->dev, "resource mismatch\n");
        |                          ^~~~~~~~~~
  include/linux/dev_printk.h:144:44: note: expanded from macro 'dev_err'
    144 |         dev_printk_index_wrap(_dev_err, KERN_ERR, dev, dev_fmt(fmt), ##__VA_ARGS__)
        |                                                   ^~~
  include/linux/dev_printk.h:110:11: note: expanded from macro 'dev_printk_index_wrap'
    110 |                 _p_func(dev, fmt, ##__VA_ARGS__);                       \
        |                         ^~~
  drivers/bus/fsl-mc/fsl-mc-allocator.c:100:34: note: initialize the variable 'mc_bus_dev' to silence this warning
    100 |         struct fsl_mc_device *mc_bus_dev;
        |                                         ^
        |                                          = NULL
  1 error generated.

Should this be using mc_dev->dev or is there a different fix?

diff --git a/drivers/bus/fsl-mc/fsl-mc-allocator.c b/drivers/bus/fsl-mc/fsl-mc-allocator.c
index 0ad68099684e..867ac3bbeae6 100644
--- a/drivers/bus/fsl-mc/fsl-mc-allocator.c
+++ b/drivers/bus/fsl-mc/fsl-mc-allocator.c
@@ -105,7 +105,7 @@ static int __must_check fsl_mc_resource_pool_remove_device(struct fsl_mc_device
 
 	resource = mc_dev->resource;
 	if (!resource || resource->data != mc_dev) {
-		dev_err(&mc_bus_dev->dev, "resource mismatch\n");
+		dev_err(&mc_dev->dev, "resource mismatch\n");
 		goto out;
 	}
 

Cheers,
Nathan

> ---
>  drivers/bus/fsl-mc/fsl-mc-allocator.c | 18 +++++++++++++-----
>  1 file changed, 13 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/bus/fsl-mc/fsl-mc-allocator.c b/drivers/bus/fsl-mc/fsl-mc-allocator.c
> index e60faf8edaa1..36f70e5e418b 100644
> --- a/drivers/bus/fsl-mc/fsl-mc-allocator.c
> +++ b/drivers/bus/fsl-mc/fsl-mc-allocator.c
> @@ -104,22 +104,30 @@ static int __must_check fsl_mc_resource_pool_remove_device(struct fsl_mc_device
>  	int error = -EINVAL;
>  
>  	resource = mc_dev->resource;
> -	if (!resource || resource->data != mc_dev)
> +	if (!resource || resource->data != mc_dev) {
> +		dev_err(&mc_bus_dev->dev, "resource mismatch\n");
>  		goto out;
> +	}
>  
>  	mc_bus_dev = to_fsl_mc_device(mc_dev->dev.parent);
>  	mc_bus = to_fsl_mc_bus(mc_bus_dev);
>  	res_pool = resource->parent_pool;
> -	if (res_pool != &mc_bus->resource_pools[resource->type])
> +	if (res_pool != &mc_bus->resource_pools[resource->type]) {
> +		dev_err(&mc_bus_dev->dev, "pool mismatch\n");
>  		goto out;
> +	}
>  
>  	mutex_lock(&res_pool->mutex);
>  
> -	if (res_pool->max_count <= 0)
> +	if (res_pool->max_count <= 0) {
> +		dev_err(&mc_bus_dev->dev, "max_count underflow\n");
>  		goto out_unlock;
> +	}
>  	if (res_pool->free_count <= 0 ||
> -	    res_pool->free_count > res_pool->max_count)
> +	    res_pool->free_count > res_pool->max_count) {
> +		dev_err(&mc_bus_dev->dev, "free_count mismatch\n");
>  		goto out_unlock;
> +	}
>  
>  	/*
>  	 * If the device is currently allocated, its resource is not
> @@ -613,7 +621,7 @@ static int fsl_mc_allocator_remove(struct fsl_mc_device *mc_dev)
>  	if (mc_dev->resource) {
>  		error = fsl_mc_resource_pool_remove_device(mc_dev);
>  		if (error < 0)
> -			return error;
> +			return 0;
>  	}
>  
>  	dev_dbg(&mc_dev->dev,
> -- 
> 2.39.1
>