All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sreekanth Reddy <sreekanth.reddy@avagotech.com>
To: jejb@kernel.org, hch@infradead.org
Cc: martin.petersen@oracle.com, linux-scsi@vger.kernel.org,
	JBottomley@Parallels.com, Sathya.Prakash@avagotech.com,
	linux-kernel@vger.kernel.org,
	Sreekanth Reddy <Sreekanth.Reddy@avagotech.com>
Subject: [PATCH 03/20] [SCSI] mpt3sas: Don't block the drive when drive addition under the control of SML
Date: Fri, 12 Jun 2015 15:12:15 +0530	[thread overview]
Message-ID: <1434102153-38581-4-git-send-email-Sreekanth.Reddy@avagotech.com> (raw)
In-Reply-To: <1434102153-38581-1-git-send-email-Sreekanth.Reddy@avagotech.com>

During hot-plugging of a disk(having a flaky link), the disk addition
stops and any further disk addition or removal doesn't happen on that
controller.

This is because, when driver receives DELAY_NOT_RESPONDING event for a disk
while it is undergoing addition at the SCSI Transport layer, the driver
would block the I/O to that disk resulting in a deadlock. i.e the disk
addition work couldn't be completed at the SCSI Transport Layer as it
can't send any I/Os (such as Inquiry, Report LUNs etc) to the disk as
I/Os are blocked to this drive. Also any subsequent device removal
(TARGET_NOT_RESPONDING) or link update(RC_PHY_CHANGED) event couldn't be
processed as they are in the queue to get processed after disk addition
event.

Description of Change:
Don't block the drive when drive addition is under the control of SML.
So that SML won't be blocked of issuing the device dicovery commands
(such as Inquiry, Report LUNs etc).

Signed-off-by: Sreekanth Reddy <Sreekanth.Reddy@avagotech.com>
---
 drivers/scsi/mpt3sas/mpt3sas_base.h      |  4 +++-
 drivers/scsi/mpt3sas/mpt3sas_scsih.c     |  7 +++++++
 drivers/scsi/mpt3sas/mpt3sas_transport.c | 18 ++++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h b/drivers/scsi/mpt3sas/mpt3sas_base.h
index 6b8d8f1..b79ad4f 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_base.h
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.h
@@ -294,7 +294,8 @@ struct _internal_cmd {
  * @responding: used in _scsih_sas_device_mark_responding
  * @fast_path: fast path feature enable bit
  * @pfa_led_on: flag for PFA LED status
- *
+ * @pend_sas_rphy_add: flag to check if device is in sas_rphy_add()
+ *	addition routine.
  */
 struct _sas_device {
 	struct list_head list;
@@ -315,6 +316,7 @@ struct _sas_device {
 	u8	responding;
 	u8	fast_path;
 	u8	pfa_led_on;
+	u8	pend_sas_rphy_add;
 };
 
 /**
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 5a97e32..d457dba 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -2644,6 +2644,11 @@ _scsih_block_io_device(struct MPT3SAS_ADAPTER *ioc, u16 handle)
 {
 	struct MPT3SAS_DEVICE *sas_device_priv_data;
 	struct scsi_device *sdev;
+	struct _sas_device *sas_device;
+
+	sas_device = _scsih_sas_device_find_by_handle(ioc, handle);
+	if (!sas_device)
+		return;
 
 	shost_for_each_device(sdev, ioc->shost) {
 		sas_device_priv_data = sdev->hostdata;
@@ -2653,6 +2658,8 @@ _scsih_block_io_device(struct MPT3SAS_ADAPTER *ioc, u16 handle)
 			continue;
 		if (sas_device_priv_data->block)
 			continue;
+		if (sas_device->pend_sas_rphy_add)
+			continue;
 		sas_device_priv_data->block = 1;
 		scsi_internal_device_block(sdev);
 		sdev_printk(KERN_INFO, sdev,
diff --git a/drivers/scsi/mpt3sas/mpt3sas_transport.c b/drivers/scsi/mpt3sas/mpt3sas_transport.c
index efb98af..7a7aa68 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_transport.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_transport.c
@@ -649,6 +649,7 @@ mpt3sas_transport_port_add(struct MPT3SAS_ADAPTER *ioc, u16 handle,
 	unsigned long flags;
 	struct _sas_node *sas_node;
 	struct sas_rphy *rphy;
+	struct _sas_device *sas_device = NULL;
 	int i;
 	struct sas_port *port;
 
@@ -731,10 +732,27 @@ mpt3sas_transport_port_add(struct MPT3SAS_ADAPTER *ioc, u16 handle,
 		    mpt3sas_port->remote_identify.device_type);
 
 	rphy->identify = mpt3sas_port->remote_identify;
+
+	if (mpt3sas_port->remote_identify.device_type == SAS_END_DEVICE) {
+		sas_device = mpt3sas_scsih_sas_device_find_by_sas_address(ioc,
+				    mpt3sas_port->remote_identify.sas_address);
+		if (!sas_device) {
+			dfailprintk(ioc, printk(MPT3SAS_FMT
+				"failure at %s:%d/%s()!\n",
+				ioc->name, __FILE__, __LINE__, __func__));
+			goto out_fail;
+		}
+		sas_device->pend_sas_rphy_add = 1;
+	}
+
 	if ((sas_rphy_add(rphy))) {
 		pr_err(MPT3SAS_FMT "failure at %s:%d/%s()!\n",
 		    ioc->name, __FILE__, __LINE__, __func__);
 	}
+
+	if (mpt3sas_port->remote_identify.device_type == SAS_END_DEVICE)
+		sas_device->pend_sas_rphy_add = 0;
+
 	if ((ioc->logging_level & MPT_DEBUG_TRANSPORT))
 		dev_printk(KERN_INFO, &rphy->dev,
 			"add: handle(0x%04x), sas_addr(0x%016llx)\n",
-- 
2.0.2


  parent reply	other threads:[~2015-06-12  9:43 UTC|newest]

Thread overview: 117+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-12  9:42 [PATCH 00/20] mpt3sas: driver update Sreekanth Reddy
2015-06-12  9:42 ` [PATCH 01/20] [SCSI] mpt3sas: Added Combined Reply Queue feature to extend up-to 96 MSIX vector support Sreekanth Reddy
2015-06-12 11:09   ` Johannes Thumshirn
2015-06-12 11:16     ` Sreekanth Reddy
2015-06-12 11:16       ` Sreekanth Reddy
2015-06-18  9:57       ` Sreekanth Reddy
2015-06-18  9:57         ` Sreekanth Reddy
2015-06-19  9:14         ` Johannes Thumshirn
2015-06-19  9:14           ` Johannes Thumshirn
2015-06-19  9:21           ` Sreekanth Reddy
2015-06-19  9:21             ` Sreekanth Reddy
2015-06-19  9:55             ` Johannes Thumshirn
2015-06-19  9:55               ` Johannes Thumshirn
2015-06-12  9:42 ` [PATCH 02/20] [SCSI] mpt3sas: Get IOC_FACTS information using handshake protocol only after HBA card gets into READY or Operational state Sreekanth Reddy
2015-06-16 15:59   ` Tomas Henzl
2015-06-17  9:08     ` Sreekanth Reddy
2015-06-12  9:42 ` Sreekanth Reddy [this message]
2015-06-19 15:05   ` [PATCH 03/20] [SCSI] mpt3sas: Don't block the drive when drive addition under the control of SML Martin K. Petersen
2015-06-19 15:05     ` Martin K. Petersen
2015-06-12  9:42 ` [PATCH 04/20] [SCSI] mpt3sas: Remove redundancy code while freeing the controller resources Sreekanth Reddy
2015-06-12 11:28   ` Johannes Thumshirn
2015-06-12 12:18     ` Sreekanth Reddy
2015-06-12 12:40       ` Johannes Thumshirn
2015-06-15 10:26         ` Sreekanth Reddy
2015-06-15 10:26           ` Sreekanth Reddy
2015-06-15 10:48           ` Johannes Thumshirn
2015-06-15 10:48             ` Johannes Thumshirn
2015-06-18  9:52             ` Sreekanth Reddy
2015-06-18  9:52               ` Sreekanth Reddy
2015-06-18 10:08   ` Johannes Thumshirn
2015-06-19 15:09   ` Martin K. Petersen
2015-06-19 15:09     ` Martin K. Petersen
2015-06-12  9:42 ` [PATCH 05/20] [SCSI] mpt3sas: MPI 2.5 Rev I (2.5.4) specifications Sreekanth Reddy
2015-06-15  9:51   ` Johannes Thumshirn
2015-06-19 15:10   ` Martin K. Petersen
2015-06-19 15:10     ` Martin K. Petersen
2015-06-12  9:42 ` [PATCH 06/20] [SCSI] mpt3sas: Provides the physical location of sas drives Sreekanth Reddy
2015-06-18  9:56   ` Sreekanth Reddy
2015-06-19  9:19   ` Johannes Thumshirn
2015-06-19  9:19     ` Johannes Thumshirn
2015-06-19 10:53     ` Sreekanth Reddy
2015-06-19 10:53       ` Sreekanth Reddy
2015-06-12  9:42 ` [PATCH 07/20] [SCSI] mpt3sas: Bump mpt3sas Driver version to v5.100.00.00 Sreekanth Reddy
2015-06-15  9:52   ` Johannes Thumshirn
2015-06-19 20:22   ` Martin K. Petersen
2015-06-19 20:22     ` Martin K. Petersen
2015-06-12  9:42 ` [PATCH 08/20] [SCSI] mpt3sas: Update MPI2 strings to MPI2.5 Sreekanth Reddy
2015-06-15  9:52   ` Johannes Thumshirn
2015-06-15  9:52     ` Johannes Thumshirn
2015-06-19 20:24   ` Martin K. Petersen
2015-06-19 20:24     ` Martin K. Petersen
2015-06-12  9:42 ` [PATCH 09/20] [SCSI] mpt3sas: MPI 2.5 Rev J (2.5.5) specification and 2.00.34 header files Sreekanth Reddy
2015-06-15  9:53   ` Johannes Thumshirn
2015-06-15  9:53     ` Johannes Thumshirn
2015-06-19 20:27   ` Martin K. Petersen
2015-06-19 20:27     ` Martin K. Petersen
2015-06-22 12:18     ` Sreekanth Reddy
2015-06-22 12:18       ` Sreekanth Reddy
2015-06-12  9:42 ` [PATCH 10/20] [SCSI] mpt3sas: Add branding string support for OEM's HBA Sreekanth Reddy
2015-06-15  9:46   ` Johannes Thumshirn
2015-06-15  9:46     ` Johannes Thumshirn
2015-06-15 11:11     ` Sreekanth Reddy
2015-06-15 11:11       ` Sreekanth Reddy
2015-06-15 11:53       ` Johannes Thumshirn
2015-06-15 12:00         ` Sreekanth Reddy
2015-06-18  9:51           ` Sreekanth Reddy
2015-06-18 10:09   ` Johannes Thumshirn
2015-06-18 10:09     ` Johannes Thumshirn
2015-06-19 20:30   ` Martin K. Petersen
2015-06-19 20:30     ` Martin K. Petersen
2015-06-12  9:42 ` [PATCH 11/20] [SCSI] mpt3sas: Add branding string support for OEM custom HBA Sreekanth Reddy
2015-06-18  9:55   ` Sreekanth Reddy
2015-06-19 20:34   ` Martin K. Petersen
2015-06-19 20:34     ` Martin K. Petersen
2015-06-12  9:42 ` [PATCH 12/20] [SCSI] mpt3sas: Bump mpt3sas driver version to v6.100.00.00 Sreekanth Reddy
2015-06-15  9:53   ` Johannes Thumshirn
2015-06-15  9:53     ` Johannes Thumshirn
2015-06-19 20:35   ` Martin K. Petersen
2015-06-19 20:35     ` Martin K. Petersen
2015-06-12  9:42 ` [PATCH 13/20] [SCSI] mpt3sas: MPI 2.5 Rev K (2.5.6) specifications Sreekanth Reddy
2015-06-15  9:54   ` Johannes Thumshirn
2015-06-15  9:54     ` Johannes Thumshirn
2015-06-19 20:36   ` Martin K. Petersen
2015-06-19 20:36     ` Martin K. Petersen
2015-06-12  9:42 ` [PATCH 14/20] [SCSI] mpt3sas: Complete the SCSI command with DID_RESET status for log_info value 0x0x32010081 Sreekanth Reddy
2015-06-15 10:01   ` Johannes Thumshirn
2015-06-15 11:01     ` Sreekanth Reddy
2015-06-15 11:01       ` Sreekanth Reddy
2015-06-12  9:42 ` [PATCH 15/20] [SCSI] mpt3sas: Return host busy error status to SML when DMA mapping of scatter gather list fails for a SCSI command Sreekanth Reddy
2015-06-15  9:54   ` Johannes Thumshirn
2015-06-19 20:40   ` Martin K. Petersen
2015-06-19 20:40     ` Martin K. Petersen
2015-06-12  9:42 ` [PATCH 16/20] [SCSI] mpt3sas: Added support for customer specific branding Sreekanth Reddy
2015-06-18  9:53   ` Sreekanth Reddy
2015-06-19 20:44   ` Martin K. Petersen
2015-06-19 20:44     ` Martin K. Petersen
2015-06-22 12:26     ` Sreekanth Reddy
2015-06-22 12:26       ` Sreekanth Reddy
2015-06-22 20:36       ` Martin K. Petersen
2015-06-22 20:36         ` Martin K. Petersen
2015-06-25 13:40         ` Sreekanth Reddy
2015-06-12  9:42 ` [PATCH 17/20] [SCSI] mpt3sas: Use alloc_ordered_workqueue() API instead of create_singlethread_workqueue() API Sreekanth Reddy
2015-06-12 21:03   ` Joe Lawrence
2015-06-12 21:03     ` Joe Lawrence
2015-06-15 10:56     ` Sreekanth Reddy
2015-06-15 21:05       ` James Bottomley
2015-06-16  5:03         ` Sreekanth Reddy
2015-06-12  9:42 ` [PATCH 18/20] [SCSI] mpt3sas: Call dma_mapping_error() API after mapping an address with dma_map_single() API Sreekanth Reddy
2015-06-15  9:55   ` Johannes Thumshirn
2015-06-19 20:47   ` Martin K. Petersen
2015-06-19 20:47     ` Martin K. Petersen
2015-06-12  9:42 ` [PATCH 19/20] [SCSI] mpt3sas: When device is blocked followed by unblock fails, unfreeze the I/Os Sreekanth Reddy
2015-06-15  9:58   ` Johannes Thumshirn
2015-06-12  9:42 ` [PATCH 20/20] [SCSI] mpt3sas : Bump mpt3sas driver version to 9.100.00.00 Sreekanth Reddy
2015-06-15  9:56   ` Johannes Thumshirn
2015-06-19 21:01   ` Martin K. Petersen
2015-06-19 21:01     ` Martin K. Petersen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1434102153-38581-4-git-send-email-Sreekanth.Reddy@avagotech.com \
    --to=sreekanth.reddy@avagotech.com \
    --cc=JBottomley@Parallels.com \
    --cc=Sathya.Prakash@avagotech.com \
    --cc=hch@infradead.org \
    --cc=jejb@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.