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

Commit 29cfc2ab authored by Martin Wilck's avatar Martin Wilck Committed by Martin K. Petersen
Browse files

scsi: devinfo: add BLIST_RETRY_ITF for EMC Symmetrix 



EMC Symmetrix returns 'internal target error' for a variety of
conditions, most of which will be transient.  So we should always retry
it, even with failfast set.  Otherwise we'd get spurious path flaps with
multipath.

Signed-off-by: default avatarMartin Wilck <mwilck@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 358fda5f

drivers/scsi/scsi_devinfo.c

+2 −1
Original line number Diff line number Diff line
@@ -161,7 +161,8 @@ static struct { 
	{"DGC", "RAID", NULL, BLIST_SPARSELUN},	/* EMC CLARiiON, storage on LUN 0 */

	{"DGC", "DISK", NULL, BLIST_SPARSELUN},	/* EMC CLARiiON, no storage on LUN 0 */

	{"EMC",  "Invista", "*", BLIST_SPARSELUN | BLIST_LARGELUN},

	{"EMC", "SYMMETRIX", NULL, BLIST_SPARSELUN | BLIST_LARGELUN | BLIST_REPORTLUN2},

	{"EMC", "SYMMETRIX", NULL, BLIST_SPARSELUN | BLIST_LARGELUN |

	 BLIST_REPORTLUN2 | BLIST_RETRY_ITF},

	{"EMULEX", "MD21/S2     ESDI", NULL, BLIST_SINGLELUN},

	{"easyRAID", "16P", NULL, BLIST_NOREPORTLUN},

	{"easyRAID", "X6P", NULL, BLIST_NOREPORTLUN},

drivers/scsi/scsi_error.c

+4 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <scsi/scsi_host.h>

#include <scsi/scsi_ioctl.h>

#include <scsi/scsi_dh.h>

#include <scsi/scsi_devinfo.h>

#include <scsi/sg.h>



#include "scsi_priv.h"
@@ -525,6 +526,9 @@ int scsi_check_sense(struct scsi_cmnd *scmd) 
		if (sshdr.asc == 0x10) /* DIF */

			return SUCCESS;



		if (sshdr.asc == 0x44 && sdev->sdev_bflags & BLIST_RETRY_ITF)

			return ADD_TO_MLQUEUE;



		return NEEDS_RETRY;

	case NOT_READY:

	case UNIT_ATTENTION:

include/scsi/scsi_devinfo.h

+3 −1
Original line number Diff line number Diff line
@@ -63,8 +63,10 @@ 
#define BLIST_MAX_1024		((__force blist_flags_t)(1ULL << 30))

/* Use UNMAP limit for WRITE SAME */

#define BLIST_UNMAP_LIMIT_WS	((__force blist_flags_t)(1ULL << 31))

/* Always retry ABORTED_COMMAND with Internal Target Failure */

#define BLIST_RETRY_ITF		((__force blist_flags_t)(1ULL << 32))



#define __BLIST_LAST_USED BLIST_UNMAP_LIMIT_WS

#define __BLIST_LAST_USED BLIST_RETRY_ITF



#define __BLIST_HIGH_UNUSED (~(__BLIST_LAST_USED | \

			       (__force blist_flags_t) \