On 03/16/2017 12:01 PM, Benjamin Block wrote: > On Wed, Mar 15, 2017 at 02:54:16PM +0100, Hannes Reinecke wrote: >> On 03/14/2017 06:56 PM, Benjamin Block wrote: >>> Hello Hannes, >>> >>> On Wed, Mar 01, 2017 at 10:15:18AM +0100, Hannes Reinecke wrote: >>>> When a command is sent as part of the error handling there >>>> is not point whatsoever to start EH escalation when that >>>> command fails; we are _already_ in the error handler, >>>> and the escalation is about to commence anyway. >>>> So just call 'scsi_try_to_abort_cmd()' to abort outstanding >>>> commands and let the main EH routine handle the rest. >>>> >>>> Signed-off-by: Hannes Reinecke <hare@xxxxxxx> >>>> Reviewed-by: Johannes Thumshirn <jthumshirn@xxxxxxx> >>>> Reviewed-by: Bart Van Assche <bart.vanassche@xxxxxxxxxxx> >>>> --- >>>> drivers/scsi/scsi_error.c | 11 +---------- >>>> 1 file changed, 1 insertion(+), 10 deletions(-) >>>> >>>> diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c >>>> index e1ca3b8..4613aa1 100644 >>>> --- a/drivers/scsi/scsi_error.c >>>> +++ b/drivers/scsi/scsi_error.c >>>> @@ -889,15 +889,6 @@ static int scsi_try_to_abort_cmd(struct scsi_host_template *hostt, >>>> return hostt->eh_abort_handler(scmd); >>>> } >>>> >>>> -static void scsi_abort_eh_cmnd(struct scsi_cmnd *scmd) >>>> -{ >>>> - if (scsi_try_to_abort_cmd(scmd->device->host->hostt, scmd) != SUCCESS) >>>> - if (scsi_try_bus_device_reset(scmd) != SUCCESS) >>>> - if (scsi_try_target_reset(scmd) != SUCCESS) >>>> - if (scsi_try_bus_reset(scmd) != SUCCESS) >>>> - scsi_try_host_reset(scmd); >>>> -} >>>> - >>>> /** >>>> * scsi_eh_prep_cmnd - Save a scsi command info as part of error recovery >>>> * @scmd: SCSI command structure to hijack >>>> @@ -1082,7 +1073,7 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd, >>>> break; >>>> } >>>> } else if (rtn != FAILED) { >>>> - scsi_abort_eh_cmnd(scmd); >>>> + scsi_try_to_abort_cmd(shost->hostt, scmd); >>>> rtn = FAILED; >>>> } >>> >>> The idea is sound, but this implementation would cause "use-after-free"s. >>> >>> I only know our own LLD well enough to judge, but with zFCP there will >>> always be a chance that an abort fails - be it memory pressure, >>> hardware/firmware behavior or internal EH in zFCP. >>> >>> Calling queuecommand() will mean for us in the LLD, that we allocate a >>> unique internal request struct for the scsi_cmnd (struct >>> zfcp_fsf_request) and add that to our internal hash-table with >>> outstanding commands. We assume this scsi_cmnd-pointer is ours till we >>> complete it via scsi_done are yield it via successful EH-actions. >>> >>> In case the abort fails, you fail to take back the ownership over the >>> scsi command. Which in turn means possible "use-after-free"s when we >>> still thinks the scsi command is ours, but EH has already overwritten >>> the scsi-command with the original one. When we still get an answer or >>> otherwise use the scsi_cmnd-pointer we would access an invalid one. >>> >> That is actually not try. >> As soon as we're calling 'scsi_try_to_abort_command()' ownership is >> assumed to reside in the SCSI midlayer; > > That can not be true. First of all, look at the function itself (v4.10): > > static int scsi_try_to_abort_cmd... > { > if (!hostt->eh_abort_handler) > return FAILED; > > return hostt->eh_abort_handler(scmd); > } > > If what you say is true, then this whole API of LLDs providing or > choosing not to provide implementations for these function would be > fundamentally broken. > The function itself returns FAILED when there is no such function.. how > is a LLD that does not implement it ever to know that you took ownership > by calling scsi_try_to_abort_cmd()? > Well. Ok. _Actually_, the whole concept of 'ownership' in SCSI EH is a bit flaky. There are two ways of entering the error handler: - SCSI command timeout - Failing to evaluate the SCSI command status For the latter case ownership already _is_ with the SCSI midlayer, as the LLDD called 'scsi_done' and with that moved ownership to the midlayer. The interesting part is command timeout. Once a command timeout triggers the block layer is calling 'blk_mark_rq_complete' to avoid any concurrent completions. IE any calls to scsi_done() will be short-circuited with that, effectively transferring ownership to SCSI midlayer. Now the SCSI midlayer has to inform the LLDD that it has taken ownership; for that it calls the various eh_XXX callbacks into the LLDD. While it's quite clear that SUCCESS signals a transfer of ownership to SCSI ML, it's less clear what happens in the case of FAILED. Problem here is that the eh_XXX callbacks actually serve a dual purpose; one it to signal the transfer of ownership to SCSI ML and the other is to actually _do_ some action on that command. But as FAILED is just _one_ value we have no idea in the midlayer if the change of ownership actually took place. Which leads to the curious effect that _ultimatively_ control still resides with the LLDD when host_reset fails, so we actually should _never_ release the scsi command once host reset fails. With scsi_try_to_abort() things are slightly different in the way that it's called _without_ SCSI EH being engaged. However, as scsi_try_to_abort() is called from the timeout handler (which assumes that ownership does now reside with the midlayer) I don't see a problem with that. Where you are right, in fact, is that we should not return FAILED when calling scsi_try_to_abort() when cleaning up EH commands; if the driver does not implement this function then no cleanup can be done, so calling scsi_try_to_abort() is just us being nice. And I actually can see a problem with cleaning up EH commands if scsi_try_to_abort() returns FAILED; then the LLDD has potential _two_ stale references, one for the original command and one for the command send from SCSI EH. The only way I would imagine this ever worked was by _reusing_ the references to the original command, effectively sending the TMF with the same credentials the original SCSI command had. If a driver (for whatever reason) does _not_ do this things will fall apart indeed. However, this was always a problem with SCSI EH; even with the original codepath we would have this problem, so I don't think it's a problem with this patchset. Nevertheless, I'll be adding a fix for eh_try_to_abort() in the context of cleaning up EH commands. Cheers, Hannes -- Dr. Hannes Reinecke Teamlead Storage & Networking hare@xxxxxxx +49 911 74053 688 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton HRB 21284 (AG Nürnberg)