From: Hannes Reinecke <hare@suse.de>
To: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>,
James Bottomley <james.bottomley@hansenpartnership.com>,
linux-scsi@vger.kernel.org, Hannes Reinecke <hare@suse.de>
Subject: [PATCH 05/16] fas216: Rework device reset to not rely on SCSI command pointer
Date: Tue, 17 Oct 2023 12:07:18 +0200 [thread overview]
Message-ID: <20231017100729.123506-6-hare@suse.de> (raw)
In-Reply-To: <20231017100729.123506-1-hare@suse.de>
The device reset code should not rely on the SCSI command pointer;
it will be going away with the device reset handler rework.
Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
drivers/scsi/arm/fas216.c | 39 +++++++++++++++++++--------------------
1 file changed, 19 insertions(+), 20 deletions(-)
diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c
index 4ce0b2d73614..e6289c6af5ef 100644
--- a/drivers/scsi/arm/fas216.c
+++ b/drivers/scsi/arm/fas216.c
@@ -1985,7 +1985,6 @@ static void fas216_devicereset_done(FAS216_Info *info, struct scsi_cmnd *SCpnt,
{
fas216_log(info, LOG_ERROR, "fas216 device reset complete");
- info->rstSCpnt = NULL;
info->rst_dev_status = 1;
wake_up(&info->eh_wait);
}
@@ -2143,12 +2142,12 @@ static void fas216_done(FAS216_Info *info, unsigned int result)
fas216_checkmagic(info);
- if (!info->SCpnt)
+ if (!info->SCpnt && info->rst_dev_status)
goto no_command;
SCpnt = info->SCpnt;
info->SCpnt = NULL;
- info->scsi.phase = PHASE_IDLE;
+ info->scsi.phase = PHASE_IDLE;
if (info->scsi.aborting) {
fas216_log(info, 0, "uncaught abort - returning DID_ABORT");
@@ -2160,7 +2159,7 @@ static void fas216_done(FAS216_Info *info, unsigned int result)
* Sanity check the completion - if we have zero bytes left
* to transfer, we should not have a valid pointer.
*/
- if (info->scsi.SCp.ptr && info->scsi.SCp.this_residual == 0) {
+ if (SCpnt && info->scsi.SCp.ptr && info->scsi.SCp.this_residual == 0) {
scmd_printk(KERN_INFO, SCpnt,
"zero bytes left to transfer, but buffer pointer still valid: ptr=%p len=%08x\n",
info->scsi.SCp.ptr, info->scsi.SCp.this_residual);
@@ -2173,12 +2172,18 @@ static void fas216_done(FAS216_Info *info, unsigned int result)
* the sense information, fas216_kick will re-assert the busy
* status.
*/
- info->device[SCpnt->device->id].parity_check = 0;
- clear_bit(SCpnt->device->id * 8 +
- (u8)(SCpnt->device->lun & 0x7), info->busyluns);
-
- fn = (void (*)(FAS216_Info *, struct scsi_cmnd *, unsigned int))SCpnt->host_scribble;
- fn(info, SCpnt, result);
+ if (SCpnt) {
+ info->device[SCpnt->device->id].parity_check = 0;
+ clear_bit(SCpnt->device->id * 8 +
+ (u8)(SCpnt->device->lun & 0x7), info->busyluns);
+ }
+ if (!info->rst_dev_status) {
+ info->rst_dev_status = 1;
+ wake_up(&info->eh_wait);
+ } else {
+ fn = (void (*)(FAS216_Info *, struct scsi_cmnd *, unsigned int))SCpnt->host_scribble;
+ fn(info, SCpnt, result);
+ }
if (info->scsi.irq) {
spin_lock_irqsave(&info->host_lock, flags);
@@ -2478,9 +2483,10 @@ int fas216_eh_abort(struct scsi_cmnd *SCpnt)
*/
int fas216_eh_device_reset(struct scsi_cmnd *SCpnt)
{
- FAS216_Info *info = (FAS216_Info *)SCpnt->device->host->hostdata;
+ struct scsi_device *sdev = SCpnt->device;
+ FAS216_Info *info = (FAS216_Info *)sdev->host->hostdata;
unsigned long flags;
- int i, res = FAILED, target = SCpnt->device->id;
+ int i, res = FAILED, target = sdev->id;
fas216_log(info, LOG_ERROR, "device reset for target %d", target);
@@ -2494,7 +2500,7 @@ int fas216_eh_device_reset(struct scsi_cmnd *SCpnt)
* and we need a bus reset.
*/
if (info->SCpnt && !info->scsi.disconnectable &&
- info->SCpnt->device->id == SCpnt->device->id)
+ info->SCpnt->device->id == sdev->id)
break;
/*
@@ -2512,14 +2518,7 @@ int fas216_eh_device_reset(struct scsi_cmnd *SCpnt)
for (i = 0; i < 8; i++)
clear_bit(target * 8 + i, info->busyluns);
- /*
- * Hijack this SCSI command structure to send
- * a bus device reset message to this device.
- */
- SCpnt->host_scribble = (void *)fas216_devicereset_done;
-
info->rst_dev_status = 0;
- info->rstSCpnt = SCpnt;
if (info->scsi.phase == PHASE_IDLE)
fas216_kick(info);
--
2.35.3
next prev parent reply other threads:[~2023-10-17 10:07 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-17 10:07 [PATCHv7 00/16] scsi: EH rework prep patches, part 2 Hannes Reinecke
2023-10-17 10:07 ` [PATCH 01/16] zfcp: do not wait for rports to become unblocked after host reset Hannes Reinecke
2023-10-19 17:44 ` Benjamin Block
2023-10-20 6:18 ` Hannes Reinecke
2023-10-17 10:07 ` [PATCH 02/16] bfa: Do not use scsi command to signal TMF status Hannes Reinecke
2023-10-17 10:07 ` [PATCH 03/16] aha152x: look for stuck command when resetting device Hannes Reinecke
2023-10-17 10:07 ` [PATCH 04/16] a1000u2w: do not rely on the command for inia100_device_reset() Hannes Reinecke
2023-10-17 10:07 ` Hannes Reinecke [this message]
2023-10-17 10:07 ` [PATCH 06/16] xen-scsifront: add scsi device as argument to scsifront_do_request() Hannes Reinecke
2023-10-17 10:07 ` [PATCH 07/16] xen-scsifront: rework scsifront_action_handler() Hannes Reinecke
2023-10-17 10:07 ` [PATCH 08/16] libiscsi: use cls_session as argument for target and session reset Hannes Reinecke
2023-10-17 10:07 ` [PATCH 09/16] scsi_transport_iscsi: use session as argument for iscsi_block_scsi_eh() Hannes Reinecke
2023-10-17 10:07 ` [PATCH 10/16] snic: reserve tag for TMF Hannes Reinecke
2023-10-17 10:07 ` [PATCH 11/16] snic: allocate device reset command Hannes Reinecke
2023-10-18 5:47 ` Christoph Hellwig
2023-10-17 10:07 ` [PATCH 12/16] snic: Use scsi_host_busy_iter() to traverse commands Hannes Reinecke
2023-10-17 10:07 ` [PATCH 13/16] fnic: allocate device reset command on the fly Hannes Reinecke
2023-10-17 10:07 ` [PATCH 14/16] fnic: use fc_block_rport() correctly Hannes Reinecke
2023-10-17 10:07 ` [PATCH 15/16] csiostor: use separate TMF command Hannes Reinecke
2023-10-17 10:07 ` [PATCH 16/16] dc395x: Remove 'scmd' parameter from doing_srb_done() Hannes Reinecke
-- strict thread matches above, loose matches on Subject: below --
2023-10-23 9:14 [PATCHv8 00/16] scsi: EH rework prep patches, part 2 Hannes Reinecke
2023-10-23 9:14 ` [PATCH 05/16] fas216: Rework device reset to not rely on SCSI command pointer Hannes Reinecke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231017100729.123506-6-hare@suse.de \
--to=hare@suse.de \
--cc=hch@lst.de \
--cc=james.bottomley@hansenpartnership.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox