From patchwork Wed Aug 23 23:55:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smart X-Patchwork-Id: 9918715 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BF46D600F5 for ; Wed, 23 Aug 2017 23:56:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B258228A99 for ; Wed, 23 Aug 2017 23:56:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A775928A9D; Wed, 23 Aug 2017 23:56:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5237428A99 for ; Wed, 23 Aug 2017 23:56:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751937AbdHWX4a (ORCPT ); Wed, 23 Aug 2017 19:56:30 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:37263 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751935AbdHWX42 (ORCPT ); Wed, 23 Aug 2017 19:56:28 -0400 Received: by mail-wm0-f65.google.com with SMTP id v186so1051168wmf.4 for ; Wed, 23 Aug 2017 16:56:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=o5Tf6UD6X+MGpG5/Cdwr1VEWnuOxKyWoXpIsC53k1V0=; b=rU6ULcb8xxKVzDBLQVwY89FrKqhI4FzKx7qOjOrYywVE2qlCcgfCeuomNrCkhR9hmj VelSujussDitHI7zFWla7F2n9tfMR25gSxmURweaA06ps+rDrxi+3f/lDQwiF4eduaFB /m0OkDDghLPbqj+rvxyez2HsBI8vMLASOdpNjwqDDu5A148voDGZT0ywFTcqQBRzMF+o umt6aFmVLRf6KbL9/Et4FGgw4CVqK90Lxwtu5Gy4zWEWyngfVEvKxxf6ZjeJBxYpc/Uk bvUOSe9yn1FP6IZyvpuw1IeLEitIav94pW0PmB2Bd9aShAc5Vw6fIEHipg6q1psWtoKy yE2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=o5Tf6UD6X+MGpG5/Cdwr1VEWnuOxKyWoXpIsC53k1V0=; b=PAc7hhpxXUCRSa/lDatM397cwIXT8nIRFX2EZM1OaRjLniOMVZ0n3ooEKwIyW4H6DX hbfTEftBkcfy6T7he5kCXVf8R7/wUMnDvFdr0gKk1xRQZjXb8GnEls4TxIAFZ9B2Itg+ HqAY5RgaBT2YNcj5PGUiopYIHW5JRHdloNbBsKkVmupc7QVVzCnRulePqQ47WlMLG9yd seCmDqn4y4Wt/aH/DTDOu+6EAKkVikbJMqOLfbj4jDQaOO3kG6kwxLns3lJuPX2DJbSq mLgp4f+HBmzig6oAxlPMuctsdTwyyJwp4cf44xNhlkdQAu18TQy92Y8DwDZynTO/NJ0C DZQg== X-Gm-Message-State: AHYfb5gMCLAZH6nbJRanZMIXjm2a/7MOWVPudorWD3hNjT3mX0EQyJu3 jrhJ7t54kFmP9mrk X-Received: by 10.28.107.207 with SMTP id a76mr2682206wmi.52.1503532587401; Wed, 23 Aug 2017 16:56:27 -0700 (PDT) Received: from pallmd1.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id l131sm3984100wmb.5.2017.08.23.16.56.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Aug 2017 16:56:26 -0700 (PDT) From: James Smart To: linux-scsi@vger.kernel.org Cc: Dick Kennedy , James Smart Subject: [PATCH v3 14/20] lpfc: Fix relative offset error on large nvmet target ios Date: Wed, 23 Aug 2017 16:55:43 -0700 Message-Id: <20170823235549.2883-15-jsmart2021@gmail.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170823235549.2883-1-jsmart2021@gmail.com> References: <20170823235549.2883-1-jsmart2021@gmail.com> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Dick Kennedy if the nvmet_fc transport breaks an io into multiple sequences, the driver will improperly set the relative offset on the 2nd through N sequences. Correct by properly formatting the hw cmd so the relative offset is picked up from the hw cmd. Signed-off-by: Dick Kennedy Signed-off-by: James Smart Reviewed-by: Johannes Thumshirn --- drivers/scsi/lpfc/lpfc_nvmet.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_nvmet.c b/drivers/scsi/lpfc/lpfc_nvmet.c index 41abdef27909..ce871de70bf1 100644 --- a/drivers/scsi/lpfc/lpfc_nvmet.c +++ b/drivers/scsi/lpfc/lpfc_nvmet.c @@ -559,7 +559,7 @@ lpfc_nvmet_xmt_fcp_op_cmp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdwqe, /* lpfc_nvmet_xmt_fcp_release() will recycle the context */ } else { ctxp->entry_cnt++; - start_clean = offsetof(struct lpfc_iocbq, wqe); + start_clean = offsetof(struct lpfc_iocbq, iocb_flag); memset(((char *)cmdwqe) + start_clean, 0, (sizeof(struct lpfc_iocbq) - start_clean)); #ifdef CONFIG_SCSI_LPFC_DEBUG_FS @@ -1024,7 +1024,6 @@ lpfc_nvmet_setup_io_context(struct lpfc_hba *phba) /* Word 7 */ bf_set(wqe_ct, &wqe->generic.wqe_com, SLI4_CT_RPI); bf_set(wqe_class, &wqe->generic.wqe_com, CLASS3); - bf_set(wqe_pu, &wqe->generic.wqe_com, 1); /* Word 10 */ bf_set(wqe_nvme, &wqe->fcp_tsend.wqe_com, 1); bf_set(wqe_ebde_cnt, &wqe->generic.wqe_com, 0); @@ -1973,6 +1972,7 @@ lpfc_nvmet_prep_fcp_wqe(struct lpfc_hba *phba, nvmewqe->sli4_xritag); /* Word 7 */ + bf_set(wqe_pu, &wqe->fcp_tsend.wqe_com, 1); bf_set(wqe_cmnd, &wqe->fcp_tsend.wqe_com, CMD_FCP_TSEND64_WQE); /* Word 8 */ @@ -2081,6 +2081,7 @@ lpfc_nvmet_prep_fcp_wqe(struct lpfc_hba *phba, nvmewqe->sli4_xritag); /* Word 7 */ + bf_set(wqe_pu, &wqe->fcp_treceive.wqe_com, 1); bf_set(wqe_ar, &wqe->fcp_treceive.wqe_com, 0); bf_set(wqe_cmnd, &wqe->fcp_treceive.wqe_com, CMD_FCP_TRECEIVE64_WQE); @@ -2164,6 +2165,7 @@ lpfc_nvmet_prep_fcp_wqe(struct lpfc_hba *phba, nvmewqe->sli4_xritag); /* Word 7 */ + bf_set(wqe_pu, &wqe->fcp_trsp.wqe_com, 0); bf_set(wqe_ag, &wqe->fcp_trsp.wqe_com, 1); bf_set(wqe_cmnd, &wqe->fcp_trsp.wqe_com, CMD_FCP_TRSP64_WQE);