megaraid_sas: Fix for IO failing post OCR in SRIOV environment

Driver assumes that VFs always have peers present whenever they have
same LD IDs. But this is not the case.  This patch handles the above
mentioned by explicitly checking for a peer before making HA/non-HA path
decision.

Signed-off-by: Uday Lingala <uday.lingala@avagotech.com>
Signed-off-by: Sumit Saxena <sumit.saxena@avagotech.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

1 files changed, 26 insertions, 16 deletions

diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index be9c3f1b9def..d9d0029fb1b0 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -3325,27 +3325,37 @@ out:
         return ret;
 }
 
+/*SRIOV get other instance in cluster if any*/
+struct megasas_instance *megasas_get_peer_instance(struct megasas_instance *instance)
+{
+        int i;
+
+        for (i = 0; i < MAX_MGMT_ADAPTERS; i++) {
+                if (megasas_mgmt_info.instance[i] &&
+                        (megasas_mgmt_info.instance[i] != instance) &&
+                         megasas_mgmt_info.instance[i]->requestorId &&
+                         megasas_mgmt_info.instance[i]->peerIsPresent &&
+                        (memcmp((megasas_mgmt_info.instance[i]->clusterId),
+                        instance->clusterId, MEGASAS_CLUSTER_ID_SIZE) == 0))
+                        return megasas_mgmt_info.instance[i];
+        }
+        return NULL;
+}
+
 /* Check for a second path that is currently UP */
 int megasas_check_mpio_paths(struct megasas_instance *instance,
         struct scsi_cmnd *scmd)
 {
-        int i, j, retval = (DID_RESET << 16);
-
-        if (instance->mpio && instance->requestorId) {
-                for (i = 0 ; i < MAX_MGMT_ADAPTERS ; i++)
-                        for (j = 0 ; j < MAX_LOGICAL_DRIVES; j++)
-                                if (megasas_mgmt_info.instance[i] &&
-                                    (megasas_mgmt_info.instance[i] != instance) &&
-                                    megasas_mgmt_info.instance[i]->mpio &&
-                                    megasas_mgmt_info.instance[i]->requestorId
-                                    &&
-                                    (megasas_mgmt_info.instance[i]->ld_ids[j]
-                                     == scmd->device->id)) {
-                                            retval = (DID_NO_CONNECT << 16);
-                                            goto out;
-                                }
+        struct megasas_instance *peer_instance = NULL;
+        int retval = (DID_RESET << 16);
+
+        if (instance->peerIsPresent) {
+                peer_instance = megasas_get_peer_instance(instance);
+                if ((peer_instance) &&
+                        (atomic_read(&peer_instance->adprecovery) ==
+                        MEGASAS_HBA_OPERATIONAL))
+                        retval = (DID_NO_CONNECT << 16);
         }
-out:
         return retval;
 }