Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1277273 > unrolled thread

[PATCH v3 2/5] arcmsr: fixes not release allocated resource

Started byChing Huang <ching2048@areca.com.tw>
First post2015-11-25 12:50 +0100
Last post2015-11-26 14:10 +0100
Articles 6 — 4 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH v3 2/5] arcmsr: fixes not release allocated resource Ching Huang <ching2048@areca.com.tw> - 2015-11-25 12:50 +0100
    Re: [PATCH v3 2/5] arcmsr: fixes not release allocated resource Hannes Reinecke <hare@suse.de> - 2015-11-25 13:10 +0100
    Re: [PATCH v3 2/5] arcmsr: fixes not release allocated resource Johannes Thumshirn <jthumshirn@suse.de> - 2015-11-25 13:10 +0100
    Re: [PATCH v3 2/5] arcmsr: fixes not release allocated resource Tomas Henzl <thenzl@redhat.com> - 2015-11-25 15:00 +0100
      Re: [PATCH v3 2/5] arcmsr: fixes not release allocated resource Ching Huang <ching2048@areca.com.tw> - 2015-11-26 08:40 +0100
        Re: [PATCH v3 2/5] arcmsr: fixes not release allocated resource Tomas Henzl <thenzl@redhat.com> - 2015-11-26 14:10 +0100

#1277273 — [PATCH v3 2/5] arcmsr: fixes not release allocated resource

FromChing Huang <ching2048@areca.com.tw>
Date2015-11-25 12:50 +0100
Subject[PATCH v3 2/5] arcmsr: fixes not release allocated resource
Message-ID<qyGKd-5Jh-15@gated-at.bofh.it>
From: Ching Huang <ching2048@areca.com.tw>

Releasing allocated resource if get configuration data failed.

Signed-of-by: Ching Huang <ching2048@areca.com.tw>

---

diff -uprN a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
--- a/drivers/scsi/arcmsr/arcmsr_hba.c	2015-11-24 11:35:26.000000000 +0800
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c	2015-11-25 19:04:44.590970000 +0800
@@ -2664,7 +2664,7 @@ static bool arcmsr_hbaB_get_config(struc
 	if (!arcmsr_hbaB_wait_msgint_ready(acb)) {
 		printk(KERN_NOTICE "arcmsr%d: wait 'get adapter firmware \
 			miscellaneous data' timeout \n", acb->host->host_no);
-		return false;
+		goto err_free_dma;
 	}
 	count = 8;
 	while (count){
@@ -2707,6 +2707,10 @@ static bool arcmsr_hbaB_get_config(struc
 	acb->firm_cfg_version = readl(&reg->message_rwbuffer[25]);  /*firm_cfg_version,25,100-103*/
 	/*firm_ide_channels,4,16-19*/
 	return true;
+err_free_dma:
+	dma_free_coherent(&acb->pdev->dev, acb->roundup_ccbsize,
+			acb->dma_coherent2, acb->dma_coherent_handle2);
+	return false;
 }
 
 static bool arcmsr_hbaC_get_config(struct AdapterControlBlock *pACB)


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]


#1277296

FromHannes Reinecke <hare@suse.de>
Date2015-11-25 13:10 +0100
Message-ID<qyH3A-67h-33@gated-at.bofh.it>
In reply to#1277273
On 11/25/2015 12:41 PM, Ching Huang wrote:
> From: Ching Huang <ching2048@areca.com.tw>
> 
> Releasing allocated resource if get configuration data failed.
> 
> Signed-of-by: Ching Huang <ching2048@areca.com.tw>
> 
> ---
> 
> diff -uprN a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
> --- a/drivers/scsi/arcmsr/arcmsr_hba.c	2015-11-24 11:35:26.000000000 +0800
> +++ b/drivers/scsi/arcmsr/arcmsr_hba.c	2015-11-25 19:04:44.590970000 +0800
> @@ -2664,7 +2664,7 @@ static bool arcmsr_hbaB_get_config(struc
>  	if (!arcmsr_hbaB_wait_msgint_ready(acb)) {
>  		printk(KERN_NOTICE "arcmsr%d: wait 'get adapter firmware \
>  			miscellaneous data' timeout \n", acb->host->host_no);
> -		return false;
> +		goto err_free_dma;
>  	}
>  	count = 8;
>  	while (count){
> @@ -2707,6 +2707,10 @@ static bool arcmsr_hbaB_get_config(struc
>  	acb->firm_cfg_version = readl(&reg->message_rwbuffer[25]);  /*firm_cfg_version,25,100-103*/
>  	/*firm_ide_channels,4,16-19*/
>  	return true;
> +err_free_dma:
> +	dma_free_coherent(&acb->pdev->dev, acb->roundup_ccbsize,
> +			acb->dma_coherent2, acb->dma_coherent_handle2);
> +	return false;
>  }
>  
>  static bool arcmsr_hbaC_get_config(struct AdapterControlBlock *pACB)
> 
> 
Reviewed-by: Hannes Reinecke <hare@suse.com>

Cheers,

Hannes
-- 
Dr. Hannes Reinecke		               zSeries & Storage
hare@suse.de			               +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1277299

FromJohannes Thumshirn <jthumshirn@suse.de>
Date2015-11-25 13:10 +0100
Message-ID<qyH3B-67h-43@gated-at.bofh.it>
In reply to#1277273
On Wed, 2015-11-25 at 19:41 +0800, Ching Huang wrote:
> From: Ching Huang <ching2048@areca.com.tw>
> 
> Releasing allocated resource if get configuration data failed.
> 
> Signed-of-by: Ching Huang <ching2048@areca.com.tw>
> 
> ---
> 
> diff -uprN a/drivers/scsi/arcmsr/arcmsr_hba.c
> b/drivers/scsi/arcmsr/arcmsr_hba.c
> --- a/drivers/scsi/arcmsr/arcmsr_hba.c	2015-11-24 11:35:26.000000000
> +0800
> +++ b/drivers/scsi/arcmsr/arcmsr_hba.c	2015-11-25 19:04:44.590970000
> +0800
> @@ -2664,7 +2664,7 @@ static bool arcmsr_hbaB_get_config(struc
>  	if (!arcmsr_hbaB_wait_msgint_ready(acb)) {
>  		printk(KERN_NOTICE "arcmsr%d: wait 'get adapter firmware \
>  			miscellaneous data' timeout \n", acb->host-
> >host_no);
> -		return false;
> +		goto err_free_dma;
>  	}
>  	count = 8;
>  	while (count){
> @@ -2707,6 +2707,10 @@ static bool arcmsr_hbaB_get_config(struc
>  	acb->firm_cfg_version = readl(&reg-
> >message_rwbuffer[25]);  /*firm_cfg_version,25,100-103*/
>  	/*firm_ide_channels,4,16-19*/
>  	return true;
> +err_free_dma:
> +	dma_free_coherent(&acb->pdev->dev, acb->roundup_ccbsize,
> +			acb->dma_coherent2, acb->dma_coherent_handle2);
> +	return false;
>  }
>  
>  static bool arcmsr_hbaC_get_config(struct AdapterControlBlock *pACB)
> 
> 

Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1277407

FromTomas Henzl <thenzl@redhat.com>
Date2015-11-25 15:00 +0100
Message-ID<qyIM2-71G-17@gated-at.bofh.it>
In reply to#1277273
On 25.11.2015 12:41, Ching Huang wrote:
> From: Ching Huang <ching2048@areca.com.tw>
>
> Releasing allocated resource if get configuration data failed.
>
> Signed-of-by: Ching Huang <ching2048@areca.com.tw>
>
> ---
>
> diff -uprN a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
> --- a/drivers/scsi/arcmsr/arcmsr_hba.c	2015-11-24 11:35:26.000000000 +0800
> +++ b/drivers/scsi/arcmsr/arcmsr_hba.c	2015-11-25 19:04:44.590970000 +0800
> @@ -2664,7 +2664,7 @@ static bool arcmsr_hbaB_get_config(struc
>  	if (!arcmsr_hbaB_wait_msgint_ready(acb)) {
>  		printk(KERN_NOTICE "arcmsr%d: wait 'get adapter firmware \
>  			miscellaneous data' timeout \n", acb->host->host_no);
> -		return false;
> +		goto err_free_dma;
>  	}
>  	count = 8;
>  	while (count){
> @@ -2707,6 +2707,10 @@ static bool arcmsr_hbaB_get_config(struc
>  	acb->firm_cfg_version = readl(&reg->message_rwbuffer[25]);  /*firm_cfg_version,25,100-103*/
>  	/*firm_ide_channels,4,16-19*/
>  	return true;
> +err_free_dma:
> +	dma_free_coherent(&acb->pdev->dev, acb->roundup_ccbsize,
> +			acb->dma_coherent2, acb->dma_coherent_handle2);
> +	return false;
>  }
>  

The resource should be released here, that is okay. 

How works the resource management when the eh_bus_reset_handler
is called ? It looks to me that you allocate a new 
acb->dma_coherent2 without releasing it before.
Btw. is it needed in that handler to re-read the firmware-spec?

Tomas

>  static bool arcmsr_hbaC_get_config(struct AdapterControlBlock *pACB)
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1278023

FromChing Huang <ching2048@areca.com.tw>
Date2015-11-26 08:40 +0100
Message-ID<qyZjP-1Od-3@gated-at.bofh.it>
In reply to#1277407
On Wed, 2015-11-25 at 14:55 +0100, Tomas Henzl wrote:
> On 25.11.2015 12:41, Ching Huang wrote:
> > From: Ching Huang <ching2048@areca.com.tw>
> >
> > Releasing allocated resource if get configuration data failed.
> >
> > Signed-of-by: Ching Huang <ching2048@areca.com.tw>
> >
> > ---
> >
> > diff -uprN a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
> > --- a/drivers/scsi/arcmsr/arcmsr_hba.c	2015-11-24 11:35:26.000000000 +0800
> > +++ b/drivers/scsi/arcmsr/arcmsr_hba.c	2015-11-25 19:04:44.590970000 +0800
> > @@ -2664,7 +2664,7 @@ static bool arcmsr_hbaB_get_config(struc
> >  	if (!arcmsr_hbaB_wait_msgint_ready(acb)) {
> >  		printk(KERN_NOTICE "arcmsr%d: wait 'get adapter firmware \
> >  			miscellaneous data' timeout \n", acb->host->host_no);
> > -		return false;
> > +		goto err_free_dma;
> >  	}
> >  	count = 8;
> >  	while (count){
> > @@ -2707,6 +2707,10 @@ static bool arcmsr_hbaB_get_config(struc
> >  	acb->firm_cfg_version = readl(&reg->message_rwbuffer[25]);  /*firm_cfg_version,25,100-103*/
> >  	/*firm_ide_channels,4,16-19*/
> >  	return true;
> > +err_free_dma:
> > +	dma_free_coherent(&acb->pdev->dev, acb->roundup_ccbsize,
> > +			acb->dma_coherent2, acb->dma_coherent_handle2);
> > +	return false;
> >  }
> >  
> 
> The resource should be released here, that is okay. 
> 
> How works the resource management when the eh_bus_reset_handler
> is called ? It looks to me that you allocate a new 
> acb->dma_coherent2 without releasing it before.
> Btw. is it needed in that handler to re-read the firmware-spec?
> 
> Tomas
> 
You are right. In eh_bus_reset_handler, there may re-allocate a new dma resource if call get_config again.
I will initiate a new patches for this bug after current 5 patches.
Thanks Tomas.
> >  static bool arcmsr_hbaC_get_config(struct AdapterControlBlock *pACB)
> >
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1278201

FromTomas Henzl <thenzl@redhat.com>
Date2015-11-26 14:10 +0100
Message-ID<qz4tc-5zb-5@gated-at.bofh.it>
In reply to#1278023
On 26.11.2015 08:32, Ching Huang wrote:
> On Wed, 2015-11-25 at 14:55 +0100, Tomas Henzl wrote:
>> On 25.11.2015 12:41, Ching Huang wrote:
>>> From: Ching Huang <ching2048@areca.com.tw>
>>>
>>> Releasing allocated resource if get configuration data failed.
>>>
>>> Signed-of-by: Ching Huang <ching2048@areca.com.tw>
>>>
>>> ---
>>>
>>> diff -uprN a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
>>> --- a/drivers/scsi/arcmsr/arcmsr_hba.c	2015-11-24 11:35:26.000000000 +0800
>>> +++ b/drivers/scsi/arcmsr/arcmsr_hba.c	2015-11-25 19:04:44.590970000 +0800
>>> @@ -2664,7 +2664,7 @@ static bool arcmsr_hbaB_get_config(struc
>>>  	if (!arcmsr_hbaB_wait_msgint_ready(acb)) {
>>>  		printk(KERN_NOTICE "arcmsr%d: wait 'get adapter firmware \
>>>  			miscellaneous data' timeout \n", acb->host->host_no);
>>> -		return false;
>>> +		goto err_free_dma;
>>>  	}
>>>  	count = 8;
>>>  	while (count){
>>> @@ -2707,6 +2707,10 @@ static bool arcmsr_hbaB_get_config(struc
>>>  	acb->firm_cfg_version = readl(&reg->message_rwbuffer[25]);  /*firm_cfg_version,25,100-103*/
>>>  	/*firm_ide_channels,4,16-19*/
>>>  	return true;
>>> +err_free_dma:
>>> +	dma_free_coherent(&acb->pdev->dev, acb->roundup_ccbsize,
>>> +			acb->dma_coherent2, acb->dma_coherent_handle2);
>>> +	return false;
>>>  }
>>>  
>> The resource should be released here, that is okay. 
>>
>> How works the resource management when the eh_bus_reset_handler
>> is called ? It looks to me that you allocate a new 
>> acb->dma_coherent2 without releasing it before.
>> Btw. is it needed in that handler to re-read the firmware-spec?
>>
>> Tomas
>>
> You are right. In eh_bus_reset_handler, there may re-allocate a new dma resource if call get_config again.
> I will initiate a new patches for this bug after current 5 patches.
> Thanks Tomas.

ok, so for this patch -

Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Tomas

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web