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

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
...@@ -1442,9 +1442,6 @@ void mpt3sas_transport_update_links(struct MPT3SAS_ADAPTER *ioc, ...@@ -1442,9 +1442,6 @@ void mpt3sas_transport_update_links(struct MPT3SAS_ADAPTER *ioc,
u64 sas_address, u16 handle, u8 phy_number, u8 link_rate); u64 sas_address, u16 handle, u8 phy_number, u8 link_rate);
extern struct sas_function_template mpt3sas_transport_functions; extern struct sas_function_template mpt3sas_transport_functions;
extern struct scsi_transport_template *mpt3sas_transport_template; 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 */ /* trigger data externs */
void mpt3sas_send_trigger_data_event(struct MPT3SAS_ADAPTER *ioc, void mpt3sas_send_trigger_data_event(struct MPT3SAS_ADAPTER *ioc,
struct SL_WH_TRIGGERS_EVENT_DATA_T *event_data); struct SL_WH_TRIGGERS_EVENT_DATA_T *event_data);
......
...@@ -2859,7 +2859,7 @@ _scsih_internal_device_block(struct scsi_device *sdev, ...@@ -2859,7 +2859,7 @@ _scsih_internal_device_block(struct scsi_device *sdev,
sas_device_priv_data->sas_target->handle); sas_device_priv_data->sas_target->handle);
sas_device_priv_data->block = 1; sas_device_priv_data->block = 1;
r = scsi_internal_device_block(sdev); r = scsi_internal_device_block(sdev, false);
if (r == -EINVAL) if (r == -EINVAL)
sdev_printk(KERN_WARNING, sdev, sdev_printk(KERN_WARNING, sdev,
"device_block failed with return(%d) for handle(0x%04x)\n", "device_block failed with return(%d) for handle(0x%04x)\n",
...@@ -2895,7 +2895,7 @@ _scsih_internal_device_unblock(struct scsi_device *sdev, ...@@ -2895,7 +2895,7 @@ _scsih_internal_device_unblock(struct scsi_device *sdev,
"performing a block followed by an unblock\n", "performing a block followed by an unblock\n",
r, sas_device_priv_data->sas_target->handle); r, sas_device_priv_data->sas_target->handle);
sas_device_priv_data->block = 1; sas_device_priv_data->block = 1;
r = scsi_internal_device_block(sdev); r = scsi_internal_device_block(sdev, false);
if (r) if (r)
sdev_printk(KERN_WARNING, sdev, "retried device_block " sdev_printk(KERN_WARNING, sdev, "retried device_block "
"failed with return(%d) for handle(0x%04x)\n", "failed with return(%d) for handle(0x%04x)\n",
......
...@@ -2932,6 +2932,8 @@ EXPORT_SYMBOL(scsi_target_resume); ...@@ -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 * scsi_internal_device_block - internal function to put a device temporarily into the SDEV_BLOCK state
* @sdev: device to block * @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 * Block request made by scsi lld's to temporarily stop all
* scsi commands on the specified device. May sleep. * scsi commands on the specified device. May sleep.
...@@ -2949,7 +2951,7 @@ EXPORT_SYMBOL(scsi_target_resume); ...@@ -2949,7 +2951,7 @@ EXPORT_SYMBOL(scsi_target_resume);
* remove the rport mutex lock and unlock calls from srp_queuecommand(). * remove the rport mutex lock and unlock calls from srp_queuecommand().
*/ */
int 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; struct request_queue *q = sdev->request_queue;
unsigned long flags; unsigned long flags;
...@@ -2969,12 +2971,16 @@ scsi_internal_device_block(struct scsi_device *sdev) ...@@ -2969,12 +2971,16 @@ scsi_internal_device_block(struct scsi_device *sdev)
* request queue. * request queue.
*/ */
if (q->mq_ops) { if (q->mq_ops) {
blk_mq_quiesce_queue(q); if (wait)
blk_mq_quiesce_queue(q);
else
blk_mq_stop_hw_queues(q);
} else { } else {
spin_lock_irqsave(q->queue_lock, flags); spin_lock_irqsave(q->queue_lock, flags);
blk_stop_queue(q); blk_stop_queue(q);
spin_unlock_irqrestore(q->queue_lock, flags); spin_unlock_irqrestore(q->queue_lock, flags);
scsi_wait_for_queuecommand(sdev); if (wait)
scsi_wait_for_queuecommand(sdev);
} }
return 0; return 0;
...@@ -3036,7 +3042,7 @@ EXPORT_SYMBOL_GPL(scsi_internal_device_unblock); ...@@ -3036,7 +3042,7 @@ EXPORT_SYMBOL_GPL(scsi_internal_device_unblock);
static void static void
device_block(struct scsi_device *sdev, void *data) device_block(struct scsi_device *sdev, void *data)
{ {
scsi_internal_device_block(sdev); scsi_internal_device_block(sdev, true);
} }
static int static int
......
...@@ -188,8 +188,5 @@ static inline void scsi_dh_remove_device(struct scsi_device *sdev) { } ...@@ -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 */ #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 */ #endif /* _SCSI_PRIV_H */
...@@ -472,6 +472,10 @@ static inline int scsi_device_created(struct scsi_device *sdev) ...@@ -472,6 +472,10 @@ static inline int scsi_device_created(struct scsi_device *sdev)
sdev->sdev_state == SDEV_CREATED_BLOCK; 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 */ /* accessor functions for the SCSI parameters */
static inline int scsi_device_sync(struct scsi_device *sdev) static inline int scsi_device_sync(struct scsi_device *sdev)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment