From patchwork Thu Aug 30 16:35:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10582315 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8B80117DB for ; Thu, 30 Aug 2018 16:36:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B16C2C0EF for ; Thu, 30 Aug 2018 16:36:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6FB0A2C12C; Thu, 30 Aug 2018 16:36:09 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,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 0BD672C137 for ; Thu, 30 Aug 2018 16:36:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727694AbeH3UjG (ORCPT ); Thu, 30 Aug 2018 16:39:06 -0400 Received: from mail-sn1nam02on0067.outbound.protection.outlook.com ([104.47.36.67]:29071 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727586AbeH3UjF (ORCPT ); Thu, 30 Aug 2018 16:39:05 -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:X-MS-Exchange-SenderADCheck; bh=O2Q3/HnzJYf2pPRHctIyVwYOzjvv8byW3+V7kuK6YG4=; b=LpwCKo9bjWYUDVCKP0Pv2okiz80s5xA5EzCeEEER59+DyGUe4Aai/5mnhoVHHJS4LUzhEBgaABPPr0+LWziIKo8DsLGW0GK6epdmNvLwIjYUo3kTItayvm+7KjvkBqlW7Nn5E3zAIfoJtiUGqVVMIjKM9aUZgjUPbvP1Xz//rhE= Received: from CO2PR07CA0049.namprd07.prod.outlook.com (2603:10b6:100::17) by BN7PR07MB4659.namprd07.prod.outlook.com (2603:10b6:406:f1::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.14; Thu, 30 Aug 2018 16:36:02 +0000 Received: from CO1NAM05FT009.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e50::200) by CO2PR07CA0049.outlook.office365.com (2603:10b6:100::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1080.14 via Frontend Transport; Thu, 30 Aug 2018 16:36:02 +0000 Authentication-Results: spf=pass (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=bestguesspass action=none header.from=cavium.com; Received-SPF: Pass (protection.outlook.com: domain of cavium.com designates 50.232.66.26 as permitted sender) receiver=protection.outlook.com; client-ip=50.232.66.26; helo=CAEXCH02.caveonetworks.com; Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by CO1NAM05FT009.mail.protection.outlook.com (10.152.96.116) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.1122.2 via Frontend Transport; Thu, 30 Aug 2018 16:36:02 +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; Thu, 30 Aug 2018 09:35:51 -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 w7UGZpdo027355; Thu, 30 Aug 2018 09:35:51 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w7UGZpQb027354; Thu, 30 Aug 2018 09:35:51 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 08/14] qla2xxx: Turn off IOCB timeout timer on IOCB completion Date: Thu, 30 Aug 2018 09:35:44 -0700 Message-ID: <20180830163550.27288-9-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180830163550.27288-1-himanshu.madhani@cavium.com> References: <20180830163550.27288-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)(39860400002)(346002)(376002)(396003)(136003)(2980300002)(438002)(199004)(189003)(486006)(48376002)(50226002)(5660300001)(356003)(26005)(2906002)(80596001)(69596002)(50466002)(14444005)(305945005)(2616005)(6666003)(47776003)(446003)(11346002)(336012)(81156014)(476003)(81166006)(1076002)(8936002)(8676002)(126002)(44832011)(72206003)(478600001)(36756003)(186003)(87636003)(575784001)(106466001)(54906003)(86362001)(76176011)(51416003)(106002)(16586007)(42186006)(110136005)(316002)(4326008);DIR:OUT;SFP:1101;SCL:1;SRVR:BN7PR07MB4659;H:CAEXCH02.caveonetworks.com;FPR:;SPF:Pass;LANG:en;PTR:50-232-66-26-static.hfc.comcastbusiness.net;A:1;MX:1; X-Microsoft-Exchange-Diagnostics: 1;CO1NAM05FT009;1:BayV6oqbqnFxhC5ezNtD7nrZo/ZiyaUW+QJ9u8HbCxkgGpCbQtkJvdEKA03hXzH/ECmtYbWTq7WFW9hxFHyHvf2MLTxlcmbSKLug1wZlHM0wVffRewFMR3SDAfgL1ivY X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cacaf4d8-015c-4377-8922-08d60e96ac99 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:BN7PR07MB4659; X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4659;3:PzskjfePPs5FH+aDzNx8NhQIRu/NYZEdMxNpEwHZhkEls5laMo1IuUebk3jt7MuRsJyzQIUs7vVxR9AhRN9hctbTWvwHOU+5e/Cvnu3o2z4UIoO6MutVgq+8/+/hJ4ETiPndTb8A7e8PVVAviuPchQIDJhSN3jW7GstONSMIO0p0iQciYh01YNQAozRWMMWpfpe3XHjNcjIkq2Xk1A6x9WrS2Twf/F1H2OWp+edYIKtSwOlimyRylYdEefQYmVkcW7ad6esxWI139DZggyXfBoFYQnOn5DN0SxJK/gdoDRHB7d0iRUOvXlM0xfibZ9i54KECBwz5gQQkVLaYGSQs3ds6rbXKolHr9DV/LQUcXHY=;25:E2TSDKInX27qsDNcbWW9YC3P0oasE31euy6czhpY5rKGGKpzyEFq7WHgZ51o5e5xPSbDzuT3dYZmtNWc4mpUbJasMcbFTzgPYRxFvA1DYIQZS4Qzs+xe6x8yL9FLKOTRzNGA3rrZOAKcUBOtQw18FQEzhBdRtHjAhk+XRJol6hzAfi6R5qRCWAQPyh0K5FPFsqRkqSqyISTMEbPmoYct+nLqxO89O0faV7aZ7BGQ94KslBr30dOmCRRksahaYf9rcmRCNVNMGpb79yypMAkBu7yEwcqVxqsgDiO8CYapIYh9BQoguevxBOfBcKoacq4agC8z8UBgTz9GQNRt66OjOQ== X-MS-TrafficTypeDiagnostic: BN7PR07MB4659: X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4659;31:ABfBGLMWa4GptUIdKLo8ODpJOpOLzbekuAgwGmeoK8G9oBFzrpWK+6DNVogDdNrqf3DqJZtgj2+LvPvmwkPf+XnFndhvjVlhpRi7brke7CzQwaMDlRHtiyx1HD8ROHzTuNKqY2fyR4hSUrvcWfPRCFMqFw++6d3wFusQPKU4A1gxymodwtZ1cXHFRuv6+QYKLfajOLvG4MeXtaYHWcStOqL73URfELk3Kq/yd78L9Qs=;20:8rRClk2rTr8g0jZlBQp+/bvpUee+ACCmVZlIn+91M2uR5DKh0kuRZltWau2CLDKsafCH6M3/UWQXRR0B+5W6PW0iDfq/Qr9NR3HAkXaWF2neHp4wq29p5Po9v2/YebQHNN1WhuS7fQcfrUzjmgATfgTzGpOhZTKj01+4AY4SMqAuGRUk4D0ty95qvD/LgTv5CmleMNdGIbiVYyY494brebOqCCNaedldlKKezN6oyV/wFYX4Mo+epmOqCAkFq7JfAC/88zfkUL7902xhDs3ciPHr7euQD5iHUKdB27jj+OJTEmq8QHwrEnX7ia/k34jOvmE1Oo++1Zt3Je7QTEu2V7UQfAiiyjSnMkfiSLo/MgGcRzEzMvScVeYp10eGe3DLIvS7MFQm1Sq7FQz5xPp2DKQDPMWKC3NfmTDNGbcd5VtHqRhb4NvBzn1U3CJRL5M3s2jzdy8W56CinnC4zjrLF8sOa98jzJL1rP4NyRWdnpKSijUjyPQlTuTZrhwjOtFm X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(163750095850); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231311)(944501410)(52105095)(10201501046)(93006095)(93004095)(3002001)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201708071742011)(7699016);SRVR:BN7PR07MB4659;BCL:0;PCL:0;RULEID:;SRVR:BN7PR07MB4659; X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4659;4:9AeFbipX2o3rB+8YbmeGqq87u10zdQmU3Q+n9JixpzGJ1eDB31ISedAIC0/n3PoB+Kqbl3yCmdu9doK4gJsGslXn+6jhXQKKeQ1IgPD1GKu8aUc8ogqzPzTvDRExWtfoj7tVN/fr4EMGb/0+qv54AvneBr4fhaL/sSaKemH8JHlTakXHNOWDkebGvCZ/AAeDHU+ZkRILW76khVYBDaTBv4LonS670moDeXIPoD0vMedXL+A1BYN1yJ/8YFuS54/lVwwE8BHEXdJtTMBpxQt2uqZ8sWQdo98acUNXOhe+l8FH9mBNqm+cfY7VY58iz8LI X-Forefront-PRVS: 07807C55DC X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4659;23:f73f075N7+oRJQeAIf5HIVZbpYC2FRuemNwVNdyqDG31Wc9pv6Xd1ru4QiUWJLFUKYc5A66b/+/JZI9iScdApcUZRXyvgXoKap+uwrNB7YHWUad9F+eXajrFZiMRZc//+W3uSwOBKzBBP9OZ0RkpqLcuoylrtlCggKavVzubZuhoM4mz6/T8WcIf8LhYLm4ZfbcVtXx7ZvR/fEKlwey/6eEbBODcBnGgWfnLJ1S0DTMpY/dsi2GMTo1SgIPOZGS7j8wc5nszaGtRqsM5U8H/03Kqfa78bLHTbI1xxxpNtQu4B9TGap3y2Df8qIKiGWpk0ApshZeBa3unytb3KWuxrlzsBgo+Rr7ZPT12onepCQHpgZ503K6cPl5vICGsqfX8TA9h7ocf0q7Y8eTbx9gFZLWo36T9liAzSnHMggATN1TL/Hdqt6iQC2KRmn5llT8LxnZQj58WrpXZahyfkFKlvq9vFy1cCtojhKWr7JdulVgEWnRdIZurv5h02zY/w0AOiOwISy1FHI2V8asVJT/rf8pUqgMTZ4i89K6KI3GXEOGaML/z/60+hhojV/sobWlTnHM5b/R1agxWOGTql2jZsDGIOhEkjrB4P6/6mV/2zETRkCRi9e0MG1mZIzs0nU101C85vla0+5Xs1ye3cxbNblXaMCJioQ/ASOOwJJTUMJETFMRvmYTyF7JVJLldkzqhaLlos2++jIKNpnlRHXMrVgQ/A6q7QT1pD/9VARd8Uu7t775i3etDSs8xI5EQ1ajeXW2l/k/SFL8L8lBCx9sVskVc1MrUqD0t2L9rIIGwFRHQ9c9ZtHLvlSDoY2REEuKcPTbNBA2Ce7cKaF0xH8Cny18D5ZTvSxDDEjFCZqc6Y2b9TJwwOpKCGfqB3UdHV6+kNByJwC5Fg8ODjjUAEwhGlrCX6X/fcAjPVhQ0qhKstVTv3PC1SrlsUxvSKO9r6JCmgyETwPbwWF84oXeh0+kCI2Wmm2U+9xYcHmVaDrHP6z7Jx9neRJ3LTOPSuOxorJhheNe0OLtAFF1Ut5Mm6Qhtn39U1Ycd33JYqQp6at06LytC4YcD89Kv5e9VKC9R/Uc2B+8bNKk6ysMMBzbQJFI16ayFdOllouvw4JA1w52VLNrBrn3Y0w3x4bV6Nk7yFtqUIsGU9l+duiejNm5746FpBw== X-Microsoft-Antispam-Message-Info: xy1cClgY5mouHFZu2K6z2jPIHuHRPdGtXFXolwnncvDPy8HoKwr+dGfqiCZQyws4tFwzvcHSkUjYPMKTj4a47FtIzNaimzJPUzcrMSzks5Bk3xD3475u84REc4k92N7Rr+eRgBmashQszCIPhzzSBWcvrdpsIPiqcwjvp4QNjVKYSciZH7cUZ1WZwf1FtILsUD3sQmDCwheUVoNkEjQWvNW/kOhfoLTipI6ktWiBG5evdJ0TvmLVcXS6u3TPxFEZaYd3XN4Um+ostqi6VVPu+PZ274Q0N7F4KdHi6stSrxAXE0ysu16jzuwvM5YQCfhAK/lcPBQpXgkJnd1mZj1hpHNsas+/FEby7No4xCZlJZY= X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4659;6:nnUj2/4GIOSNWUFOWuQ88Tjw/SUM0WyjEJwcrEpAcXRlro9AXGwBPcBsVAkstmVq7VzBOTEVMM3cC6aH7nyjnvR3iRyG2uX3u78BMLoVv1aX6PGPthgNs2RdNWlQvWexCbJIDCr/fR6uBPypBVGGxD6a/G9cq5SfGnxtL0hjzh+GIUcsatapZjWTELYVADZNgex4lHemSrY7Hs9e+HLK0RO7qFijYDCg4fFawNNpw7PRE9ys20bZ7Fgf1Ldx7Fb6fstZxqlUC2sLI9MYX9G6ImXbhMVUNoeHiCHq7LteUPdADUTPXRe6R3TOtIMfCv/n+lVs8Hy0JZBjkis8SanyrcbL6HnHESTFa6Cp/5V6V+/Dm4jv0U1ch2j1VEis0NEv2fj/oU56wNi8kt8D+D/qnfguhgYk+udgIaCk57BEe1M81+7rx+nYo3dAc55MDcBPfKuzInLc/l785vefNsQytQ==;5:VPDTFTXSiEOlRozHahY+pQerBMN2i+X+aJM+p9nZgkN5pZmPjOheBaFroeG/WfklN8gZUGk/+KuhD9AZaRNNdjpSHUjepX8TwAtB9Pz+e2xH+FQG2zWVaTN4IoGm6Mj+DIECqZLMkI7Vt9ijZoOWXRl6PW4P32W3fJ4Ba7VfTRc=;7:Wrp2RTZoGMuMC8ruAJCpsEgFzMwuHDb+a7cyeEbxtnRwNT18LhDrX1sm6j/u3Epckyv/+EHS++9GohrOr8bRj1VhBC5kI6Ax1Dsr1GEzRa7uSszQDozhys4j4d2TNezEXETKKAWU77mAw0SXgMKn+TuAJQrsbId9neUtHOMRecNNurBGU23pDjKmOQxd9jTYwB3iWoqp9m7J5yZX77mQCIy+P+7ZGm0DGVV2fZI8nZ+cy3xzBfwTZSHKLkT0LYl5 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2018 16:36:02.0630 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cacaf4d8-015c-4377-8922-08d60e96ac99 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: BN7PR07MB4659 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 Turn off IOCB timeout timer on IOCB completion instead of turning it off in a deferred task. This prevent false alarm if the deferred task is stalled out. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_gs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c index 6e95ba0d3c8b..1cb27eb46731 100644 --- a/drivers/scsi/qla2xxx/qla_gs.c +++ b/drivers/scsi/qla2xxx/qla_gs.c @@ -4175,10 +4175,13 @@ static void qla2x00_async_gpnft_gnnft_sp_done(void *s, int res) return; } - if (cmd == GPN_FT_CMD) + if (cmd == GPN_FT_CMD) { + del_timer(&sp->u.iocb_cmd.timer); e = qla2x00_alloc_work(vha, QLA_EVT_GPNFT_DONE); - else + } else { e = qla2x00_alloc_work(vha, QLA_EVT_GNNFT_DONE); + } + if (!e) { /* please ignore kernel warning. Otherwise, we have mem leak. */ if (sp->u.iocb_cmd.u.ctarg.req) { @@ -4307,7 +4310,6 @@ void qla24xx_async_gpnft_done(scsi_qla_host_t *vha, srb_t *sp) { ql_dbg(ql_dbg_disc, vha, 0xffff, "%s enter\n", __func__); - del_timer(&sp->u.iocb_cmd.timer); qla24xx_async_gnnft(vha, sp, sp->gen2); }