From patchwork Fri Sep 28 18:02:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10620239 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 BBA1915E8 for ; Fri, 28 Sep 2018 18:02:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AAA112BFDE for ; Fri, 28 Sep 2018 18:02:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9DB1B2BFF4; Fri, 28 Sep 2018 18:02:46 +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 E88E02BFDE for ; Fri, 28 Sep 2018 18:02:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727059AbeI2A1j (ORCPT ); Fri, 28 Sep 2018 20:27:39 -0400 Received: from mail-co1nam03on0069.outbound.protection.outlook.com ([104.47.40.69]:35086 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726137AbeI2A1j (ORCPT ); Fri, 28 Sep 2018 20:27:39 -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=e4kimz+jNLM3wn2rlQ5Izmr+E1EARxO/0TXTn0CvrvI=; b=jXznTALHZjCocvs9nDLGrNLD4+Zwbxdnj4cQhQkdG9v94HKSsBnNmNeDtb9plstpp3fpAoeDoXIPcI1/gHBFPjKKSx1nYAcRw8wHY9cq/h2iScIcRotkGgg+ybhp9Dlxwk0/n8WrhlRuM68zaV7WaoXkKSJIac0AYm2AEj2pF28= Received: from DM6PR07CA0034.namprd07.prod.outlook.com (2603:10b6:5:94::47) by SN6PR07MB5503.namprd07.prod.outlook.com (2603:10b6:805:df::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1122.20; Fri, 28 Sep 2018 18:02:40 +0000 Received: from DM3NAM05FT045.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e51::205) by DM6PR07CA0034.outlook.office365.com (2603:10b6:5:94::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1164.22 via Frontend Transport; Fri, 28 Sep 2018 18:02:40 +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 DM3NAM05FT045.mail.protection.outlook.com (10.152.98.159) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P256) id 15.20.1185.5 via Frontend Transport; Fri, 28 Sep 2018 18:02:40 +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, 28 Sep 2018 11:02:39 -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 w8SI2crL014467; Fri, 28 Sep 2018 11:02:38 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w8SI2cHS014466; Fri, 28 Sep 2018 11:02:38 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH] qla2xxx: Return switch command on a timeout Date: Fri, 28 Sep 2018 11:02:38 -0700 Message-ID: <20180928180238.14432-1-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 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)(136003)(376002)(396003)(346002)(2980300002)(438002)(189003)(199004)(110136005)(51416003)(14444005)(72206003)(26005)(106002)(34290500001)(478600001)(486006)(87636003)(1857600001)(16586007)(36756003)(54906003)(336012)(42186006)(4326008)(316002)(44832011)(86362001)(8936002)(8676002)(81166006)(50226002)(81156014)(356003)(305945005)(1076002)(186003)(48376002)(2906002)(2616005)(126002)(80596001)(106466001)(476003)(69596002)(50466002)(47776003)(5660300001);DIR:OUT;SFP:1101;SCL:1;SRVR:SN6PR07MB5503;H:CAEXCH02.caveonetworks.com;FPR:;SPF:Pass;LANG:en;PTR:50-232-66-26-static.hfc.comcastbusiness.net;MX:1;A:1; X-Microsoft-Exchange-Diagnostics: 1;DM3NAM05FT045;1:W2+KO79Bdu2uo0kkXAlKMZVSqqzy1CCemYZz+qFNyaPjCdkZJuEh7vDFabnSQY3aJh+9Ln+ABeLI/lnHGILR6UzYOmUwNyoaXnG3ObY41HXhW683cZKk7vaoBfnuQPwX X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 60b10eaf-8cbd-4650-4ae9-08d6256c9514 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989299)(4534165)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:SN6PR07MB5503; X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB5503;3:ojp1rHlo1FZVhrEDGt00BjH58/myfT3V2n7yi5W89NxnWiX5sgW51xPRPba+3O8Mq02Ps7DwKzL+j60+ec9MF2/DDS0AFCKq2UWv78IWDajPX+b2LlD0FDBtbmDUCFuB9yETOGEBs/EI1ZdZE4/sTyF2bbvX5CSjrWhjfoToXD3yIp+Yi2bBiIiP5i1ygS8P8VReZPK3QoZLV93B7cn0IFf8+I7Hm147PMoB6OekXrgpdwR1IsBfl+2hRPyhKU6iHjxQ+7x8xTebXDB85uG25HPQqfUxf5HWG99kZvDBkw0i4otnPdkDlpPsVok/pj/xoGkjR3yGoJgaxib8h5gVOotCSDLgsb6HeKpH7qoLbac=;25:/A37lVh3WIeRX3HLYzcWnW8JzMyb/UZqgdKLx/ozJVjDq59xH05szSi61/admx79YyJ4C88jbjfXosau5V6Kd2pyWVHsbjdjfDQxUbEjJAILHTAq/zJ1oDyVLzcIGYLfHJE1otDneArzNfGJfn1cASaiW1GvX5dv3wQNXf+V9D4iFO0OJPqM9mIT62mMV1ppD4obDFKL90YefQQjG6MWIVkQmyv6wv6I2/6F/WC0qX2701mKqzDmLosLEx3PesWX4asY8PkEnt1XPFPGWST/jITBzRRLr+UJJDgWlnrcEK/jswnrkOU71SbBycdkEdbAeL+u5rVeQISRHqI76g0NLA== X-MS-TrafficTypeDiagnostic: SN6PR07MB5503: X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB5503;31:Zq+PPEllPiAh7Nq+M7WThVQsedmXSDRVM3+NokFOMDUkR7yxFU49N7rRBXFunhVbWpIuCL0LAH2uVPGVZu0FNyd9xfxT+7RnH+Hk43hvG2l6as+Ok3mYuL84EdQXNoMyt0t39lJN/805qh/mIiVaTZECzvRz/SuMMuD1AEguP0GAjBBeyGwlzcnwadhPf62PrjRDCoIeBgxyHOKYTKiFS3exEx8zPEJOugSRJ1LcPzk=;20:id73hPLoDg2PaiFsAiOtjeAJ4gKOLZfhtXTSW3o0WxtznQhP/p9lZkx3ScWDBeevgF2h9HLN+Gkni6c8QpTixtnuxDMmbIBxQZ00qA7W/7Ij7d8I3e8vws7VJ0KqumTpy6Y7sg8h8cMrO26cstyz6e1fYImmk6ssBRx75FCePKac0jSRHQLM+9/CioEoJKQ73dcWKkOTVb8S9C7NEnIHbKS47+DYnufliplEGDr1N2zo0kxUeWhADMgKGPjoemB4m1PK15Afnd96huXowi3SHDwAJ8gTqmFan0Md37DAYVk00i+k+OtRM/N1+7rnDQfHRS3luJwOou06gkRpQseeQp3ok/xVZmHKMhfsTLJLmAGbFdIIXS4G7+Q8O3GZfnTqv8UqtXO2HL0IP7T2YGLLOrZM7jyUfmcfcBjbQf6tRtTYx7L8DtYsVVbKPT/ifuoh6EKPIdU8te+dd8mN6iHsXu2YSBcrC+SFLTP7hzePXY1Yp0ozfLuIhMTr9xeWCgfV X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231355)(944501410)(52105095)(10201501046)(3002001)(93006095)(93004095)(149066)(150057)(6041310)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(201708071742011)(7699051);SRVR:SN6PR07MB5503;BCL:0;PCL:0;RULEID:;SRVR:SN6PR07MB5503; X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB5503;4:KDt31rwqNyXHCFmSddzdu7LuWKs2a2fXRzKz+Vaj3fOihelSKTziir+AwxaVIwuf9Z5P4fVOyiigOEqLkW9AF/pjhhiQnNLoljbBst6oc2WzM1RlSpd0t91BN1ea559KYkgS4Wr7IQr61kdIFInBq0JfVuK82f/r7OR1NR7C7nLc7W1JX910ibdKOshYG92NheMgo2+EFN8mpawXbHmK3CfitXE69MNWmGXrYobk8xr3H8X12Vmy8lK12a2ssF5DDvf+Wm8MR2xqPHEdYUNciA== X-Forefront-PRVS: 0809C12563 X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB5503;23:Hob7BNL7RKdZs8gQmpkfSUcCdM+qnTkkQJyRaueSgwSGV9Zh9z4hV/NZZOHkz/9iVNY1BwJRZKgENxpjMhoqSQnI76qnH4bk3UkpyNbfLFZroe6a7qprWQu+hEN7vmXn+OrjFlIcFUlEkzxigiRqPUt+st8jChCu1k6GGphEgUPqozPU0DndRe4bGUzDLodWmY9EyicAGlWPyYAy/e60R7ymJLwtk6o63ZE6NwiDmvtm2+ttRNq9gfmyxbDJdESpUdPUfkzYlTPSZ7NFp79rW1uPYdMnXwKkbGeFbfCM2khws67LGscmiftyQ7KJBVzDR/XiUODslxlBzgyQuI1qiHKhfVov38vuYxK0JgwybboX+eGlJai26nwCoMF793LIWijJnY7HzEuwt3eHbgVG7Lq28xWGwixJAUMwvA0jQCwkcHGCuAtEFw+00guNzLyKjHIQ/jkA6QABqGfG/mIdxwvuMZTjcynQ6c6voU5lacoVXwFdSGtmJQyaDjKrGp6ARFg5sseZTi9dfnu7QTzlgVyYszYftLNZdDQLG5p9dP5EJVoiyLIW+y7ah3Y5bUyxPnpWmktcjp/xkmqWA4YPmVhTVIZeVpTeTcyH+SGPJ7Qr1/hr7x4Si/s1mhWqDrkJIgs2Q/AYq/8mtg2eLZl9PLGc9rTtezpNMQ0XdX5PDqQFyOWFhR/rNU+J8MeW+fe6z8jU4CDzS3doIHxXoz7a7dgAVaFAcolhgj1gj5+hXHvba8SZoYx0M9WD1zJ858H1+vAnOelMSu2xdyI8mflAAwN92xcB1ouVXVYcZCYCpobAUJHlPC/LEROnr2OgyKecDHtveV2sDJW+6Dm2FtsJQ7nj92TZptDLv/QP2RIu/FQCd0DbQOXJFjtBNKQ8uL6YIyIzwfig0XzOoU7EDMxOxOmS1gRtn4BzUcNChtsEXvZ7dxRKkEWuXd4vyiEMKt53OM0RVdu/F6SHXfTyoPiI/B6BT9EOfYV6qRjBu6NPiZJYrDhdycgGPFoQtQYKct1zCdB9fj9+g5slgi23Dv2+VLcsxH5BP7f+dsRSgyBL2UaVRHWwlKVPHegU6drRL4KBXkq5WP221MA7dflHTujsoA== X-Microsoft-Antispam-Message-Info: MyGbNjF1CEV0qwcAa2+8BLLw0BTTeMEpm+Je5UaR2kOiSfshbWdSTJMkHDDYlmw4NlGYxcf1sSlYkP+giecbonijjunEBY4l77aDQJ8Z5vqyWRLq7DtyOonvNgOrikxVKiYOPYtaSsC5X51kDkbahQ3eBFV9GLFuF0C1ApvCSX1xYs/fkwQrtK4+S+ylLPLwaFJW5mbCTIReypk3y+kguL+rdtEQ+j14pyI/u8c8v01mw8mxPh06vbnZn7BUMPMpvMy8gzqt4HKDBXuJdVAYeRUQ354QqG0vTBa/GcjXisypK/9jDP14I7rSDWBXzAcLtO2Pr7tWilGOkFEspQeMh/YYgtpbxw4g7FOT6MKhCT8= X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB5503;6:W2tsaA47o0WIndbHahEqEdOhUFJrVhc0/JyaQNDQVIRxubgdYw97do6atUrMp7BDD2CTGPZBds18sD6KYq5aAd4OT8v+TXeaXWIXw7lHRmoWpCd7swL4gc5/kI1GYRKeCc1k4yxUn9YXtoOeJ2WycEl1GlYa1OHFaH+4gWg61gRjV3Qe/t8PFfAM/gcAzJ5aonMzikh6VbfKLDrU7aG65vyObWtC8laI0ESzI2s0hze8sjFCmmjaCuWpVIPl1sfEt41Qf3/np7nzbshPHzqta3yZw70Gk70qioZor77nNJgTiAJOr+3IDMfVC9kYZyrq7/3mcLFJMFXMS1d/kmj6At1I52wfW/sEgKDCF0oT3sqEj8C0ExmDjVbwHZupKdtQgWHOPXa7bULgwLfH9OwvtXFN2EBz9RAk3MC/BTDGW2sTyb8sqwhQ3Gcl9IbgjF2k0YApRdRBHr/GjHCrAO6Rxg==;5:eoFgCI9L+HIPQo4ww49IJsYNNxrzu8Dln7DftHGZPVghekDin9mU4ExlFVKZPnqvePr8MN7PRtbdSDMqSP9GmnhzsmleLDS3utKp2as+Nu8YYedvVtWGUmHzAl/xWtd5nKAJJiXPiIEnmWW+M2PqIZVEAC14+KezydO10T9NIUc=;7:bWU2rz9YzPFs5buTieoPxRmx+ZFZMyAgd/gHhhzCHM13hjUSGonp5+sDo44B+Qn9h+SzVf7mn0y+Hh0IlVUygBJLb713xHUAJ0fvFvmBR047m57YvbRD/IGr9Yh1KPDjyNtQG/9Gkux/MErlF0ItBYmzxq5NffZa5TC5g5thOLOFgvKw/5N/Z6Jt6RG6CAKrLcGDxQ9R7UKcvinLDW7Un7eTKz+Th3bI18JDkEppo7qMiU7G8I3byBtDKnwJNAQi SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2018 18:02:40.4338 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 60b10eaf-8cbd-4650-4ae9-08d6256c9514 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: SN6PR07MB5503 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 This patch fixes commit bcc71cc3cde1468958a3ea859276d8d1a1a68265 which misplaced code in worng routines. Also updated the use of WARN_ON() to WARN_ON_ONCE() to prevent flooding log messages. Fixes: bcc71cc3cde1 ("scsi: qla2xxx: Fix for double free of SRB structure") Signed-off-by: Himanshu Madhani --- Hi Martin, I noticed patch got applied incorrectly on the tree, So sending this correction patch to fix it. Please apply to 4.20/scsi-queue at your earliest convenience. Thanks, Himanshu --- drivers/scsi/qla2xxx/qla_init.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index ea7951eb05ce..c72d8012fe2a 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -54,7 +54,7 @@ qla2x00_sp_timeout(struct timer_list *t) unsigned long flags; struct qla_hw_data *ha = sp->vha->hw; - WARN_ON(irqs_disabled()); + WARN_ON_ONCE(irqs_disabled()); spin_lock_irqsave(&ha->hardware_lock, flags); req = sp->qpair->req; req->outstanding_cmds[sp->handle] = NULL; @@ -792,6 +792,9 @@ qla24xx_async_gnl_sp_done(void *s, int res) sp->name, res, sp->u.iocb_cmd.u.mbx.in_mb[1], sp->u.iocb_cmd.u.mbx.in_mb[2]); + if (res == QLA_FUNCTION_TIMEOUT) + return; + sp->fcport->flags &= ~(FCF_ASYNC_SENT|FCF_ASYNC_ACTIVE); memset(&ea, 0, sizeof(ea)); ea.sp = sp; @@ -974,17 +977,13 @@ void qla24xx_async_gpdb_sp_done(void *s, int res) "Async done-%s res %x, WWPN %8phC mb[1]=%x mb[2]=%x \n", sp->name, res, fcport->port_name, mb[1], mb[2]); - fcport->flags &= ~(FCF_ASYNC_SENT | FCF_ASYNC_ACTIVE); - - if (res == QLA_FUNCTION_TIMEOUT) - return; - if (res == QLA_FUNCTION_TIMEOUT) { dma_pool_free(sp->vha->hw->s_dma_pool, sp->u.iocb_cmd.u.mbx.in, sp->u.iocb_cmd.u.mbx.in_dma); return; } + fcport->flags &= ~(FCF_ASYNC_SENT | FCF_ASYNC_ACTIVE); memset(&ea, 0, sizeof(ea)); ea.event = FCME_GPDB_DONE; ea.fcport = fcport;