Does this really do what you want ? Don't you want something that dequeues
the request, and errors it out ?
The break from the look doesn't remove the request from the request queue. It
just stops servicing it. Thus, we have the "goose" function that kicks in if
the rport comes back, and if it doesn't, the queue gets removed (hmmm... now
that I think about it - I'm not sure what happens if the request queue has
items on it and the device gets torn down. Are we doing the right thing by
references, etc?).
So - to have what you want, I would think we need to add:
- something that gooses the queue when fastfail io timeout expires
- allows the requests to enter between fastfail io timeout and nodev
timeout and fails them.
It also says we aren't discriminating based on request type - e.g. any bsg
request fails back immediately after fastfail io timer. Nothing ever waits
until nodev tmo unless fastfail isn't configured.
Right ?
-- james s
michaelc@xxxxxxxxxxx wrote:
From: Mike Christie <michaelc@xxxxxxxxxxx>
If the port state is blocked and the fast io fail tmo has
fired then this patch will fail bsg requests immediately.
This is needed if userspace is sending IOs to test the transport
like with fcping, so it will not have to wait for the dev loss tmo.
With this patch he bsg req fast io fail code behaves like the normal
and sg io/passthrough fast io fail.
Patch was made over scsi-rc-fixes. It is only compiled tested.
I found this while looking over the iscsi bsg patch.
Signed-off-by: Mike Christie <michaelc@xxxxxxxxxxx>
Cc: james.smart@xxxxxxxxxx <james.smart@xxxxxxxxxx>
---
drivers/scsi/scsi_transport_fc.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index c6f70da..1004684 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -3769,8 +3769,9 @@ fc_bsg_request_handler(struct request_queue *q, struct Scsi_Host *shost,
return;
while (!blk_queue_plugged(q)) {
- if (rport && (rport->port_state == FC_PORTSTATE_BLOCKED))
- break;
+ if (rport && (rport->port_state == FC_PORTSTATE_BLOCKED) &&
+ !(rport->flags & FC_RPORT_FAST_FAIL_TIMEDOUT))
+ break;
req = blk_fetch_request(q);
if (!req)
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
