From patchwork Fri Aug 31 18:24:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10584339 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 3BF645A4 for ; Fri, 31 Aug 2018 18:24:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2AB752C535 for ; Fri, 31 Aug 2018 18:24:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1F0F42C5B3; Fri, 31 Aug 2018 18:24:55 +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 B06082C535 for ; Fri, 31 Aug 2018 18:24:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727552AbeHaWdf (ORCPT ); Fri, 31 Aug 2018 18:33:35 -0400 Received: from mail-by2nam03on0053.outbound.protection.outlook.com ([104.47.42.53]:32544 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727545AbeHaWde (ORCPT ); Fri, 31 Aug 2018 18:33:34 -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=l6Qt/3GRj7kT4woQT2MIFMZF5i2NkQnKCZM/AeWc8TuzVVBPEPPQiEEAts9cR+RRQVXb/+k695HHkmraigDLbFpWXJhalrvOYs+49+33G1AKVkQot6RWdKWTz1l0aSRB8MLdZd1IKAGpxIcT2yBlymhWuPOf+15dmuYexmfpGl0= Received: from DM5PR07CA0086.namprd07.prod.outlook.com (2603:10b6:4:ae::15) by SN6PR07MB4398.namprd07.prod.outlook.com (2603:10b6:805:58::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.17; Fri, 31 Aug 2018 18:24:50 +0000 Received: from DM3NAM05FT030.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e51::209) by DM5PR07CA0086.outlook.office365.com (2603:10b6:4:ae::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1101.14 via Frontend Transport; Fri, 31 Aug 2018 18:24:50 +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 DM3NAM05FT030.mail.protection.outlook.com (10.152.98.142) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P256) id 15.20.1122.2 via Frontend Transport; Fri, 31 Aug 2018 18:24:50 +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; Fri, 31 Aug 2018 11:24:41 -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 w7VIOeP9024249; Fri, 31 Aug 2018 11:24:40 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w7VIOehU024248; Fri, 31 Aug 2018 11:24:40 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH v2 08/14] qla2xxx: Turn off IOCB timeout timer on IOCB completion Date: Fri, 31 Aug 2018 11:24:33 -0700 Message-ID: <20180831182439.24182-9-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180831182439.24182-1-himanshu.madhani@cavium.com> References: <20180831182439.24182-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)(136003)(346002)(376002)(396003)(39860400002)(2980300002)(438002)(199004)(189003)(106466001)(6666003)(80596001)(47776003)(69596002)(4326008)(8676002)(2616005)(126002)(336012)(486006)(186003)(11346002)(476003)(48376002)(14444005)(446003)(356003)(50466002)(44832011)(26005)(8936002)(50226002)(81166006)(81156014)(305945005)(86362001)(575784001)(106002)(5660300001)(2906002)(316002)(110136005)(72206003)(16586007)(478600001)(1076002)(76176011)(87636003)(54906003)(42186006)(36756003)(51416003);DIR:OUT;SFP:1101;SCL:1;SRVR:SN6PR07MB4398;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;DM3NAM05FT030;1:3DxOQGY6tq0rPWS0oVGdzNWjtwRlrhjb3RhdW8NOKkVG/oSc5+7q9FQbOlTcUYSRn4Ay7id4JHwfqRC1UfTZLSNaPE5JtXkqhtB7k98/lR83l1kY6uh+GCxjc3R/Bnw3 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a796ce70-de77-4f71-a291-08d60f6f0a45 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:SN6PR07MB4398; X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4398;3://sllKphQZIGpUVCqoJ17rYUU6lq4idFtM3VJinpVw+N/xLyZhfz5yudqkyxLb6ZqKvkSlWqRHBtq5ky2+IQ2JljPqkp5UenTKbu3YojbWJ/n5cpF4SvmFbBYT0ldMfys+KH/Pq9hiSz2qt9k1ldJqdDemLsrcBdBLEX6njB+pggIbYCumHT8xSXqNLGQzoRSObPo77f6jtymqmXa+iqsvXAJ2ccsZfIFKJyNGpZUL/8OYMtMwVDSSKVDRYDEYMOuSvEfeCsNAN2MMkD0LSXvkQJj8nWQB9hoKbWp/BXI8h9vcLlqnkw8QPx1G1Qc5zN6ZbjGegBqiOQ1bIUQyRMllaR6TpDhsc1VZyhYr05N+U=;25:CdmtW2flm5W8rhTCwSeAtBZrNAXGleoTA9BSU4X6QsrJ+9n1TmZ/7/OWKEqtIpn6jPfCateVsJV9aTehCHmwAvM2X5ceee6ptFLEZS3Hh6AXyUXiSb0ERm0PMwtqhH7mkQRaSMpa85Xs4S7MFLwAfubWhjMnmPeA9dI+BPWqrhob0OTGZ1rndopWzIiT7PJBMvywahiv0KKs8atUvABRTPzKsoNQv3HCZSYAf7f6YFcXRAs9rmVR0mhdUUG7UYwv4Ai/9F23WdoyP0h4nuR7vEiO1bjoFFL4EY8EOxNqWofpMSEFsyafqq6ynIyKfKWCYLyABvRyA0AtJGO7u/bbCg== X-MS-TrafficTypeDiagnostic: SN6PR07MB4398: X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4398;31:y5WzegitP3jGAdCtXP/KlHLTsAMWX0tbR4vGpLFO76drunR0RnphYUWZGQkp4V6bRfQKUsKJ83jsPKmOTw5JEIWGuLy9GZl5WYSQLsN9vRPzo+PWTUq4WzYP5ixKoh+V/Ck3rxwuvd2ebjPEQMr4E3JhQseeCgtOdqgyrWJCIP+fQALn09UBHHnr7JEqvQoczjSCe//Lv2XH7+DzYAjsSF0B8y7ylgwuaMencenEc/U=;20:GX5e+BhRFyzkgTlCfBeluWi5ahnm107NZe/eCOPC3W+ut+tBlUIkd8N3XdhGVUH/zraOxsW6LffU1lnYlKhT0RPdYy6NqMNzPjIymhDIBQDqWP3UQFR0rXDYfSxCNG4c2bDXTsXt8OngR4IqVviM6XAAW+Ur/WmjCiqXR2ZWNq2EGFKBGkxNLdqEAP5M5nL5ed3Vofvgfd5KWmiujt1heLAl3vQZ6xdTjgIKbOudCiD6MVRYFAPy+tid77+HD4Yf+3lh28ptKbb7HsXZ4CdN4k1jhDLloVH9DeGbCP0byw/ceZesean2RG1Ko5vcJSvf0jYq74ASqGyC1uzFpWzlAT3e7PqGqA+gfOgBe/0MR7NERjEGlN6ALPA14z4Pwpmwk5eu96FsqQGF0F/vqJrCDisnHNdgv2+BpUuTCWHcawasF5r5YrpNU+HjoVssgJ4H2GSd0D0Qbm2C+5VJ09p8vBq/T/Ue35ecFA0fW4B6Danl7Zp6FadzvcoibP6gAS7g 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)(10201501046)(93006095)(93004095)(3231311)(944501410)(52105095)(3002001)(149027)(150027)(6041310)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(201708071742011)(7699016);SRVR:SN6PR07MB4398;BCL:0;PCL:0;RULEID:;SRVR:SN6PR07MB4398; X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4398;4:Towljbg3T6ARe5Pb62UyKIEXMfUl7NTG38m/foJnsmYuwQA/Z2PkzR86gTC6//a41Cto5JqLadd+/2QIKrfvZiZoGxp6OdOnE9hASA0IvLfiJKkScFYUVAt0T+fAYx5+yFwVmCILT/cI31EK4nJp5jJrZ+mYyBrNQn/1/dDlylGrVv9AMh8OBkIvZ/iuA9WmFnaIhVDnEXUXQxq8zbdTP+lFqEpt6xShuQVmqP5AtLK5likHXw7jDBQBbA1lPnevw63dJ0uA9uY1YPAJBnGvbpnEMMxHSZNo7PLGuCT/YaS95rwXAuGnUU+RZECefiLX X-Forefront-PRVS: 07817FCC2D X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4398;23:2/4h2zqaN0KfzPaW/RzFr1Xn6LYM2zMmibZFhNdygvVsj7y735oHSyR3ppIB/szkgmOFBTMR9xm4b1vNjBgPD4+FTkSXHB+utaoefvOzZFcnzCuo5cSHN/vbWLoKWQB8P1FNHBJGeZnhnOO+n//ifyuvWRB5Ti+wAM3X3eKbnfsGclBN0hZuyK0Ra8TNjzYefbcxelgf8oajIAq1yhTwUDloKgnUWPyNOl8pI827lV9UM3Prj7/TvyEAy6Q7aKQc+kn80qt8/HETNQVIHrT1c3fUubF8ZSCnM0kgfuostTEfRm4ggiUDfdBxTPkOZqDY02rU2MTiEUHERKaw2ndmn9qjvfMAMUPMyWciqKTuVqHaApdnbjzQt5SnJPt9s1Vi9W3AEAH1sIopXqsQCPnY0STrYYfIHxzd5d/eV02+JEBiMilrHGM2HnMlTM0cg5rLAYSDazSgZqh3+OrjCo0wEICAp+DXGKyR9bE6IIBOjZwdiOXDfx+Zw7qoKf2+aXxfZJR6PjT+BpC0Qv3pQ/3RhHN/5xQYMCa7KeKRyPiWfa/+yDCvE9oyT+v9YDxz1ASrFAxjV5QS/g/WgLpdCBqLqfrb2BwKPNz8nMiakHahUZapDaB1UR6d9qzW3lkPeE8b1l57rGbmLetwjhv6iL4kzTMaRHXewYchHP30Qs8f8c9UoLVAXYavR+FBTa2o6CvAZOV4flpkheIU/OAwNp8kSodrG/yKwDDGJwqjybEGXpeTXT4JUjKmGaVnOYwvQ1FsDVX0gngET7qN7Gx7pWyyWUS0FnmG2hmEgKfS5aKq52DjWHNujgfY4d2iax5XOBrH8yo7GkxvZfkGTlzBuovpTrDfg+oQ0BnhjBWvRN0xZ3M1K4IqmSjvKHvkh2e11Fqa53ujM1biZBKFAe4mbFYi/A1R2MC99Ooo8P9+z1sBAOi1xKblaIwEojEF+VxuZBTVWPnzpAnf2sOr2qpdGf7YtOJwzfvLqJLxjJcxAktMWSbUBeX9n7cQ3ZjPFceCH3g2Jz6JeCtxDFnye1MZrJ/sMZrRUuptrdqW4/UNxhD5GSeItJSqPL/eXB4I/MTAhzl6k45zkNAGt3NSWC+4PhmwojpgWACw/qkZGXLbDqq9hT2nKQlwYluIR7mP6Fpf95mQsK1JRj/ERVGi77XtHHRDFA== X-Microsoft-Antispam-Message-Info: z41pAH/pSgzeQL0BG8wZ2BJkfvX/jOv/6yTBhifr8+grmcVrouz5TlIpt2mhU8fKJ+pRWi+Kiw7YiiV9KMKja4fQyFsd+byO39eQ/W/25mrGD9D58HJUfdcY/gwCOPqj+6IYU+39iglXSvm4G9tXJRTYxsnFC/GmPT5BOvIwn9T8v4Mkjh90Yf2+U2jyVct3PwFlm1qlWEwMbdmJbeCwXPxvkE92p7e+h5KQj64IriIeqM0sDJXUAKV/KJ+3+jllXPZsN6pscpiU+l0+ZFaNZBphXJyS+MeOXLVMvy6uvAvTvsyWM6aRym/yBjp0p5AmxjWfMnckz/9jxfvlN5sQYYAytsGFctxRJaWmFdvcho8= X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4398;6:pkoy2nF/+jP7JtNLZxzToDq/gO2+H1vFfTwUR6CkhuP+KOgLqUqgqG7gcmQZeJckHVmsxjwG2Yq4s7VDyeSIeLwpbve3v8GX2d7FODsgVNi83f2iVboEaiaAoajb2UrMQ5wJJwkjsa3eAnMWQGgUJacsk19AlfjT+H3VVLY/Jlxw4MUB8BqK0wkeuNzvWI0DCDBp7Zgx702KUDN6y69DYXxOJFLCz5AZojuWOUzPnMCq5x2BDirzfIvYRNOB8MiPKJK6k4qo5SnNahMjgE36P4Q2KdA29VRpbXOe/jYxjyN1DOMORQZJlxupSIcYpenbonKWr89GXWrHuACG0NZrnAhhU6hpgjS5JVfF//+W03ATdVC+5frFPnnfRNslKavXNrZe0l+rwhfgltViLxk7QltdicBTC77cEDjRb9nxoQGTeA2JIo0lTkbwLEDMK6F90saRQ2KiHuzjEQT2aCeo6g==;5:8gDBmDof75Zj0aCMIYOuxS1hfn5LbTwrnWeOeyrC4eGARxO8jFDTdATkMcloKONlwcswAt606IoQkPVyPZAzpVdCkii9oJ7FhRBBGi2k2uEwDKsf8LNAuFAV1uAu+XnWKa08MX18bjXYSSzv6CxC1YQWSTsYSJ8wWo5wjRCN1fo=;7:3Nn58oAbaFK2L/EVY0ARb9j/vEhX3iVw/ryXDyHDXkaERR0POKeq5ztpebQxt3JXPumatEPaWIX101DCCa29fyPf7YcjJ6evHjlO0PZJnpamPzjrwP61WaaBcx9cBu+kNpnu1dtsm6LfABlaOjJtCnS6/HwJ1L+rr89092Iiu6uLcl0cMkUsxxc4Gs38r6hm22feSmISnaWNHfzaYL6Ct3sliPkhKVQdb50qSXNcpAh5uZk0FWFRVV4XgRA1Newv SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2018 18:24:50.4657 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a796ce70-de77-4f71-a291-08d60f6f0a45 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: SN6PR07MB4398 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); }