From patchwork Sat Aug 5 00:47:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smart X-Patchwork-Id: 9882805 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 59D876031B for ; Sat, 5 Aug 2017 00:48:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D3EC28A14 for ; Sat, 5 Aug 2017 00:48:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 41AFB28A1D; Sat, 5 Aug 2017 00:48:10 +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 E0F1D28A14 for ; Sat, 5 Aug 2017 00:48:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752680AbdHEAsH (ORCPT ); Fri, 4 Aug 2017 20:48:07 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:34936 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752671AbdHEAsG (ORCPT ); Fri, 4 Aug 2017 20:48:06 -0400 Received: by mail-pg0-f65.google.com with SMTP id l64so3110323pge.2 for ; Fri, 04 Aug 2017 17:48:06 -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=M1vOOS58eUONRsj7/10nw2avLaPH3HqhXvP3bWGtQIn/+NxbUOqNnYRjxYj6EETG/0 7FCGu/1Jv3AzXQ2M9Vw53s2bePnpLVbhq+HfrYFn/qES0LoVcoD0wwLKilS0S02HuAit ThUPsYw4UGd5VL8BaJpsw8W0BnRIcUnb8/umProPfBYpt4mFxii5fB2R36yXH1oYcgLa eNlP1Goa2xNddPpzrxgguRS4GnMnuycFaKM+3ztzraHdPu3QHtXqiNFqMOcFpaTX10ct 1GKL5J3o2TV1Fu6swSxB7dAiym+2JnOzm1wipZzaEHzqWR8u3kQV1nvWWrU5DmiVa9YE jcFA== 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=T8cognhKXjhvscvPGRQ6rw1phX2GzG6mdm+S2bp3dpJNdrGlcMKJRKt1xcJDZJ+y+U rJzlfyW08YEBGzBD+4Dmyde+beqEtzEO1SZoeEW+GUeDBPlccWc6IHK2jsD+f2C7fe7h e3BsBAba5FNarrulXPlEBmt2mzOsrJW8sEjWpfRdtDNwVqoXaqOuu6e9Mm1+/lWAeTFU PHPtnhoD0pSM39uUcnatXWzxyK/2Lrjic0LsVZ2tzdvc1uAciHB8KnjDOAVM/XR3DIvi N2MCAvHSuUt8ORTrZacqcy4ulq9o01NdD1TgUllZ0OwGT7xSjCy9hIkW2EK5N8N3Ph0v T9ZA== X-Gm-Message-State: AIVw1122fW71bk8QAkuIaS6/ll+WjEpDlqtKwo0mKJC5evxQJbzGUjDs +hKnUqgEcRDxn+2s X-Received: by 10.99.1.203 with SMTP id 194mr4023320pgb.315.1501894085766; Fri, 04 Aug 2017 17:48:05 -0700 (PDT) Received: from linux-8upr.localdomain (ip68-4-115-207.oc.oc.cox.net. [68.4.115.207]) by smtp.gmail.com with ESMTPSA id 69sm2725708pfh.186.2017.08.04.17.48.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Aug 2017 17:48:04 -0700 (PDT) From: James Smart To: linux-scsi@vger.kernel.org Cc: jsmart2021@gmail.com, Dick Kennedy , James Smart Subject: [PATCH v2 14/20] lpfc: Fix relative offset error on large nvmet target ios Date: Fri, 4 Aug 2017 17:47:25 -0700 Message-Id: <20170805004731.1335-15-jsmart2021@gmail.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170805004731.1335-1-jsmart2021@gmail.com> References: <20170805004731.1335-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 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);