From patchwork Wed Aug 23 22:05:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9918513 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 D7171600C5 for ; Wed, 23 Aug 2017 22:06:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9C2728A6F for ; Wed, 23 Aug 2017 22:06:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE84428A7C; Wed, 23 Aug 2017 22:06:07 +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.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI 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 A351628A7F for ; Wed, 23 Aug 2017 22:06:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751197AbdHWWGF (ORCPT ); Wed, 23 Aug 2017 18:06:05 -0400 Received: from mail-sn1nam02on0071.outbound.protection.outlook.com ([104.47.36.71]:21680 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751093AbdHWWFz (ORCPT ); Wed, 23 Aug 2017 18:05:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=boT4jGi9mXK9aznJ5Crk2qe5RX8+SIFyD2xhofCCCG4=; b=gdVXxZPJSAf1nNvgA9In4RZS1kMvQfv7Qh3bzNwDU1fTpwUwWE/oFoJLYp8Fc8mH8b7eQAYQ+WNFzd81J6H7iUeBiayRKh7LdP078FLwqxplDV59NStm/kL6f7n8He+sjIIzEGTYCCi17ThiREmnfu57L5Gac4VBA6gsutV9Drg= Received: from SN1PR0701CA0015.namprd07.prod.outlook.com (10.162.96.25) by SN1PR0701MB1952.namprd07.prod.outlook.com (10.163.131.158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1362.18; Wed, 23 Aug 2017 22:05:54 +0000 Received: from BL2FFO11FD037.protection.gbl (2a01:111:f400:7c09::181) by SN1PR0701CA0015.outlook.office365.com (2a01:111:e400:5173::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1385.9 via Frontend Transport; Wed, 23 Aug 2017 22:05:54 +0000 Authentication-Results: spf=none (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=cavium.com; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by BL2FFO11FD037.mail.protection.outlook.com (10.173.161.133) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.1341.15 via Frontend Transport; Wed, 23 Aug 2017 22:05:53 +0000 Received: from dut1171.mv.qlogic.com (172.29.51.171) by CAEXCH02.caveonetworks.com (10.17.4.29) with Microsoft SMTP Server id 14.2.347.0; Wed, 23 Aug 2017 15:05:28 -0700 Received: from dut1171.mv.qlogic.com (localhost [127.0.0.1]) by dut1171.mv.qlogic.com (8.14.7/8.14.7) with ESMTP id v7NM5SWE003226; Wed, 23 Aug 2017 15:05:28 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id v7NM5Sdt003225; Wed, 23 Aug 2017 15:05:28 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 19/31] qla2xxx: Fix task mgmt handling for NPIV Date: Wed, 23 Aug 2017 15:05:13 -0700 Message-ID: <20170823220525.3115-20-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170823220525.3115-1-himanshu.madhani@cavium.com> References: <20170823220525.3115-1-himanshu.madhani@cavium.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:50.232.66.26; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(428002)(189002)(199003)(54906002)(50466002)(1076002)(86362001)(5003940100001)(478600001)(69596002)(87636003)(80596001)(101416001)(47776003)(2906002)(626005)(72206003)(48376002)(4326008)(42186005)(105586002)(50226002)(106466001)(36756003)(76176999)(33646002)(8676002)(189998001)(81166006)(305945005)(6666003)(2950100002)(356003)(50986999)(81156014)(5660300001)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0701MB1952; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; PTR:50-232-66-26-static.hfc.comcastbusiness.net; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD037; 1:xGyEjL3TdIOO8nuXWzwKvgcJh+viLqdDFClRmLCfcSvvQgZBFOa0WDm3Hk2yf9YKK98/2zw/K9PjtJBbiKXfpd/UZm+tahmUKBaddot40Jla8PyzSOvQSz06mhSAGp0s X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 013227a5-4b20-4c27-64ca-08d4ea731fc0 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(2017052603190)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:SN1PR0701MB1952; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0701MB1952; 3:aRWmQJnMPOtwg6dCWHO/Oa+HQAZcaaa6na348XspLSYP3ma9BgcIr0ZgMFM9XxnMxQPIfnipJZyaX9rQTkAML0QTTS5laDGLUYfKE4zfDjTyvgKoVrP7Ed9Dc4DbNIRRh8MfuMGQLzwtwKpPNULh5YLAO+/LUyZEP8A/saKHuiSr5VskDAc5AXDZ8TI/RN059dQTxHRM+SO2gEoAxtQvbNe2Uwld4ouHA7ebbibxCwjidL/niqIy0GAfo2dDXcqmDmaSFMgm/xn6vAmTkcMEPu3Kwo1cnDn/1bOOhkhib4Z0Bb4IC/rN3oYZ0gzRcU/fMouNu2Msl5R8yXbZXxnSLw==; 25:pkqXKnCfigyYMkqhpvnicq39QckUf1IBw7vhjx2lTYoaglwisyjvZnzNgTfnrQhKaDsxPyLaRJxGElT9d8TVUr5hbF5io7epb8scpT19sJ4Cfp84RerlDjkDMrRjXjEMGE62rXyg1SnImdhOY9HCyLPD2C0Ahmy8xA8FtGcahqSpv+mg8c6CtQta+wqsOGEZy512cQrav6w5lAEyiRLCeEj6DHu1PV7E350UwH8IoL6x4A8VjxGQ/ivotMNE10w50UX1Aye92fxW9FIgKAD3ImIwJmRgzWziyQ1Sf1cOi5RgDd4icXZ0j1MRqC9LGHNYUEvxbKmF/sc8HsoesTNkVQ==; 31:OIIrcZPGrYFWSpU4AAk7aL81ha5hCloo+uzHJbs6Ol2GzGLazzofkZhEZvd4dI0vb1czWzUxOb7TYevb3ricm8ftfFaKSaKNQAfeXeH/9O98acMAajCEWNL/z8JDp4HhrLTsfLVR8668iIpYEwerwLJO3x+j0ACeoezIqGx9coMk8OddX+8c/DacJL6/5DN0lRZXViTEqs2EcPodqGEePNiqTI3O2oS1NfnvGe/jG9o= X-MS-TrafficTypeDiagnostic: SN1PR0701MB1952: X-Microsoft-Exchange-Diagnostics: 1; SN1PR0701MB1952; 20:ag99j5a1lDWA0zTO8EDKI90QFB995TInsg53YkHs6C6LgdtriNhWoyVCpuMfnpZ+xS56kRTXRCH2L5CKgVhQg0XGDY7ZP6fY4pkQHOh/cchsfjSCU/TAiN0Y3BcPhDNr4ywQuB10j9jUXL76+0/AZjJC0pkI5XGPCvPOnOJ2M9N2aV7qqvcpN+3R/X3JZEs03ZKCwHN/IXRsfmsqWu5iB3kHPYBibz0O0N83WF02gpiv7CPwcRrbn8H3h/PNfEEYNH9NZkA/bB5Bw+T3oFc+3D0ipbQB5gruAaGvmQnt+HzInuv7XwDe/UtQA5X/5ewJ9T93+8Ea1ogKgX/hy9lv0pW32v5+XHfdbFvX9cX7I0IeVLs5QSQszCbvSaMEYWHSkIgR1iCTKAgYkYumQhPIy53xI31bqJLkfBm5lMtq7kdSBb7em2EC7k6xUJ7u6Zrm4E8dtleQ8QlqlTSuLLvS5XYBRsNr9NoByu0k2j+DmLKyTckfnd7Vp5lcbI3hED+E; 4:L+igkyaU8OSwAzehpoDdPB241FHJ2pQRXS1L7y/ZZcU8AWXcj1XIQGQE3HXZSGmQ2fQyLrL4qrXurVJcR43uNMlMf/qRvL8LYBh46A0oGbWLFq8K58FWzmkRXwphkCKPUwQmC/6ci94zd7xnJZeQF05ScgOhmxqTr1kQW9nfWcxPZaYyH25UwpwlUwvVVfz5PQN8qh+l6p3Xw20XZCKbACTdwvJ1bDt+aW4cOHNyjAHuY/YP9XpG40ohezyp2mho X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(13018025)(8121501046)(5005006)(13016025)(10201501046)(93006095)(93001095)(100000703101)(100105400095)(3002001)(6041248)(20161123558100)(20161123560025)(20161123555025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SN1PR0701MB1952; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN1PR0701MB1952; X-Forefront-PRVS: 040866B734 X-Microsoft-Exchange-Diagnostics: 1; SN1PR0701MB1952; 23:G+QDDJbUqKT/+zfPQgEM9h7WZ+FGLb2bWcz05yRt54kyq4dqlBleGimkMPHmjIBBKomT0aAF6fZmQv/m7itW0rCTTp27pVoSAkuH8CsxdEvq1vo7uKkYhOa/QJUykcnjSg0RbSlsaMdMoRNIZxoX3ABzkXresEFsGtOblckjMQKZ+3DIcj8bSv52VppgAWlORD4Hz5FtPJqjESdaF+Y7QZarme2pY1xQIFaSKJVZFPucKCu1fI8Y+Pc4g90k/zTIrHBX1ZjtcWdIHm3iKH5vsb6e0Ee4uvu6BydCO52GtucIATYFwU4SP5vE7rr817X2OCAxfSrYGW+1wlPu5PutMNjUgkQie9iNjAFkctNrVsHHVsb4JdMM9T5yiGzj+wbxSGrch/3Kt+9pnf6PZIt2HYReJVmWDhDyIILxFlkRZteVEk8+xaCzHR18113RNU5oXcfIO6InTXloYipZN0K8/52GvO/F3xQWRs8THU+40vNMB828HpaIBnut5DWZZKBOg24PtFLjq+Js9ZbfcNfYMEyp49bGEE3VfjAXIqjw8qmqD6Dyv5dtB0Nody+tCuOdfc0it2WUnQwqpQR6RAd1Iyee2XhEBYdP2hSsD74LXbSCHVa0ydHpljTIJ6RCkeoUFe2x1RjjhSZCcnYVnDlC7n4f+BF9m0IOQF+2A/sl8yR40CeWsUwIvKV70EbSBHBpNME42GRP0fLjEBE7hKXKW01QnAVQkPJsx494GdnbwTmLglnU2serFGyLrDJxMMd0OmljEUhA5e61j6Zz4tFYr/4LETkfs12ytkMGf0w+i3qVhB8TF0cupEmNr36vMNO3dsn+aSfoJ0g4C5BCIq9NWbM3GFLkZuB4qy2u6U9ZPOIkcamqRlRT1bvs9KPsurYvaVvLTDLzee5VmmmqcKL51sDKMnZV7lxFPqFOVHT jLRb3uVi+iAn7k2vaOPNGbViz X-Microsoft-Exchange-Diagnostics: 1; SN1PR0701MB1952; 6:h5H/391f+CPCfRSVnlfXQ6/AEbU3YAXj7gv+qt0TXUCipujhRYDDp4w4HBNlLcg4H/6V2jGrBiAKXDvm299AVzqj2i/8VGsQkBcXEayAXI7rePv7RXd9Jm66StjCnOMejPbQHkkg5WOB6GSy2QMfFv2N5dVGxro524F1FWLjGXDoyvE1+gQwvq4VSCuG5jksu99HezZOGZ9bUKcnMP920VQqEPsJLNUms6oqdZBcMTqeXeUNJhLlqS0yWONwMeB4dxRh0e2387BfDg9JIe/9baaN0apa5hJHmrwJRLza38YRNtCoYDJZ9SGNUKv9t5MLBU8B3MzLeyyKo6uzFsVhWw==; 5:IeAdWBzo5UOCzYgjD8eoCsj3y4lJSNi7KXG4LILquM9TTgXP3hzbK7/lLGasf2KbtDAM2XOP5dAUSeEf3Ruk5EvC5MEpiaNih3Co8N5etnmn2zUPdNZPoT5yi4A2JoJ3OH0dB7Blu3SogAlip5bowQ==; 24:yHArCgPU00mYpneabdE601kxEgvWKbC0qeEWFlamx71iajCBgC5yVjfCRSBwNYKIjldNukuwvPFeqF7c2Bk4wp8l1NBxIiNc34P/qgEhS0s=; 7:NQw70igKnyYc+Cl+TKZxzmPws1F0/nAsXP5ZoEVfov8JkRXZ4C7AYTVk0i9P/G7h1ZHirufThzmyQ9urvjEKLvrz5edqOxkP7s1Ev22/iZsiYZk1sTHfJvbD374ZKoxrvBsHE1ILaPJ4wJMUXWc+736bLbAm7A66Px5TjOmJ5JiK3KaXpCWDoUSApvdok8IW8CfX6blCjf5bNkHfc+MgGA0oXvw+ua7CdUrSuW1JyEI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2017 22:05:53.7491 (UTC) X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=711e4ccf-2e9b-4bcf-a551-4094005b6194; Ip=[50.232.66.26]; Helo=[CAEXCH02.caveonetworks.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR0701MB1952 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: Quinn Tran Fix task management response for NPIV Target mode. Current code uses the wrong vp index. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_target.c | 7 ++++++- drivers/scsi/qla2xxx/qla_target.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index 6a6d9db6479f..4f1621fd5ef2 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c @@ -1901,6 +1901,7 @@ static int __qlt_24xx_handle_abts(struct scsi_qla_host *vha, mcmd->reset_count = ha->base_qpair->chip_reset; mcmd->tmr_func = QLA_TGT_ABTS; mcmd->qpair = ha->base_qpair; + mcmd->vha = vha; /* * LUN is looked up by target-core internally based on the passed @@ -2003,7 +2004,7 @@ static void qlt_24xx_handle_abts(struct scsi_qla_host *vha, static void qlt_24xx_send_task_mgmt_ctio(struct qla_qpair *qpair, struct qla_tgt_mgmt_cmd *mcmd, uint32_t resp_code) { - struct scsi_qla_host *ha = qpair->vha; + struct scsi_qla_host *ha = mcmd->vha; struct atio_from_isp *atio = &mcmd->orig_iocb.atio; struct ctio7_to_24xx *ctio; uint16_t temp; @@ -3464,6 +3465,9 @@ static int __qlt_send_term_exchange(struct qla_qpair *qpair, ql_dbg(ql_dbg_tgt, vha, 0xe009, "Sending TERM EXCH CTIO (ha=%p)\n", ha); + if (cmd) + vha = cmd->vha; + pkt = (request_t *)qla2x00_alloc_iocbs_ready(qpair, NULL); if (pkt == NULL) { ql_dbg(ql_dbg_tgt, vha, 0xe050, @@ -4379,6 +4383,7 @@ static int qlt_issue_task_mgmt(struct fc_port *sess, u64 lun, mcmd->flags = flags; mcmd->reset_count = ha->base_qpair->chip_reset; mcmd->qpair = ha->base_qpair; + mcmd->vha = vha; switch (fn) { case QLA_TGT_LUN_RESET: diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h index 7fe02d036bdf..96fce43e1e46 100644 --- a/drivers/scsi/qla2xxx/qla_target.h +++ b/drivers/scsi/qla2xxx/qla_target.h @@ -959,6 +959,7 @@ struct qla_tgt_mgmt_cmd { uint8_t fc_tm_rsp; struct fc_port *sess; struct qla_qpair *qpair; + struct scsi_qla_host *vha; struct se_cmd se_cmd; struct work_struct free_work; unsigned int flags;