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

Groups > linux.kernel > #1736054 > unrolled thread

[PATCH] lightnvm: pblk: fix error path in pblk_lines_alloc_metadata

Started byRakesh Pandit <rakesh@tuxera.com>
First post2017-09-20 22:00 +0200
Last post2017-09-21 13:20 +0200
Articles 4 — 3 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH] lightnvm: pblk: fix error path in pblk_lines_alloc_metadata Rakesh Pandit <rakesh@tuxera.com> - 2017-09-20 22:00 +0200
    Re: [PATCH] lightnvm: pblk: fix error path in  pblk_lines_alloc_metadata Javier González <jg@lightnvm.io> - 2017-09-21 12:00 +0200
      Re: [PATCH] lightnvm: pblk: fix error path in  pblk_lines_alloc_metadata Rakesh Pandit <rakesh@tuxera.com> - 2017-09-21 12:20 +0200
        Re: [PATCH] lightnvm: pblk: fix error path in  pblk_lines_alloc_metadata Matias Bjørling <mb@lightnvm.io> - 2017-09-21 13:20 +0200

#1736054 — [PATCH] lightnvm: pblk: fix error path in pblk_lines_alloc_metadata

FromRakesh Pandit <rakesh@tuxera.com>
Date2017-09-20 22:00 +0200
Subject[PATCH] lightnvm: pblk: fix error path in pblk_lines_alloc_metadata
Message-ID<urTk6-7sy-21@gated-at.bofh.it>
Use appropriate memory free calls based on allocation type used and
also fix number of times free is called if kmalloc fails.

Signed-off-by: Rakesh Pandit <rakesh@tuxera.com>
---
 drivers/lightnvm/pblk-init.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c
index 7cf4b53..470ef04 100644
--- a/drivers/lightnvm/pblk-init.c
+++ b/drivers/lightnvm/pblk-init.c
@@ -624,12 +624,16 @@ static int pblk_lines_alloc_metadata(struct pblk *pblk)
 
 fail_free_emeta:
 	while (--i >= 0) {
-		vfree(l_mg->eline_meta[i]->buf);
+		if (l_mg->emeta_alloc_type == PBLK_VMALLOC_META)
+			vfree(l_mg->eline_meta[i]->buf);
+		else
+			kfree(l_mg->eline_meta[i]->buf);
 		kfree(l_mg->eline_meta[i]);
 	}
 
+	i = PBLK_DATA_LINES;
 fail_free_smeta:
-	for (i = 0; i < PBLK_DATA_LINES; i++)
+	while (--i >= 0)
 		kfree(l_mg->sline_meta[i]);
 
 	return -ENOMEM;
-- 
2.5.0

[toc] | [next] | [standalone]

#1736507 — Re: [PATCH] lightnvm: pblk: fix error path in pblk_lines_alloc_metadata

FromJavier González <jg@lightnvm.io>
Date2017-09-21 12:00 +0200
SubjectRe: [PATCH] lightnvm: pblk: fix error path in pblk_lines_alloc_metadata
Message-ID<us6r0-7Dh-3@gated-at.bofh.it>
In reply to#1736054

[Multipart message — attachments visible in raw view] — view raw

> On 20 Sep 2017, at 21.50, Rakesh Pandit <rakesh@tuxera.com> wrote:
> 
> Use appropriate memory free calls based on allocation type used and
> also fix number of times free is called if kmalloc fails.
> 
> Signed-off-by: Rakesh Pandit <rakesh@tuxera.com>
> ---
> drivers/lightnvm/pblk-init.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c
> index 7cf4b53..470ef04 100644
> --- a/drivers/lightnvm/pblk-init.c
> +++ b/drivers/lightnvm/pblk-init.c
> @@ -624,12 +624,16 @@ static int pblk_lines_alloc_metadata(struct pblk *pblk)
> 
> fail_free_emeta:
> 	while (--i >= 0) {
> -		vfree(l_mg->eline_meta[i]->buf);
> +		if (l_mg->emeta_alloc_type == PBLK_VMALLOC_META)
> +			vfree(l_mg->eline_meta[i]->buf);
> +		else
> +			kfree(l_mg->eline_meta[i]->buf);
> 		kfree(l_mg->eline_meta[i]);
> 	}
> 
> +	i = PBLK_DATA_LINES;
> fail_free_smeta:
> -	for (i = 0; i < PBLK_DATA_LINES; i++)
> +	while (--i >= 0)
> 		kfree(l_mg->sline_meta[i]);

It is safe to use kfree on NULL pointers. No need to do this. You can
either send a new patch, or we can change it when picking it up.

> 
> 	return -ENOMEM;
> --
> 2.5.0

Rest looks good.


Reviewed-by: Javier González <javier@cnexlabs.com>

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

#1736518 — Re: [PATCH] lightnvm: pblk: fix error path in pblk_lines_alloc_metadata

FromRakesh Pandit <rakesh@tuxera.com>
Date2017-09-21 12:20 +0200
SubjectRe: [PATCH] lightnvm: pblk: fix error path in pblk_lines_alloc_metadata
Message-ID<us6Km-7Zx-5@gated-at.bofh.it>
In reply to#1736507
On Thu, Sep 21, 2017 at 11:56:46AM +0200, Javier González wrote:
> > On 20 Sep 2017, at 21.50, Rakesh Pandit <rakesh@tuxera.com> wrote:
> > 
> > Use appropriate memory free calls based on allocation type used and
> > also fix number of times free is called if kmalloc fails.
> > 
> > Signed-off-by: Rakesh Pandit <rakesh@tuxera.com>
> > ---
> > drivers/lightnvm/pblk-init.c | 8 ++++++--
> > 1 file changed, 6 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c
> > index 7cf4b53..470ef04 100644
> > --- a/drivers/lightnvm/pblk-init.c
> > +++ b/drivers/lightnvm/pblk-init.c
> > @@ -624,12 +624,16 @@ static int pblk_lines_alloc_metadata(struct pblk *pblk)
> > 
> > fail_free_emeta:
> > 	while (--i >= 0) {
> > -		vfree(l_mg->eline_meta[i]->buf);
> > +		if (l_mg->emeta_alloc_type == PBLK_VMALLOC_META)
> > +			vfree(l_mg->eline_meta[i]->buf);
> > +		else
> > +			kfree(l_mg->eline_meta[i]->buf);
> > 		kfree(l_mg->eline_meta[i]);
> > 	}
> > 
> > +	i = PBLK_DATA_LINES;
> > fail_free_smeta:
> > -	for (i = 0; i < PBLK_DATA_LINES; i++)
> > +	while (--i >= 0)
> > 		kfree(l_mg->sline_meta[i]);
> 
> It is safe to use kfree on NULL pointers. No need to do this. You can
> either send a new patch, or we can change it when picking it up.

Yes, that would be great if this is adjusted while picking up.

> 
> > 
> > 	return -ENOMEM;
> > --
> > 2.5.0
> 
> Rest looks good.
> 
> 
> Reviewed-by: Javier González <javier@cnexlabs.com>
> 

Thanks,

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

#1736546 — Re: [PATCH] lightnvm: pblk: fix error path in pblk_lines_alloc_metadata

FromMatias Bjørling <mb@lightnvm.io>
Date2017-09-21 13:20 +0200
SubjectRe: [PATCH] lightnvm: pblk: fix error path in pblk_lines_alloc_metadata
Message-ID<us7Gq-gp-17@gated-at.bofh.it>
In reply to#1736518
On 09/21/2017 12:15 PM, Rakesh Pandit wrote:
> On Thu, Sep 21, 2017 at 11:56:46AM +0200, Javier González wrote:
>>> On 20 Sep 2017, at 21.50, Rakesh Pandit <rakesh@tuxera.com> wrote:
>>>
>>> Use appropriate memory free calls based on allocation type used and
>>> also fix number of times free is called if kmalloc fails.
>>>
>>> Signed-off-by: Rakesh Pandit <rakesh@tuxera.com>
>>> ---
>>> drivers/lightnvm/pblk-init.c | 8 ++++++--
>>> 1 file changed, 6 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c
>>> index 7cf4b53..470ef04 100644
>>> --- a/drivers/lightnvm/pblk-init.c
>>> +++ b/drivers/lightnvm/pblk-init.c
>>> @@ -624,12 +624,16 @@ static int pblk_lines_alloc_metadata(struct pblk *pblk)
>>>
>>> fail_free_emeta:
>>> 	while (--i >= 0) {
>>> -		vfree(l_mg->eline_meta[i]->buf);
>>> +		if (l_mg->emeta_alloc_type == PBLK_VMALLOC_META)
>>> +			vfree(l_mg->eline_meta[i]->buf);
>>> +		else
>>> +			kfree(l_mg->eline_meta[i]->buf);
>>> 		kfree(l_mg->eline_meta[i]);
>>> 	}
>>>
>>> +	i = PBLK_DATA_LINES;
>>> fail_free_smeta:
>>> -	for (i = 0; i < PBLK_DATA_LINES; i++)
>>> +	while (--i >= 0)
>>> 		kfree(l_mg->sline_meta[i]);
>>
>> It is safe to use kfree on NULL pointers. No need to do this. You can
>> either send a new patch, or we can change it when picking it up.
> 
> Yes, that would be great if this is adjusted while picking up.
> 
>>
>>>
>>> 	return -ENOMEM;
>>> --
>>> 2.5.0
>>
>> Rest looks good.
>>
>>
>> Reviewed-by: Javier González <javier@cnexlabs.com>
>>
> 
> Thanks,
> 

Thanks Rakesh. I queued it up.

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web