From: Muneendra <muneendra.kumar@broadcom.com>
To: linux-block@vger.kernel.org, linux-scsi@vger.kernel.org,
tj@kernel.org, linux-nvme@lists.infradead.org
Cc: pbonzini@redhat.com, jsmart2021@gmail.com, mkumar@redhat.com,
emilne@redhat.com,
Gaurav Srivastava <gaurav.srivastava@broadcom.com>
Subject: [PATCH v3 15/19] lpfc: vmid: Appends the vmid in the wqe before sending request
Date: Tue, 3 Nov 2020 12:48:19 +0530 [thread overview]
Message-ID: <1604387903-20006-16-git-send-email-muneendra.kumar@broadcom.com> (raw)
In-Reply-To: <1604387903-20006-1-git-send-email-muneendra.kumar@broadcom.com>
[-- Attachment #1.1: Type: text/plain, Size: 3888 bytes --]
From: Gaurav Srivastava <gaurav.srivastava@broadcom.com>
This patch adds the vmid in wqe before sending out the request.
The type of vmid depends on the configured type and is checked before
being appended.
Signed-off-by: Gaurav Srivastava <gaurav.srivastava@broadcom.com>
Signed-off-by: James Smart <jsmart2021@gmail.com>
---
v3:
No change
v2:
Ported the patch on top of 5.10/scsi-queue
---
drivers/scsi/lpfc/lpfc_sli.c | 56 +++++++++++++++++++++++++++++++++++-
1 file changed, 55 insertions(+), 1 deletion(-)
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 51b99b7beaf9..53dbd6a3f460 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -3724,7 +3724,7 @@ lpfc_sli_sp_handle_rspiocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
if (irsp->ulpStatus) {
/* Rsp ring <ringno> error: IOCB */
- lpfc_printf_log(phba, KERN_WARNING, LOG_SLI,
+ lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
"0328 Rsp Ring %d error: "
"IOCB Data: "
"x%x x%x x%x x%x "
@@ -9625,6 +9625,8 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq,
*pcmd == ELS_CMD_RSCN_XMT ||
*pcmd == ELS_CMD_FDISC ||
*pcmd == ELS_CMD_LOGO ||
+ *pcmd == ELS_CMD_QFPA ||
+ *pcmd == ELS_CMD_UVEM ||
*pcmd == ELS_CMD_PLOGI)) {
bf_set(els_req64_sp, &wqe->els_req, 1);
bf_set(els_req64_sid, &wqe->els_req,
@@ -9756,6 +9758,24 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq,
ptr = &wqe->words[22];
memcpy(ptr, fcp_cmnd, sizeof(struct fcp_cmnd));
}
+
+ /* add the VMID tags as per the switch */
+ if (iocbq->iocb_flag & LPFC_IO_VMID) {
+ union lpfc_wqe128 *wqe128;
+
+ if (phba->pport->vmid_priority_tagging) {
+ bf_set(wqe_ccpe, &wqe->fcp_iwrite.wqe_com, 1);
+ bf_set(wqe_ccp, &wqe->fcp_iwrite.wqe_com,
+ (iocbq->vmid_tag.cs_ctl_vmid));
+ /* Bit 0 must be 0 */
+ } else {
+ wqe128 = (union lpfc_wqe128 *)wqe;
+ bf_set(wqe_appid, &wqe->fcp_iwrite.wqe_com, 1);
+ bf_set(wqe_wqes, &wqe128->fcp_iwrite.wqe_com,
+ 1);
+ wqe128->words[31] = iocbq->vmid_tag.app_id;
+ }
+ }
break;
case CMD_FCP_IREAD64_CR:
/* word3 iocb=iotag wqe=payload_offset_len */
@@ -9820,6 +9840,23 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq,
ptr = &wqe->words[22];
memcpy(ptr, fcp_cmnd, sizeof(struct fcp_cmnd));
}
+
+ /* add the VMID tags as per the switch */
+ if (iocbq->iocb_flag & LPFC_IO_VMID) {
+ union lpfc_wqe128 *wqe128;
+
+ if (phba->pport->vmid_priority_tagging) {
+ bf_set(wqe_ccpe, &wqe->fcp_iread.wqe_com, 1);
+ bf_set(wqe_ccp, &wqe->fcp_iread.wqe_com,
+ (iocbq->vmid_tag.cs_ctl_vmid));
+ /* Bit 0 must be 0 */
+ } else {
+ wqe128 = (union lpfc_wqe128 *)wqe;
+ bf_set(wqe_appid, &wqe->fcp_iread.wqe_com, 1);
+ bf_set(wqe_wqes, &wqe128->fcp_iread.wqe_com, 1);
+ wqe128->words[31] = iocbq->vmid_tag.app_id;
+ }
+ }
break;
case CMD_FCP_ICMND64_CR:
/* word3 iocb=iotag wqe=payload_offset_len */
@@ -9877,6 +9914,23 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq,
ptr = &wqe->words[22];
memcpy(ptr, fcp_cmnd, sizeof(struct fcp_cmnd));
}
+
+ /* add the VMID tags as per the switch */
+ if (iocbq->iocb_flag & LPFC_IO_VMID) {
+ union lpfc_wqe128 *wqe128;
+
+ if (phba->pport->vmid_priority_tagging) {
+ bf_set(wqe_ccpe, &wqe->fcp_icmd.wqe_com, 1);
+ bf_set(wqe_ccp, &wqe->fcp_icmd.wqe_com,
+ (iocbq->vmid_tag.cs_ctl_vmid));
+ /* Bit 0 must be 0 */
+ } else {
+ wqe128 = (union lpfc_wqe128 *)wqe;
+ bf_set(wqe_appid, &wqe->fcp_icmd.wqe_com, 1);
+ bf_set(wqe_wqes, &wqe128->fcp_icmd.wqe_com, 1);
+ wqe128->words[31] = iocbq->vmid_tag.app_id;
+ }
+ }
break;
case CMD_GEN_REQUEST64_CR:
/* For this command calculate the xmit length of the
--
2.26.2
[-- Attachment #1.2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4177 bytes --]
[-- Attachment #2: Type: text/plain, Size: 158 bytes --]
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2020-11-03 14:14 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-03 7:18 [PATCH v3 00/19] blkcg:Support to track FC storage blk io traffic Muneendra
2020-11-03 7:18 ` [PATCH v3 01/19] cgroup: Added cgroup_get_from_kernfs_id Muneendra
2020-11-09 13:49 ` Tejun Heo
2020-11-03 7:18 ` [PATCH v3 02/19] blkcg: Added a app identifier support for blkcg Muneendra
2020-11-03 7:18 ` [PATCH v3 03/19] nvme: Added a newsysfs attribute appid_store Muneendra
2020-11-03 7:18 ` [PATCH v3 04/19] lpfc: vmid: Add the datastructure for supporting VMID in lpfc Muneendra
2020-11-03 7:18 ` [PATCH v3 05/19] lpfc: vmid: API to check if VMID is enabled Muneendra
2020-11-03 7:18 ` [PATCH v3 06/19] lpfc: vmid: Supplementary data structures for vmid Muneendra
2020-11-03 7:18 ` [PATCH v3 07/19] lpfc: vmid: Forward declarations for APIs Muneendra
2020-11-03 7:18 ` [PATCH v3 08/19] lpfc: vmid: Add support for vmid in mailbox command Muneendra
2020-11-03 7:18 ` [PATCH v3 09/19] lpfc: vmid: VMID params initialization Muneendra
2020-11-03 7:18 ` [PATCH v3 10/19] lpfc: vmid: vmid resource allocation Muneendra
2020-11-03 7:18 ` [PATCH v3 11/19] lpfc: vmid: cleanup vmid resources Muneendra
2020-11-03 7:18 ` [PATCH v3 12/19] lpfc: vmid: Implements ELS commands for appid patch Muneendra
2020-11-03 7:18 ` [PATCH v3 13/19] lpfc: vmid: Functions to manage vmids Muneendra
2020-11-03 7:18 ` [PATCH v3 14/19] lpfc: vmid: Implements CT commands for appid Muneendra
2020-11-03 7:18 ` Muneendra [this message]
2020-11-03 7:18 ` [PATCH v3 16/19] lpfc: vmid: Timeout implementation for vmid Muneendra
2020-11-03 7:18 ` [PATCH v3 17/19] lpfc: vmid: Adding qfpa and vmid timeout check in worker thread Muneendra
2020-11-03 7:18 ` [PATCH v3 18/19] lpfc: vmid: Introducing vmid in io path Muneendra
2020-11-03 7:18 ` [PATCH v3 19/19] scsi: Made changes in Kconfig to select BLK_CGROUP_FC_APPID Muneendra
2020-11-03 18:07 ` kernel test robot
2020-11-03 21:19 ` kernel test robot
2020-11-04 0:55 ` kernel test robot
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=1604387903-20006-16-git-send-email-muneendra.kumar@broadcom.com \
--to=muneendra.kumar@broadcom.com \
--cc=emilne@redhat.com \
--cc=gaurav.srivastava@broadcom.com \
--cc=jsmart2021@gmail.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-scsi@vger.kernel.org \
--cc=mkumar@redhat.com \
--cc=pbonzini@redhat.com \
--cc=tj@kernel.org \
/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