From: Hannes Reinecke <hare@suse.de>
To: Christoph Hellwig <hch@lst.de>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>,
James Bottomley <james.bottomley@hansenpartnership.com>,
linux-scsi@vger.kernel.org, Hannes Reinecke <hare@suse.de>
Subject: [PATCH 07/17] xen-scsifront: add scsi device as argument to scsifront_do_request()
Date: Mon, 16 Oct 2023 11:24:20 +0200 [thread overview]
Message-ID: <20231016092430.55557-8-hare@suse.de> (raw)
In-Reply-To: <20231016092430.55557-1-hare@suse.de>
Add scsi device as argument to scsifront_do_request() so that it
will be possible to call it with a NULL command pointer.
Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
drivers/scsi/xen-scsifront.c | 31 ++++++++++++++++++++-----------
1 file changed, 20 insertions(+), 11 deletions(-)
diff --git a/drivers/scsi/xen-scsifront.c b/drivers/scsi/xen-scsifront.c
index 9ec55ddc1204..a0c13200d53a 100644
--- a/drivers/scsi/xen-scsifront.c
+++ b/drivers/scsi/xen-scsifront.c
@@ -178,7 +178,8 @@ static void scsifront_put_rqid(struct vscsifrnt_info *info, uint32_t id)
scsifront_wake_up(info);
}
-static int scsifront_do_request(struct vscsifrnt_info *info,
+static int scsifront_do_request(struct scsi_device *sdev,
+ struct vscsifrnt_info *info,
struct vscsifrnt_shadow *shadow)
{
struct vscsiif_front_ring *ring = &(info->ring);
@@ -205,17 +206,25 @@ static int scsifront_do_request(struct vscsifrnt_info *info,
ring_req->ref_rqid = shadow->ref_rqid;
ring_req->nr_segments = shadow->nr_segments;
- ring_req->id = sc->device->id;
- ring_req->lun = sc->device->lun;
- ring_req->channel = sc->device->channel;
- ring_req->cmd_len = sc->cmd_len;
+ ring_req->id = sdev->id;
+ ring_req->lun = sdev->lun;
+ ring_req->channel = sdev->channel;
- BUG_ON(sc->cmd_len > VSCSIIF_MAX_COMMAND_SIZE);
+ if (sc) {
+ ring_req->cmd_len = sc->cmd_len;
- memcpy(ring_req->cmnd, sc->cmnd, sc->cmd_len);
+ BUG_ON(sc->cmd_len > VSCSIIF_MAX_COMMAND_SIZE);
- ring_req->sc_data_direction = (uint8_t)sc->sc_data_direction;
- ring_req->timeout_per_command = scsi_cmd_to_rq(sc)->timeout / HZ;
+ memcpy(ring_req->cmnd, sc->cmnd, sc->cmd_len);
+
+ ring_req->sc_data_direction = (uint8_t)sc->sc_data_direction;
+ ring_req->timeout_per_command =
+ scsi_cmd_to_rq(sc)->timeout / HZ;
+ } else {
+ ring_req->cmd_len = VSCSIIF_MAX_COMMAND_SIZE;
+ memset(ring_req->cmnd, 0, VSCSIIF_MAX_COMMAND_SIZE);
+ ring_req->sc_data_direction = DMA_NONE;
+ }
for (i = 0; i < (shadow->nr_segments & ~VSCSIIF_SG_GRANT); i++)
ring_req->seg[i] = shadow->seg[i];
@@ -637,7 +646,7 @@ static int scsifront_queuecommand(struct Scsi_Host *shost,
return 0;
}
- if (scsifront_do_request(info, shadow)) {
+ if (scsifront_do_request(sc->device, info, shadow)) {
scsifront_gnttab_done(info, shadow);
goto busy;
}
@@ -685,7 +694,7 @@ static int scsifront_action_handler(struct scsi_cmnd *sc, uint8_t act)
if (scsifront_enter(info))
goto fail;
- if (!scsifront_do_request(info, shadow))
+ if (!scsifront_do_request(sc->device, info, shadow))
break;
scsifront_return(info);
--
2.35.3
next prev parent reply other threads:[~2023-10-16 9:25 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-16 9:24 [PATCHv6 00/17] scsi: EH rework prep patches, part 2 Hannes Reinecke
2023-10-16 9:24 ` [PATCH 01/17] pmcraid: add missing scsi_device_put() in pmcraid_eh_target_reset_handler() Hannes Reinecke
2023-10-16 13:29 ` Christoph Hellwig
2023-10-16 13:37 ` Hannes Reinecke
2023-10-16 9:24 ` [PATCH 02/17] zfcp: do not wait for rports to become unblocked after host reset Hannes Reinecke
2023-10-16 9:24 ` [PATCH 03/17] bfa: Do not use scsi command to signal TMF status Hannes Reinecke
2023-10-16 13:35 ` Christoph Hellwig
2023-10-16 9:24 ` [PATCH 04/17] aha152x: look for stuck command when resetting device Hannes Reinecke
2023-10-16 13:35 ` Christoph Hellwig
2023-10-16 9:24 ` [PATCH 05/17] a1000u2w: do not rely on the command for inia100_device_reset() Hannes Reinecke
2023-10-16 13:36 ` Christoph Hellwig
2023-10-16 9:24 ` [PATCH 06/17] fas216: Rework device reset to not rely on SCSI command pointer Hannes Reinecke
2023-10-16 9:24 ` Hannes Reinecke [this message]
2023-10-16 9:24 ` [PATCH 08/17] xen-scsifront: rework scsifront_action_handler() Hannes Reinecke
2023-10-16 13:36 ` Christoph Hellwig
2023-10-16 9:24 ` [PATCH 09/17] libiscsi: use cls_session as argument for target and session reset Hannes Reinecke
2023-10-19 20:02 ` Mike Christie
2023-10-20 5:53 ` Hannes Reinecke
2023-10-20 16:55 ` michael.christie
2023-10-16 9:24 ` [PATCH 10/17] scsi_transport_iscsi: use session as argument for iscsi_block_scsi_eh() Hannes Reinecke
2023-10-16 9:24 ` [PATCH 11/17] snic: reserve tag for TMF Hannes Reinecke
2023-10-16 13:37 ` Christoph Hellwig
2023-10-16 9:24 ` [PATCH 12/17] snic: allocate device reset command Hannes Reinecke
2023-10-16 13:38 ` Christoph Hellwig
2023-10-16 14:58 ` Hannes Reinecke
2023-10-16 9:24 ` [PATCH 13/17] snic: Use scsi_host_busy_iter() to traverse commands Hannes Reinecke
2023-10-16 9:24 ` [PATCH 14/17] fnic: allocate device reset command on the fly Hannes Reinecke
2023-10-17 6:37 ` Christoph Hellwig
2023-10-16 9:24 ` [PATCH 15/17] fnic: use fc_block_rport() correctly Hannes Reinecke
2023-10-16 9:24 ` [PATCH 16/17] csiostor: use separate TMF command Hannes Reinecke
2023-10-17 6:37 ` Christoph Hellwig
2023-10-16 9:24 ` [PATCH 17/17] dc395x: Remove 'scmd' parameter from doing_srb_done() Hannes Reinecke
2023-10-17 6:38 ` Christoph Hellwig
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=20231016092430.55557-8-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