Skip to contentSkip to conversation

Patch "[PATCH 027/135] lightnvm: fix bio submission issue" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Sep 9, 2016 Stable branch

lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

[PATCH 027/135] lightnvm: fix bio submission issue

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
0027-lightnvm-fix-bio-submission-issue.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 8419ef00ea07eaaca57b21fae9f10b79a70fe7b4 Mon Sep 17 00:00:00 2001

From: Wenwei Tao <[email protected]>
Date: Tue, 12 Jan 2016 07:49:15 +0100
Subject: [PATCH 027/135] lightnvm: fix bio submission issue
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ Upstream commit 3cd485b1f8e25a6534eb4c542e7eba1b944fbaaf ]

Put bio when submission fails, since we get it before submission. And return error when backend device driver doesn't provide a submit_io method, thus we can end IO properly.

---
 drivers/lightnvm/gennvm.c |    2 +-
 drivers/lightnvm/rrpc.c   |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/lightnvm/gennvm.c +1 -1
@@ -345,7 +345,7 @@ static void gennvm_generic_to_addr_mode(
 static int gennvm_submit_io(struct nvm_dev *dev, struct nvm_rq *rqd)
 {
 	if (!dev->ops->submit_io)
-		return 0;
+		return -ENODEV;
 
 	/* Convert address space */
 	gennvm_generic_to_addr_mode(dev, rqd);
drivers/lightnvm/rrpc.c +3 -1
@@ -650,11 +650,12 @@ static int rrpc_end_io(struct nvm_rq *rq
 	if (bio_data_dir(rqd->bio) == WRITE)
 		rrpc_end_io_write(rrpc, rrqd, laddr, npages);
 
+	bio_put(rqd->bio);
+
 	if (rrqd->flags & NVM_IOTYPE_GC)
 		return 0;
 
 	rrpc_unlock_rq(rrpc, rqd);
-	bio_put(rqd->bio);
 
 	if (npages > 1)
 		nvm_dev_dma_free(rrpc->dev, rqd->ppa_list, rqd->dma_ppa_list);
@@ -841,6 +842,7 @@ static int rrpc_submit_io(struct rrpc *r
 	err = nvm_submit_io(rrpc->dev, rqd);
 	if (err) {
 		pr_err("rrpc: I/O submission failed: %d\n", err);
+		bio_put(bio);
 		return NVM_IO_ERR;
 	}
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/0030-lightnvm-unlock-rq-and-free-ppa_list-on-submission-f.patch queue-4.4/0033-NVMe-fix-build-with-CONFIG_NVM-enabled.patch queue-4.4/0031-lightnvm-fix-locking-and-mempool-in-rrpc_lun_gc.patch queue-4.4/0027-lightnvm-fix-bio-submission-issue.patch