scsi: scsi_debug: Fix hrtimer support for ndelay

johnpgarry · martinkpetersen · commit 6918141d815a · 2024-12-04T13:22:59.000-05:00
Since commit 771f712 ("scsi: scsi_debug: Fix cmd duration calculation"), ns_from_boot value is only evaluated in schedule_resp() for polled requests. However, ns_from_boot is also required for hrtimer support for when ndelay is less than INCLUSIVE_TIMING_MAX_NS, so fix up the logic to decide when to evaluate ns_from_boot. Fixes: 771f712 ("scsi: scsi_debug: Fix cmd duration calculation") Signed-off-by: John Garry <john.g.garry@oracle.com> Link: https://lore.kernel.org/r/20241202130045.2335194-1-john.g.garry@oracle.com Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
@@ -6447,7 +6447,7 @@ static int schedule_resp(struct scsi_cmnd *cmnd, struct sdebug_dev_info *devip,
 	}
 	sd_dp = &sqcp->sd_dp;
 
-	if (polled)
+	if (polled || (ndelay > 0 && ndelay < INCLUSIVE_TIMING_MAX_NS))
 		ns_from_boot = ktime_get_boottime_ns();
 
 	/* one of the resp_*() response functions is called here */

Original file line number	Diff line number	Diff line change
`@@ -6447,7 +6447,7 @@ static int schedule_resp(struct scsi_cmnd cmnd, struct sdebug_dev_info devip,`
`6447`	`6447`	`}`
`6448`	`6448`	`sd_dp = &sqcp->sd_dp;`
`6449`	`6449`
`6450`		`- if (polled)`
	`6450`	`+ if (polled \|\| (ndelay > 0 && ndelay < INCLUSIVE_TIMING_MAX_NS))`
`6451`	`6451`	`ns_from_boot = ktime_get_boottime_ns();`
`6452`	`6452`
`6453`	`6453`	`/* one of the resp_() response functions is called here /`