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, hare@suse.de
Cc: jsmart2021@gmail.com, emilne@redhat.com, mkumar@redhat.com,
Gaurav Srivastava <gaurav.srivastava@broadcom.com>
Subject: [PATCH v7 12/16] lpfc: vmid: Appends the vmid in the wqe before sending
Date: Thu, 7 Jan 2021 03:30:26 +0530 [thread overview]
Message-ID: <1609970430-19084-13-git-send-email-muneendra.kumar@broadcom.com> (raw)
In-Reply-To: <1609970430-19084-1-git-send-email-muneendra.kumar@broadcom.com>
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>
---
v7:
No change
v6:
No change
v5:
Modified the comments
v4:
No change
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 f9b6e32db618..a63371e9feaa 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -3856,7 +3856,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 "
@@ -9762,6 +9762,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,
@@ -9893,6 +9895,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 switch response */
+ 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 */
@@ -9957,6 +9977,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 switch response */
+ 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 */
@@ -10014,6 +10051,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 switch response */
+ 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
WARNING: multiple messages have this Message-ID (diff)
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, hare@suse.de
Cc: jsmart2021@gmail.com, mkumar@redhat.com, emilne@redhat.com,
Gaurav Srivastava <gaurav.srivastava@broadcom.com>
Subject: [PATCH v7 12/16] lpfc: vmid: Appends the vmid in the wqe before sending
Date: Thu, 7 Jan 2021 03:30:26 +0530 [thread overview]
Message-ID: <1609970430-19084-13-git-send-email-muneendra.kumar@broadcom.com> (raw)
In-Reply-To: <1609970430-19084-1-git-send-email-muneendra.kumar@broadcom.com>
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>
---
v7:
No change
v6:
No change
v5:
Modified the comments
v4:
No change
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 f9b6e32db618..a63371e9feaa 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -3856,7 +3856,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 "
@@ -9762,6 +9762,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,
@@ -9893,6 +9895,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 switch response */
+ 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 */
@@ -9957,6 +9977,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 switch response */
+ 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 */
@@ -10014,6 +10051,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 switch response */
+ 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
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2021-01-07 5:02 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-06 22:00 [PATCH v7 00/16] blkcg:Support to track FC storage blk io traffic Muneendra
2021-01-06 22:00 ` Muneendra
2021-01-06 22:00 ` [PATCH v7 01/16] cgroup: Added cgroup_get_from_id Muneendra
2021-01-06 22:00 ` Muneendra
2021-01-11 7:29 ` Hannes Reinecke
2021-01-11 7:29 ` Hannes Reinecke
2021-01-06 22:00 ` [PATCH v7 02/16] blkcg: Added a app identifier support for blkcg Muneendra
2021-01-06 22:00 ` Muneendra
2021-01-11 7:30 ` Hannes Reinecke
2021-01-11 7:30 ` Hannes Reinecke
2021-01-06 22:00 ` [PATCH v7 03/16] nvme: Added a newsysfs attribute appid_store Muneendra
2021-01-06 22:00 ` Muneendra
2021-01-11 7:31 ` Hannes Reinecke
2021-01-11 7:31 ` Hannes Reinecke
2021-01-06 22:00 ` [PATCH v7 04/16] lpfc: vmid: Add the datastructure for supporting VMID in lpfc Muneendra
2021-01-06 22:00 ` Muneendra
2021-01-11 7:32 ` Hannes Reinecke
2021-01-11 7:32 ` Hannes Reinecke
2021-01-06 22:00 ` [PATCH v7 05/16] lpfc: vmid: Supplementary data structures for vmid and APIs Muneendra
2021-01-06 22:00 ` Muneendra
2021-01-11 7:33 ` Hannes Reinecke
2021-01-11 7:33 ` Hannes Reinecke
2021-01-06 22:00 ` [PATCH v7 06/16] lpfc: vmid: Forward declarations for APIs Muneendra
2021-01-06 22:00 ` Muneendra
2021-01-11 7:35 ` Hannes Reinecke
2021-01-11 7:35 ` Hannes Reinecke
2021-01-06 22:00 ` [PATCH v7 07/16] lpfc: vmid: VMID params initialization Muneendra
2021-01-06 22:00 ` Muneendra
2021-01-06 22:00 ` [PATCH v7 08/16] lpfc: vmid: Add support for vmid in mailbox command, does vmid resource allocation and vmid cleanup Muneendra
2021-01-06 22:00 ` Muneendra
2021-01-06 22:00 ` [PATCH v7 09/16] lpfc: vmid: Implements ELS commands for appid patch Muneendra
2021-01-06 22:00 ` Muneendra
2021-01-06 22:00 ` [PATCH v7 10/16] lpfc: vmid: Functions to manage vmids Muneendra
2021-01-06 22:00 ` Muneendra
2021-01-06 22:00 ` [PATCH v7 11/16] lpfc: vmid: Implements CT commands for appid Muneendra
2021-01-06 22:00 ` Muneendra
2021-01-06 22:00 ` Muneendra [this message]
2021-01-06 22:00 ` [PATCH v7 12/16] lpfc: vmid: Appends the vmid in the wqe before sending Muneendra
2021-01-06 22:00 ` [PATCH v7 13/16] lpfc: vmid: Timeout implementation for vmid Muneendra
2021-01-06 22:00 ` Muneendra
2021-01-06 22:00 ` [PATCH v7 14/16] lpfc: vmid: Adding qfpa and vmid timeout check in worker thread Muneendra
2021-01-06 22:00 ` Muneendra
2021-01-06 22:00 ` [PATCH v7 15/16] lpfc: vmid: Introducing vmid in io path Muneendra
2021-01-06 22:00 ` Muneendra
2021-01-06 22:00 ` [PATCH v7 16/16] scsi: Made changes in Kconfig to select BLK_CGROUP_FC_APPID Muneendra
2021-01-06 22:00 ` Muneendra
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=1609970430-19084-13-git-send-email-muneendra.kumar@broadcom.com \
--to=muneendra.kumar@broadcom.com \
--cc=emilne@redhat.com \
--cc=gaurav.srivastava@broadcom.com \
--cc=hare@suse.de \
--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=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.