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

Commit cdd92ebe authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Greg Kroah-Hartman
Browse files

scsi: scsi_dh_alua: always use a 2 second delay before retrying RTPG 



[ Upstream commit 20122994e38aef0ae50555884d287adde6641c94 ]

Retrying immediately after we've received a 'transitioning' sense code is
pretty much pointless, we should always use a delay before retrying.  So
ensure the default delay is applied before retrying.

Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Tested-by: default avatarZhangguanghui <zhang.guanghui@h3c.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent b620c6d5

drivers/scsi/device_handler/scsi_dh_alua.c

+6 −1
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
#define ALUA_FAILOVER_TIMEOUT		60

#define ALUA_FAILOVER_RETRIES		5

#define ALUA_RTPG_DELAY_MSECS		5

#define ALUA_RTPG_RETRY_DELAY		2



/* device handler flags */

#define ALUA_OPTIMIZE_STPG		0x01
@@ -696,7 +697,7 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg) 
	case SCSI_ACCESS_STATE_TRANSITIONING:

		if (time_before(jiffies, pg->expiry)) {

			/* State transition, retry */

			pg->interval = 2;

			pg->interval = ALUA_RTPG_RETRY_DELAY;

			err = SCSI_DH_RETRY;

		} else {

			struct alua_dh_data *h;
@@ -821,6 +822,8 @@ static void alua_rtpg_work(struct work_struct *work) 
				spin_lock_irqsave(&pg->lock, flags);

				pg->flags &= ~ALUA_PG_RUNNING;

				pg->flags |= ALUA_PG_RUN_RTPG;

				if (!pg->interval)

					pg->interval = ALUA_RTPG_RETRY_DELAY;

				spin_unlock_irqrestore(&pg->lock, flags);

				queue_delayed_work(kaluad_wq, &pg->rtpg_work,

						   pg->interval * HZ);
@@ -832,6 +835,8 @@ static void alua_rtpg_work(struct work_struct *work) 
		spin_lock_irqsave(&pg->lock, flags);

		if (err == SCSI_DH_RETRY || pg->flags & ALUA_PG_RUN_RTPG) {

			pg->flags &= ~ALUA_PG_RUNNING;

			if (!pg->interval && !(pg->flags & ALUA_PG_RUN_RTPG))

				pg->interval = ALUA_RTPG_RETRY_DELAY;

			pg->flags |= ALUA_PG_RUN_RTPG;

			spin_unlock_irqrestore(&pg->lock, flags);

			queue_delayed_work(kaluad_wq, &pg->rtpg_work,