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

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

scsi: devinfo: BLIST_RETRY_ASC_C1 for Fujitsu ETERNUS 



On Fujitsu ETERNUS systems, sense code ABORTED COMMAND with ASC/Q C1/01
is used to indicate temporary condition where the storage-internal path
to a target is switched from one controller to another. SCSI commands
that return with this error code must be retried unconditionally
(i.e. without the "maybe_retry" logic in scsi_decide_disposition);
otherwise dm-multipath might initiate a failover from a healthy path
e.g. for REQ_FAILFAST_DEV commands.

Introduce a new blist flag for this case.

[mkp: applied by hand]

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

drivers/scsi/scsi_devinfo.c

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ static struct { 
	{"easyRAID", "X6P", NULL, BLIST_NOREPORTLUN},

	{"easyRAID", "F8", NULL, BLIST_NOREPORTLUN},

	{"FSC", "CentricStor", "*", BLIST_SPARSELUN | BLIST_LARGELUN},

	{"FUJITSU", "ETERNUS_DXM", "*", BLIST_RETRY_ASC_C1},

	{"Generic", "USB SD Reader", "1.00", BLIST_FORCELUN | BLIST_INQUIRY_36},

	{"Generic", "USB Storage-SMC", NULL, BLIST_FORCELUN | BLIST_INQUIRY_36}, /* FW: 0180 and 0207 */

	{"HITACHI", "DF400", "*", BLIST_REPORTLUN2},

drivers/scsi/scsi_error.c

+3 −0
Original line number Diff line number Diff line
@@ -528,6 +528,9 @@ int scsi_check_sense(struct scsi_cmnd *scmd) 


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

			return ADD_TO_MLQUEUE;

		if (sshdr.asc == 0xc1 && sshdr.ascq == 0x01 &&

		    sdev->sdev_bflags & BLIST_RETRY_ASC_C1)

			return ADD_TO_MLQUEUE;



		return NEEDS_RETRY;

	case NOT_READY:

include/scsi/scsi_devinfo.h

+3 −1
Original line number Diff line number Diff line
@@ -65,8 +65,10 @@ 
#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))

/* Always retry ABORTED_COMMAND with ASC 0xc1 */

#define BLIST_RETRY_ASC_C1	((__force blist_flags_t)(1ULL << 33))



#define __BLIST_LAST_USED BLIST_RETRY_ITF

#define __BLIST_LAST_USED BLIST_RETRY_ASC_C1



#define __BLIST_HIGH_UNUSED (~(__BLIST_LAST_USED | \

			       (__force blist_flags_t) \