Skip to contentSkip to conversation

Patch "lightnvm: update closed list outside of intr context" has been added to the 4.5-stable tree

PATCH [email protected] 1 participant 1 message May 6, 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

lightnvm: update closed list outside of intr context

to the 4.5-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:
lightnvm-update-closed-list-outside-of-intr-context.patch
and it can be found in the queue-4.5 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 6adb03de406e8c92579c2e4b11640841fa908277 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= <[email protected]>
Date: Sat, 20 Feb 2016 08:52:40 +0100
Subject: lightnvm: update closed list outside of intr context
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Javier González <[email protected]>

commit 6adb03de406e8c92579c2e4b11640841fa908277 upstream.

When an I/O finishes, full blocks are moved from the open to the closed list - a lock is taken to protect the list. This happens at the moment in the interrupt context, which is not correct.

This patch moves this logic to the block workqueue instead, avoiding holding a spinlock without interrupt save in an interrupt context.

Signed-off-by Javier González <[email protected]>
Fixes ff0e498bfa18 ("lightnvm: manage open and closed blocks sepa...")
Signed-off-by Matias Bjørling <[email protected]>
Signed-off-by Jens Axboe <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 drivers/lightnvm/rrpc.c |   23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)
drivers/lightnvm/rrpc.c +10 -13
@@ -499,12 +499,21 @@ static void rrpc_gc_queue(struct work_st
 	struct rrpc *rrpc = gcb->rrpc;
 	struct rrpc_block *rblk = gcb->rblk;
 	struct nvm_lun *lun = rblk->parent->lun;
+	struct nvm_block *blk = rblk->parent;
 	struct rrpc_lun *rlun = &rrpc->luns[lun->id - rrpc->lun_offset];
 
 	spin_lock(&rlun->lock);
 	list_add_tail(&rblk->prio, &rlun->prio_list);
 	spin_unlock(&rlun->lock);
 
+	spin_lock(&lun->lock);
+	lun->nr_open_blocks--;
+	lun->nr_closed_blocks++;
+	blk->state &= ~NVM_BLK_ST_OPEN;
+	blk->state |= NVM_BLK_ST_CLOSED;
+	list_move_tail(&rblk->list, &rlun->closed_list);
+	spin_unlock(&lun->lock);
+
 	mempool_free(gcb, rrpc->gcb_pool);
 	pr_debug("nvm: block '%lu' is full, allow GC (sched)\n",
 							rblk->parent->id);

@@ -668,20 +677,8 @@ static void rrpc_end_io_write(struct rrp
 		lun = rblk->parent->lun;
 
 		cmnt_size = atomic_inc_return(&rblk->data_cmnt_size);
-		if (unlikely(cmnt_size == rrpc->dev->pgs_per_blk)) {
-			struct nvm_block *blk = rblk->parent;
-			struct rrpc_lun *rlun = rblk->rlun;
-
-			spin_lock(&lun->lock);
-			lun->nr_open_blocks--;
-			lun->nr_closed_blocks++;
-			blk->state &= ~NVM_BLK_ST_OPEN;
-			blk->state |= NVM_BLK_ST_CLOSED;
-			list_move_tail(&rblk->list, &rlun->closed_list);
-			spin_unlock(&lun->lock);
-
+		if (unlikely(cmnt_size == rrpc->dev->pgs_per_blk))
 			rrpc_run_gc(rrpc, rblk);
-		}
 	}
 }

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

queue-4.5/lightnvm-update-closed-list-outside-of-intr-context.patch