Skip to contentSkip to conversation

scsi_debug: reset injection flags for every_nth > 0

PATCH Applied Martin Wilck 2 participants 2 messages Jan 29, 2018 – Feb 14, 2018 1 message not in the archive SCSI

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Martin Wilck

author
#1 lore raw

PATCH 2/2 scsi_debug: reset injection flags for every_nth > 0

If every_nth > 0, the injection flags must be reset for commands that aren't supposed to fail (i.e. that aren't "nth"). Otherwise, commands will continue to fail, like in the every_nth < 0 case.

Signed-off-by Martin Wilck <[email protected]>
---
 drivers/scsi/scsi_debug.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/scsi/scsi_debug.c +6 -1
index 86c48797381e..820b98853e69 100644
@@ -3988,8 +3988,13 @@ static void clear_queue_stats(void)
 static void setup_inject(struct sdebug_queue *sqp,
 			 struct sdebug_queued_cmd *sqcp)
 {
-	if ((atomic_read(&sdebug_cmnd_count) % abs(sdebug_every_nth)) > 0)
+	if ((atomic_read(&sdebug_cmnd_count) % abs(sdebug_every_nth)) > 0) {
+		if (sdebug_every_nth > 0)
+			sqcp->inj_recovered = sqcp->inj_transport
+				= sqcp->inj_dif
+				= sqcp->inj_dix = sqcp->inj_short = 0;
 		return;
+	}
 	sqcp->inj_recovered = !!(SDEBUG_OPT_RECOVERED_ERR & sdebug_opts);
 	sqcp->inj_transport = !!(SDEBUG_OPT_TRANSPORT_ERR & sdebug_opts);
 	sqcp->inj_dif = !!(SDEBUG_OPT_DIF_ERR & sdebug_opts);
Signature · 1 line
2.16.1
Applied
#2 lore raw

Martin,

Quoted 3 lines

If every_nth > 0, the injection flags must be reset for commands that aren't supposed to fail (i.e. that aren't "nth"). Otherwise, commands will continue to fail, like in the every_nth < 0 case.

Applied to 4.17/scsi-queue.

Please rebase patch 1/2. Thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering