Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f05795d3 authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Martin K. Petersen
Browse files

scsi: Add intermediate STARGET_REMOVE state to scsi_target_state 



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 bc3f02a7 ("[SCSI]
scsi_remove_target: fix softlockup regression on hot remove") and
40998193 ("scsi: restart list search after unlock in
scsi_remove_target") in a more comprehensive way.

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

Signed-off-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Fixes: 40998193
Cc: stable@vger.kernel.org
Reported-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Tested-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Reviewed-by: default avatarEwan D. Milne <emilne@redhat.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarJames Bottomley <jejb@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent be2a266d

drivers/scsi/scsi_scan.c

+1 −0
Original line number Diff line number Diff line
@@ -319,6 +319,7 @@ static void scsi_target_destroy(struct scsi_target *starget) 
	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);

drivers/scsi/scsi_sysfs.c

+2 −0
Original line number Diff line number Diff line
@@ -1374,11 +1374,13 @@ void scsi_remove_target(struct device *dev) 
	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);

include/scsi/scsi_device.h

+1 −0
Original line number Diff line number Diff line
@@ -248,6 +248,7 @@ scmd_printk(const char *, const struct scsi_cmnd *, const char *, ...); 
enum scsi_target_state {

	STARGET_CREATED = 1,

	STARGET_RUNNING,

	STARGET_REMOVE,

	STARGET_DEL,

};