Patch "scsi: Add intermediate STARGET_REMOVE state to scsi_target_state" has been added to the 4.6-stable tree

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

scsi: Add intermediate STARGET_REMOVE state to scsi_target_state

to the 4.6-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:
scsi-add-intermediate-starget_remove-state-to-scsi_target_state.patch
and it can be found in the queue-4.6 subdirectory.

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

From: Johannes Thumshirn <[email protected]>
Date: Tue, 5 Apr 2016 11:50:44 +0200
Subject: scsi: Add intermediate STARGET_REMOVE state to scsi_target_state

From: Johannes Thumshirn <[email protected]>

commit f05795d3d771f30a7bdc3a138bf714b06d42aa95 upstream.

Add intermediate STARGET_REMOVE state to scsi_target_state to avoid running into the BUG_ON() in scsi_target_reap(). The STARGET_REMOVE state is only valid in the path from scsi_remove_target() to scsi_target_destroy() indicating this target is going to be removed.

This re-fixes the problem introduced in commits bc3f02a795d3 ("[SCSI]
scsi_remove_target: fix softlockup regression on hot remove") and 40998193560d ("scsi: restart list search after unlock in scsi_remove_target") in a more comprehensive way.

[mkp: Included James' fix for scsi_target_destroy()]

---
 drivers/scsi/scsi_scan.c   |    1 +
 drivers/scsi/scsi_sysfs.c  |    2 ++
 include/scsi/scsi_device.h |    1 +
 3 files changed, 4 insertions(+)

@@ -316,6 +316,7 @@ static void scsi_target_destroy(struct s
 	struct Scsi_Host *shost = dev_to_shost(dev->parent);
 	unsigned long flags;
 
+	BUG_ON(starget->state == STARGET_DEL);
 	starget->state = STARGET_DEL;
 	transport_destroy_device(dev);
 	spin_lock_irqsave(shost->host_lock, flags);

@@ -1373,11 +1373,13 @@ restart:
 	spin_lock_irqsave(shost->host_lock, flags);
 	list_for_each_entry(starget, &shost->__targets, siblings) {
 		if (starget->state == STARGET_DEL ||
+		    starget->state == STARGET_REMOVE ||
 		    starget == last_target)
 			continue;
 		if (starget->dev.parent == dev || &starget->dev == dev) {
 			kref_get(&starget->reap_ref);
 			last_target = starget;
+			starget->state = STARGET_REMOVE;
 			spin_unlock_irqrestore(shost->host_lock, flags);
 			__scsi_remove_target(starget);
 			scsi_target_reap(starget);

@@ -242,6 +242,7 @@ scmd_printk(const char *, const struct s
 enum scsi_target_state {
 	STARGET_CREATED = 1,
 	STARGET_RUNNING,
+	STARGET_REMOVE,
 	STARGET_DEL,
 };
 

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

queue-4.6/mcb-fixed-bar-number-assignment-for-the-gdd.patch queue-4.6/revert-scsi-fix-soft-lockup-in-scsi_remove_target-on-module-removal.patch queue-4.6/scsi-add-intermediate-starget_remove-state-to-scsi_target_state.patch