Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Message-ID: <b883059e51c97d34196a1ad15bbec66a89283c8e.camel@pengutronix.de>
Subject: Re: [Re-send][PATCH] gpu/ipu-v3:reduce protected code area in ipu
 idmac get/put
From:   Philipp Zabel <p.zabel@pengutronix.de>
To:     Bernard <bernard@vivo.com>, dri-devel@lists.freedesktop.org,
        linux-kernel@vger.kernel.org
Cc:     opensource.kernel@vivo.com
Date:   Mon, 21 Sep 2020 16:15:01 +0200
In-Reply-To: <AN*ApwBwDVasgemZb6*hx4qM.1.1600686717774.Hmail.bernard@vivo.com>
References: <AN*ApwBwDVasgemZb6*hx4qM.1.1600686717774.Hmail.bernard@vivo.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8BIT
User-Agent: Evolution 3.30.5-1.1 
MIME-Version: 1.0
Precedence: bulk

Hi Bernard,

On Mon, 2020-09-21 at 19:11 +0800, Bernard wrote:
> This change will speed-up a bit these ipu_idmac_get &
> ipu_idmac_put processing and there is no need to protect
> kzalloc & kfree.

I don't think that will be measurable, the channel lock is very unlikely
to be contended. It might make more sense to replace the list walk with
a bitfield.

> Signed-off-by: Bernard Zhao <bernard@vivo.com>
> ---
>  drivers/gpu/ipu-v3/ipu-common.c | 24 +++++++++++++-----------
>  1 file changed, 13 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/gpu/ipu-v3/ipu-common.c b/drivers/gpu/ipu-v3/ipu-common.c
> index b3dae9ec1a38..8b3a57864c2e 100644
> --- a/drivers/gpu/ipu-v3/ipu-common.c
> +++ b/drivers/gpu/ipu-v3/ipu-common.c
> @@ -267,29 +267,30 @@ EXPORT_SYMBOL_GPL(ipu_rot_mode_to_degrees);
>  struct ipuv3_channel *ipu_idmac_get(struct ipu_soc *ipu, unsigned num)
>  {
>  	struct ipuv3_channel *channel;
> +	struct ipuv3_channel *entry;
>  
>  	dev_dbg(ipu->dev, "%s %d\n", __func__, num);
>  
>  	if (num > 63)
>  		return ERR_PTR(-ENODEV);
>  
> +	channel = kzalloc(sizeof(*channel), GFP_KERNEL);
> +	if (!channel)
> +		return ERR_PTR(-ENOMEM);
> +
> +	channel->num = num;
> +	channel->ipu = ipu;
> +
>  	mutex_lock(&ipu->channel_lock);
>  
> -	list_for_each_entry(channel, &ipu->channels, list) {
> -		if (channel->num == num) {
> +	list_for_each_entry(entry, &ipu->channels, list) {
> +		if (entry->num == num) {
> +			kfree(channel);
>  			channel = ERR_PTR(-EBUSY);
>  			goto out;

This leaks the channel memory allocated above.

>  		}
>  	}
> 
> -	channel = kzalloc(sizeof(*channel), GFP_KERNEL);
> -	if (!channel) {
> -		channel = ERR_PTR(-ENOMEM);
> -		goto out;
> -	}
> -
> -	channel->num = num;
> -	channel->ipu = ipu;
>  	list_add(&channel->list, &ipu->channels);
>  
>  out:
> @@ -308,9 +309,10 @@ void ipu_idmac_put(struct ipuv3_channel *channel)
>  	mutex_lock(&ipu->channel_lock);
>  
>  	list_del(&channel->list);
> -	kfree(channel);
>  
>  	mutex_unlock(&ipu->channel_lock);
> +
> +	kfree(channel);
>  }
>  EXPORT_SYMBOL_GPL(ipu_idmac_put);

regards
Philipp