Commit 8893cf6c authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: mpt3sas: Avoid sleeping in interrupt context 



Commit 669f0441 ("scsi: srp_transport: Move queuecommand() wait code
to SCSI core") can make scsi_internal_device_block() sleep.  However,
the mpt3sas driver can call this function from an interrupt
handler. Hence add a second argument to scsi_internal_device_block()
that restores the old behavior of this function for the mpt3sas handler.

The call chain that triggered an "IRQ handler enabled interrupts"
complaint is as follows:

_base_interrupt()
-> _base_async_event()
   -> mpt3sas_scsih_event_callback()
      -> _scsih_check_topo_delete_events()
         -> _scsih_block_io_to_children_attached_directly()
            -> _scsih_block_io_device()
               -> _scsih_internal_device_block()
                  -> scsi_internal_device_block()

Reported-by: default avatarOmar Sandoval <osandov@osandov.com>
Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Cc: Omar Sandoval <osandov@osandov.com>
Cc: Hannes Reinecke <hare@suse.com>
Cc: Sagi Grimberg <sagi@grimberg.me>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Sathya Prakash <sathya.prakash@broadcom.com>
Cc: Chaitra P B <chaitra.basappa@broadcom.com>
Cc: Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>
Cc: Sreekanth Reddy <Sreekanth.Reddy@broadcom.com>
Cc: <stable@vger.kernel.org> # v4.10+
Tested-by: default avatarOmar Sandoval <osandov@fb.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c46f0917

drivers/scsi/mpt3sas/mpt3sas_base.h

+0 −3
Original line number Diff line number Diff line
@@ -1442,9 +1442,6 @@ void mpt3sas_transport_update_links(struct MPT3SAS_ADAPTER *ioc, 
	u64 sas_address, u16 handle, u8 phy_number, u8 link_rate);

extern struct sas_function_template mpt3sas_transport_functions;

extern struct scsi_transport_template *mpt3sas_transport_template;

extern int scsi_internal_device_block(struct scsi_device *sdev);

extern int scsi_internal_device_unblock(struct scsi_device *sdev,

				enum scsi_device_state new_state);

/* trigger data externs */

void mpt3sas_send_trigger_data_event(struct MPT3SAS_ADAPTER *ioc,

	struct SL_WH_TRIGGERS_EVENT_DATA_T *event_data);

drivers/scsi/mpt3sas/mpt3sas_scsih.c

+2 −2
Original line number Diff line number Diff line
@@ -2859,7 +2859,7 @@ _scsih_internal_device_block(struct scsi_device *sdev, 
	    sas_device_priv_data->sas_target->handle);

	sas_device_priv_data->block = 1;



	r = scsi_internal_device_block(sdev);

	r = scsi_internal_device_block(sdev, false);

	if (r == -EINVAL)

		sdev_printk(KERN_WARNING, sdev,

		    "device_block failed with return(%d) for handle(0x%04x)\n",
@@ -2895,7 +2895,7 @@ _scsih_internal_device_unblock(struct scsi_device *sdev, 
		    "performing a block followed by an unblock\n",

		    r, sas_device_priv_data->sas_target->handle);

		sas_device_priv_data->block = 1;

		r = scsi_internal_device_block(sdev);

		r = scsi_internal_device_block(sdev, false);

		if (r)

			sdev_printk(KERN_WARNING, sdev, "retried device_block "

			    "failed with return(%d) for handle(0x%04x)\n",

drivers/scsi/scsi_lib.c

+10 −4
Original line number Diff line number Diff line
@@ -2932,6 +2932,8 @@ EXPORT_SYMBOL(scsi_target_resume); 
/**

 * scsi_internal_device_block - internal function to put a device temporarily into the SDEV_BLOCK state

 * @sdev:	device to block

 * @wait:	Whether or not to wait until ongoing .queuecommand() /

 *		.queue_rq() calls have finished.

 *

 * Block request made by scsi lld's to temporarily stop all

 * scsi commands on the specified device. May sleep.
@@ -2949,7 +2951,7 @@ EXPORT_SYMBOL(scsi_target_resume); 
 * remove the rport mutex lock and unlock calls from srp_queuecommand().

 */

int

scsi_internal_device_block(struct scsi_device *sdev)

scsi_internal_device_block(struct scsi_device *sdev, bool wait)

{

	struct request_queue *q = sdev->request_queue;

	unsigned long flags;
@@ -2969,11 +2971,15 @@ scsi_internal_device_block(struct scsi_device *sdev) 
	 * request queue. 

	 */

	if (q->mq_ops) {

		if (wait)

			blk_mq_quiesce_queue(q);

		else

			blk_mq_stop_hw_queues(q);

	} else {

		spin_lock_irqsave(q->queue_lock, flags);

		blk_stop_queue(q);

		spin_unlock_irqrestore(q->queue_lock, flags);

		if (wait)

			scsi_wait_for_queuecommand(sdev);

	}
@@ -3036,7 +3042,7 @@ EXPORT_SYMBOL_GPL(scsi_internal_device_unblock); 
static void

device_block(struct scsi_device *sdev, void *data)

{

	scsi_internal_device_block(sdev);

	scsi_internal_device_block(sdev, true);

}



static int

drivers/scsi/scsi_priv.h

+0 −3
Original line number Diff line number Diff line
@@ -188,8 +188,5 @@ static inline void scsi_dh_remove_device(struct scsi_device *sdev) { } 
 */



#define SCSI_DEVICE_BLOCK_MAX_TIMEOUT	600	/* units in seconds */

extern int scsi_internal_device_block(struct scsi_device *sdev);

extern int scsi_internal_device_unblock(struct scsi_device *sdev,

					enum scsi_device_state new_state);



#endif /* _SCSI_PRIV_H */

include/scsi/scsi_device.h

+4 −0
Original line number Diff line number Diff line
@@ -472,6 +472,10 @@ static inline int scsi_device_created(struct scsi_device *sdev) 
		sdev->sdev_state == SDEV_CREATED_BLOCK;

}



int scsi_internal_device_block(struct scsi_device *sdev, bool wait);

int scsi_internal_device_unblock(struct scsi_device *sdev,

				 enum scsi_device_state new_state);



/* accessor functions for the SCSI parameters */

static inline int scsi_device_sync(struct scsi_device *sdev)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE