From patchwork Wed Aug 2 23:36:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smart X-Patchwork-Id: 9877941 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 52ADB60360 for ; Wed, 2 Aug 2017 23:38:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 453B02878E for ; Wed, 2 Aug 2017 23:38:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3A12F28842; Wed, 2 Aug 2017 23:38:19 +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 DDB732878E for ; Wed, 2 Aug 2017 23:38:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752014AbdHBXiS (ORCPT ); Wed, 2 Aug 2017 19:38:18 -0400 Received: from mail-qk0-f194.google.com ([209.85.220.194]:34539 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751945AbdHBXiO (ORCPT ); Wed, 2 Aug 2017 19:38:14 -0400 Received: by mail-qk0-f194.google.com with SMTP id q66so6121485qki.1 for ; Wed, 02 Aug 2017 16:38:14 -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=LuEp5WrI+bGhACtpy6sd7ZrdygnOI7B17pU3Yt54pOM=; b=Ps4L5sB7U9smVD0vjv1r15psji5N93s/+d58Xg7g3OXQVIBst4t9YxbcaVtlzSAFyz yEGmJnLPnOwxn7unziv71mKXTGKex6wFaWejFo0OeTz7pYOyR9slNfoTtGBdyHG7a974 hSaNbnjxPOnTUepFqZ6hFfoPIFBdgeXW0pxUPGdG6gkD5JmZyJn3KXoH487TVX+kR06P bXxm15WVrfkcRO1zYWYCukSu1sMcmVsu0Fvn3KZZ5hlq5rV9Yg3t8TSwbJSuKoRt62ds h5KCCTxpDTXO2m1jiUiEKwEM1BqkbbNVesveFjMgu7VbVMWMS/8OagyZ8FX7ljsORehb Kotg== 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=LuEp5WrI+bGhACtpy6sd7ZrdygnOI7B17pU3Yt54pOM=; b=o6aq4WCsDHcLv19Ak1+dgoz/CGQjhrVWHSEAqbArUjVkkCkQw80Fm2qiyM53kxT21v lxU4ZTfn027w9w2nuuMIWaDto8op68+Ie2fRK9BE9EIIc/6LGhRgnzpmT8qSbYhbE4kL B1oMBHOzvhDVJeGkcp4xC9xUtUGzCBPDhhvp+5DHjgQRsC99mep6R72k7xwCGFUwSjNv GT7CaEw1m0GouWP1Mo2uGe6Woil3Dt3C3nlD/lfTfN24WtEDEzljNlZTyyPiQNyf1vML 9CKaA2h8LKwypzn5MRERFOWMad+rd2h/xLHZ/EOZbg6y+9KaCLT995om6QA4KVVf74OS JMfw== X-Gm-Message-State: AHYfb5juEXFU6E/OL0sHuVR5gDM2WdKmuexTV8+8xYF8STwxYgGNMk1T bb8R6oszrThFHkh2 X-Received: by 10.55.148.70 with SMTP id w67mr28306qkd.160.1501717094053; Wed, 02 Aug 2017 16:38:14 -0700 (PDT) Received: from pallmd1.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id c55sm26260318qta.8.2017.08.02.16.38.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Aug 2017 16:38:13 -0700 (PDT) From: James Smart To: linux-scsi@vger.kernel.org Cc: Dick Kennedy , James Smart Subject: [PATCH 15/21] lpfc: Fix relative offset error on large nvmet target ios Date: Wed, 2 Aug 2017 16:36:42 -0700 Message-Id: <20170802233648.4573-16-jsmart2021@gmail.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170802233648.4573-1-jsmart2021@gmail.com> References: <20170802233648.4573-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 --- 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 cd6c93a17760..40fa5dd72bfa 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); @@ -1974,6 +1973,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 */ @@ -2082,6 +2082,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); @@ -2165,6 +2166,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);