[PATCH 1/2] lightnvm: create cmd before allocating request

[PATCH 1/2] lightnvm: create cmd before allocating request

[Javier González]

Create nvme command before allocating a request using
nvme_alloc_request, which uses the command direction. Up until now, the
command has been zeroized, so all commands have been allocated as a
read operation.

Signed-off-by: Javier González <javier@cnexlabs.com>
---
 drivers/nvme/host/lightnvm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c
index de61a4a03d78..090bbeb655bc 100644
--- a/drivers/nvme/host/lightnvm.c
+++ b/drivers/nvme/host/lightnvm.c
@@ -503,6 +503,8 @@ static int nvme_nvm_submit_io(struct nvm_dev *dev, struct nvm_rq *rqd)
 	if (!cmd)
 		return -ENOMEM;
 
+	nvme_nvm_rqtocmd(rq, rqd, ns, cmd);
+
 	rq = nvme_alloc_request(q, (struct nvme_command *)cmd, 0, NVME_QID_ANY);
 	if (IS_ERR(rq)) {
 		kfree(cmd);
@@ -517,8 +519,6 @@ static int nvme_nvm_submit_io(struct nvm_dev *dev, struct nvm_rq *rqd)
 		rq->__data_len = 0;
 	}
 
-	nvme_nvm_rqtocmd(rq, rqd, ns, cmd);
-
 	rq->end_io_data = rqd;
 
 	blk_execute_rq_nowait(q, NULL, rq, 0, nvme_nvm_end_io);
-- 
2.7.4

[PATCH 2/2] lightnvm: fix bad back free on error path

[Javier González]

Free memory correctly when an allocation fails on a loop and we free
backwards previously successful allocations.

Signed-off-by: Javier González <javier@cnexlabs.com>
---
 drivers/lightnvm/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
index 54a06c3a2b8c..6a4aa608ad95 100644
--- a/drivers/lightnvm/core.c
+++ b/drivers/lightnvm/core.c
@@ -74,7 +74,7 @@ static int nvm_reserve_luns(struct nvm_dev *dev, int lun_begin, int lun_end)
 
 	return 0;
 err:
-	while (--i > lun_begin)
+	while (--i >= lun_begin)
 		clear_bit(i, dev->lun_map);
 
 	return -EBUSY;
@@ -211,7 +211,7 @@ static struct nvm_tgt_dev *nvm_create_tgt_dev(struct nvm_dev *dev,
 
 	return tgt_dev;
 err_ch:
-	while (--i > 0)
+	while (--i >= 0)
 		kfree(dev_map->chnls[i].lun_offs);
 	kfree(luns);
 err_luns:
-- 
2.7.4

Re: [PATCH 2/2] lightnvm: fix bad back free on error path

[Matias Bjørling]

On 05/03/2017 11:19 AM, Javier González wrote:
> Free memory correctly when an allocation fails on a loop and we free
> backwards previously successful allocations.
>
> Signed-off-by: Javier González <javier@cnexlabs.com>
> ---
>  drivers/lightnvm/core.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
> index 54a06c3a2b8c..6a4aa608ad95 100644
> --- a/drivers/lightnvm/core.c
> +++ b/drivers/lightnvm/core.c
> @@ -74,7 +74,7 @@ static int nvm_reserve_luns(struct nvm_dev *dev, int lun_begin, int lun_end)
>
>  	return 0;
>  err:
> -	while (--i > lun_begin)
> +	while (--i >= lun_begin)
>  		clear_bit(i, dev->lun_map);
>
>  	return -EBUSY;
> @@ -211,7 +211,7 @@ static struct nvm_tgt_dev *nvm_create_tgt_dev(struct nvm_dev *dev,
>
>  	return tgt_dev;
>  err_ch:
> -	while (--i > 0)
> +	while (--i >= 0)
>  		kfree(dev_map->chnls[i].lun_offs);
>  	kfree(luns);
>  err_luns:
>

Reviewed-by: Matias Bjørling <matias@cnexlabs.com>

Jens, and this baby as well? :)

Re: [PATCH 2/2] lightnvm: fix bad back free on error path

[Christoph Hellwig]

Looks fine,

Reviewed-by: Christoph Hellwig <hch@lst.de>

Re: [PATCH 1/2] lightnvm: create cmd before allocating request

[Matias Bjørling]

On 05/03/2017 11:19 AM, Javier González wrote:
> Create nvme command before allocating a request using
> nvme_alloc_request, which uses the command direction. Up until now, the
> command has been zeroized, so all commands have been allocated as a
> read operation.
>
> Signed-off-by: Javier González <javier@cnexlabs.com>
> ---
>  drivers/nvme/host/lightnvm.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c
> index de61a4a03d78..090bbeb655bc 100644
> --- a/drivers/nvme/host/lightnvm.c
> +++ b/drivers/nvme/host/lightnvm.c
> @@ -503,6 +503,8 @@ static int nvme_nvm_submit_io(struct nvm_dev *dev, struct nvm_rq *rqd)
>  	if (!cmd)
>  		return -ENOMEM;
>
> +	nvme_nvm_rqtocmd(rq, rqd, ns, cmd);
> +
>  	rq = nvme_alloc_request(q, (struct nvme_command *)cmd, 0, NVME_QID_ANY);
>  	if (IS_ERR(rq)) {
>  		kfree(cmd);
> @@ -517,8 +519,6 @@ static int nvme_nvm_submit_io(struct nvm_dev *dev, struct nvm_rq *rqd)
>  		rq->__data_len = 0;
>  	}
>
> -	nvme_nvm_rqtocmd(rq, rqd, ns, cmd);
> -
>  	rq->end_io_data = rqd;
>
>  	blk_execute_rq_nowait(q, NULL, rq, 0, nvme_nvm_end_io);
>

Reviewed-by: Matias Bjørling <matias@cnexlabs.com>

Jens, would you pick this up when convenient? Thank you!

Re: [PATCH 1/2] lightnvm: create cmd before allocating request

[Christoph Hellwig]

On Wed, May 03, 2017 at 11:19:04AM +0200, Javier Gonz�lez wrote:
> Create nvme command before allocating a request using
> nvme_alloc_request, which uses the command direction. Up until now, the
> command has been zeroized, so all commands have been allocated as a
> read operation.

Hah.. Looks fine:

Reviewed-by: Christoph Hellwig <hch@lst.de>

Re: [PATCH 1/2] lightnvm: create cmd before allocating request

[Jens Axboe]

On Wed, May 03 2017, Javier Gonz�lez wrote:
> Create nvme command before allocating a request using
> nvme_alloc_request, which uses the command direction. Up until now, the
> command has been zeroized, so all commands have been allocated as a
> read operation.

Applied 1-2. Javier, please use a cover letter when sending more than 1
patch at the time, makes it easier to reply to the series as a whole.

-- 
Jens Axboe

Re: [PATCH 1/2] lightnvm: create cmd before allocating request

[Javier González]

[-- Attachment #1: Type: text/plain, Size: 536 bytes --]

> On 4 May 2017, at 15.53, Jens Axboe <axboe@kernel.dk> wrote:
> 
> On Wed, May 03 2017, Javier González wrote:
>> Create nvme command before allocating a request using
>> nvme_alloc_request, which uses the command direction. Up until now, the
>> command has been zeroized, so all commands have been allocated as a
>> read operation.
> 
> Applied 1-2. Javier, please use a cover letter when sending more than 1
> patch at the time, makes it easier to reply to the series as a whole.
> 


Thanks Jens. I will.

Javier


[-- Attachment #2: Message signed with OpenPGP --]
[-- Type: application/pgp-signature, Size: 801 bytes --]