From: Tyrel Datwyler <tyreld@linux.ibm.com>
To: james.bottomley@hansenpartnership.com
Cc: martin.petersen@oracle.com, linux-scsi@vger.kernel.org,
linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org,
brking@linux.ibm.com, Tyrel Datwyler <tyreld@linux.ibm.com>
Subject: [PATCH 11/13] ibmvfc: set and track hw queue in ibmvfc_event struct
Date: Wed, 25 Nov 2020 19:48:22 -0600 [thread overview]
Message-ID: <20201126014824.123831-12-tyreld@linux.ibm.com> (raw)
In-Reply-To: <20201126014824.123831-1-tyreld@linux.ibm.com>
Extract the hwq id from a SCSI command and store it in the ibmvfc_event
structure to identify which Sub-CRQ to send the command down when
channels are being utilized.
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
---
drivers/scsi/ibmvscsi/ibmvfc.c | 5 +++++
drivers/scsi/ibmvscsi/ibmvfc.h | 1 +
2 files changed, 6 insertions(+)
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index 55893d09f883..f686c2cb0de2 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -1387,6 +1387,7 @@ static void ibmvfc_init_event(struct ibmvfc_event *evt,
evt->crq.format = format;
evt->done = done;
evt->eh_comp = NULL;
+ evt->hwq = 0;
}
/**
@@ -1738,6 +1739,8 @@ static int ibmvfc_queuecommand_lck(struct scsi_cmnd *cmnd,
struct ibmvfc_cmd *vfc_cmd;
struct ibmvfc_fcp_cmd_iu *iu;
struct ibmvfc_event *evt;
+ u32 tag_and_hwq = blk_mq_unique_tag(cmnd->request);
+ u16 hwq = blk_mq_unique_tag_to_hwq(tag_and_hwq);
int rc;
if (unlikely((rc = fc_remote_port_chkready(rport))) ||
@@ -1765,6 +1768,8 @@ static int ibmvfc_queuecommand_lck(struct scsi_cmnd *cmnd,
}
vfc_cmd->correlation = cpu_to_be64(evt);
+ if (vhost->using_channels)
+ evt->hwq = hwq % vhost->scsi_scrqs.active_queues;
if (likely(!(rc = ibmvfc_map_sg_data(cmnd, evt, vfc_cmd, vhost->dev))))
return ibmvfc_send_event(evt, vhost, 0);
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.h b/drivers/scsi/ibmvscsi/ibmvfc.h
index 04086ffbfca7..abda910ae33d 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.h
+++ b/drivers/scsi/ibmvscsi/ibmvfc.h
@@ -781,6 +781,7 @@ struct ibmvfc_event {
struct completion comp;
struct completion *eh_comp;
struct timer_list timer;
+ u16 hwq;
};
/* a pool of event structs for use */
--
2.27.0
next prev parent reply other threads:[~2020-11-26 1:49 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-26 1:48 [PATCH 00/13] ibmvfc: initial MQ development Tyrel Datwyler
2020-11-26 1:48 ` [PATCH 01/13] ibmvfc: add vhost fields and defaults for MQ enablement Tyrel Datwyler
2020-11-27 17:45 ` Brian King
2020-11-30 17:22 ` Tyrel Datwyler
2020-11-26 1:48 ` [PATCH 02/13] ibmvfc: define hcall wrapper for registering a Sub-CRQ Tyrel Datwyler
2020-11-27 17:45 ` Brian King
2020-11-26 1:48 ` [PATCH 03/13] ibmvfc: add Subordinate CRQ definitions Tyrel Datwyler
2020-11-27 17:46 ` Brian King
2020-11-26 1:48 ` [PATCH 04/13] ibmvfc: add alloc/dealloc routines for SCSI Sub-CRQ Channels Tyrel Datwyler
2020-11-27 17:46 ` Brian King
2020-11-30 17:26 ` Tyrel Datwyler
2020-11-26 1:48 ` [PATCH 05/13] ibmvfc: add Sub-CRQ IRQ enable/disable routine Tyrel Datwyler
2020-11-27 17:47 ` Brian King
2020-11-26 1:48 ` [PATCH 06/13] ibmvfc: add handlers to drain and complete Sub-CRQ responses Tyrel Datwyler
2020-11-27 17:47 ` Brian King
2020-11-30 17:27 ` Tyrel Datwyler
2020-11-26 1:48 ` [PATCH 07/13] ibmvfc: define Sub-CRQ interrupt handler routine Tyrel Datwyler
2020-11-27 17:48 ` Brian King
2020-11-26 1:48 ` [PATCH 08/13] ibmvfc: map/request irq and register Sub-CRQ interrupt handler Tyrel Datwyler
2020-11-27 17:48 ` Brian King
2020-11-26 1:48 ` [PATCH 09/13] ibmvfc: implement channel enquiry and setup commands Tyrel Datwyler
2020-11-27 17:49 ` Brian King
2020-11-30 17:29 ` Tyrel Datwyler
2020-11-26 1:48 ` [PATCH 10/13] ibmvfc: advertise client support for using hardware channels Tyrel Datwyler
2020-11-27 17:49 ` Brian King
2020-11-26 1:48 ` Tyrel Datwyler [this message]
2020-11-27 17:50 ` [PATCH 11/13] ibmvfc: set and track hw queue in ibmvfc_event struct Brian King
2020-11-26 1:48 ` [PATCH 12/13] ibmvfc: send commands down HW Sub-CRQ when channelized Tyrel Datwyler
2020-11-27 17:50 ` Brian King
2020-11-26 1:48 ` [PATCH 13/13] ibmvfc: register Sub-CRQ handles with VIOS during channel setup Tyrel Datwyler
2020-11-27 17:50 ` Brian King
2020-12-02 12:03 ` [PATCH 00/13] ibmvfc: initial MQ development Hannes Reinecke
2020-12-02 17:19 ` Tyrel Datwyler
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=20201126014824.123831-12-tyreld@linux.ibm.com \
--to=tyreld@linux.ibm.com \
--cc=brking@linux.ibm.com \
--cc=james.bottomley@hansenpartnership.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.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;
as well as URLs for NNTP newsgroup(s).