[PATCH] lightnvm: unlock rq and free ppa_list after submission failed

[PATCH] lightnvm: unlock rq and free ppa_list after submission failed

[Wenwei Tao]

after io submission failed, before free rq, delete rq from
rrpc's inflight list, leave no bad item in the list. And
free rq's ppa_list to avoid memory leak.

Signed-off-by: Wenwei Tao <ww.tao0320@gmail.com>
---
 drivers/lightnvm/rrpc.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/lightnvm/rrpc.c b/drivers/lightnvm/rrpc.c
index a1e7488..c0886a8 100644
--- a/drivers/lightnvm/rrpc.c
+++ b/drivers/lightnvm/rrpc.c
@@ -843,6 +843,12 @@ static int rrpc_submit_io(struct rrpc *rrpc, struct bio *bio,
 	if (err) {
 		pr_err("rrpc: I/O submission failed: %d\n", err);
 		bio_put(bio);
+		if (!(flags & NVM_IOTYPE_GC)) {
+			rrpc_unlock_rq(rrpc, rqd);
+			if (rqd->nr_pages > 1)
+				nvm_dev_dma_free(rrpc->dev,
+			rqd->ppa_list, rqd->dma_ppa_list);
+		}
 		return NVM_IO_ERR;
 	}
 
-- 
1.8.3.1

Re: [PATCH] lightnvm: unlock rq and free ppa_list after submission failed

[Wenwei Tao]

This patch is based on [PATCH] lightnvm: fix bio submission issue
 https://lkml.org/lkml/2015/12/9/394

2015-12-21 15:32 GMT+08:00 Wenwei Tao <ww.tao0320@gmail.com>:
> after io submission failed, before free rq, delete rq from
> rrpc's inflight list, leave no bad item in the list. And
> free rq's ppa_list to avoid memory leak.
>
> Signed-off-by: Wenwei Tao <ww.tao0320@gmail.com>
> ---
>  drivers/lightnvm/rrpc.c | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/drivers/lightnvm/rrpc.c b/drivers/lightnvm/rrpc.c
> index a1e7488..c0886a8 100644
> --- a/drivers/lightnvm/rrpc.c
> +++ b/drivers/lightnvm/rrpc.c
> @@ -843,6 +843,12 @@ static int rrpc_submit_io(struct rrpc *rrpc, struct bio *bio,
>         if (err) {
>                 pr_err("rrpc: I/O submission failed: %d\n", err);
>                 bio_put(bio);
> +               if (!(flags & NVM_IOTYPE_GC)) {
> +                       rrpc_unlock_rq(rrpc, rqd);
> +                       if (rqd->nr_pages > 1)
> +                               nvm_dev_dma_free(rrpc->dev,
> +                       rqd->ppa_list, rqd->dma_ppa_list);
> +               }
>                 return NVM_IO_ERR;
>         }
>
> --
> 1.8.3.1
>

Re: [PATCH] lightnvm: unlock rq and free ppa_list after submission failed

[Matias Bjørling]

On 12/21/2015 08:32 AM, Wenwei Tao wrote:
> after io submission failed, before free rq, delete rq from
> rrpc's inflight list, leave no bad item in the list. And
> free rq's ppa_list to avoid memory leak.
>
> Signed-off-by: Wenwei Tao <ww.tao0320@gmail.com>
> ---
>   drivers/lightnvm/rrpc.c | 6 ++++++
>   1 file changed, 6 insertions(+)
>
> diff --git a/drivers/lightnvm/rrpc.c b/drivers/lightnvm/rrpc.c
> index a1e7488..c0886a8 100644
> --- a/drivers/lightnvm/rrpc.c
> +++ b/drivers/lightnvm/rrpc.c
> @@ -843,6 +843,12 @@ static int rrpc_submit_io(struct rrpc *rrpc, struct bio *bio,
>   	if (err) {
>   		pr_err("rrpc: I/O submission failed: %d\n", err);
>   		bio_put(bio);
> +		if (!(flags & NVM_IOTYPE_GC)) {
> +			rrpc_unlock_rq(rrpc, rqd);
> +			if (rqd->nr_pages > 1)
> +				nvm_dev_dma_free(rrpc->dev,
> +			rqd->ppa_list, rqd->dma_ppa_list);
> +		}
>   		return NVM_IO_ERR;
>   	}
>
>

I can't seem to find the bug. nvm_dev_dma_free is called when 
rrpc_write_ppalist_rq and rrpc_read_ppalist_rq fails. Where is it missing?

Re: [PATCH] lightnvm: unlock rq and free ppa_list after submission failed

[Wenwei Tao]

When rrpc_write_ppalist_rq and rrpc_read_ppalist_rq succeed, we setup
rq correctly, but nvm_submit_io failed due to cannot allocate request
or nvme_nvm_command, we return error but forget to do the cleanup job
this patch mentioned.

2015-12-21 19:22 GMT+08:00 Matias Bjørling <mb@lightnvm.io>:
> On 12/21/2015 08:32 AM, Wenwei Tao wrote:
>>
>> after io submission failed, before free rq, delete rq from
>> rrpc's inflight list, leave no bad item in the list. And
>> free rq's ppa_list to avoid memory leak.
>>
>> Signed-off-by: Wenwei Tao <ww.tao0320@gmail.com>
>> ---
>>   drivers/lightnvm/rrpc.c | 6 ++++++
>>   1 file changed, 6 insertions(+)
>>
>> diff --git a/drivers/lightnvm/rrpc.c b/drivers/lightnvm/rrpc.c
>> index a1e7488..c0886a8 100644
>> --- a/drivers/lightnvm/rrpc.c
>> +++ b/drivers/lightnvm/rrpc.c
>> @@ -843,6 +843,12 @@ static int rrpc_submit_io(struct rrpc *rrpc, struct
>> bio *bio,
>>         if (err) {
>>                 pr_err("rrpc: I/O submission failed: %d\n", err);
>>                 bio_put(bio);
>> +               if (!(flags & NVM_IOTYPE_GC)) {
>> +                       rrpc_unlock_rq(rrpc, rqd);
>> +                       if (rqd->nr_pages > 1)
>> +                               nvm_dev_dma_free(rrpc->dev,
>> +                       rqd->ppa_list, rqd->dma_ppa_list);
>> +               }
>>                 return NVM_IO_ERR;
>>         }
>>
>>
>
> I can't seem to find the bug. nvm_dev_dma_free is called when
> rrpc_write_ppalist_rq and rrpc_read_ppalist_rq fails. Where is it missing?

Re: [PATCH] lightnvm: unlock rq and free ppa_list after submission failed

[Matias Bjørling]

> When rrpc_write_ppalist_rq and rrpc_read_ppalist_rq succeed, we setup
> rq correctly, but nvm_submit_io failed due to cannot allocate request
> or nvme_nvm_command, we return error but forget to do the cleanup job
> this patch mentioned.

Thanks. I've included that explanation instead for the commit message. 
I've applied it for 4.5 (together with your previous patch).