From patchwork Thu Aug 2 20:16:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10554169 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 882279093 for ; Thu, 2 Aug 2018 20:17:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 74B2A2C444 for ; Thu, 2 Aug 2018 20:17:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 68F742C459; Thu, 2 Aug 2018 20:17:19 +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 052102C451 for ; Thu, 2 Aug 2018 20:17:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729774AbeHBWKA (ORCPT ); Thu, 2 Aug 2018 18:10:00 -0400 Received: from mail-bl2nam02on0081.outbound.protection.outlook.com ([104.47.38.81]:12096 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729034AbeHBWJ7 (ORCPT ); Thu, 2 Aug 2018 18:09:59 -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=uDhF1kfPFQD3BJ5KmWU8dQTXhgM5YPsEcysmYhctHGY=; b=m8iGdcvCOzOdUoI0ke042ip9AqBUns4eB1B6YHj5Fh8KxXwav12J1SWsmrqmBFeJ7AL/0G3grI/ncWzVBwdkRy/AQxmqY5BOpl0vfMHwjIFJ7hkJFwkRUuod4ZoR6/CigW+AdlTPEZk/Osnv+OjGTdIknTVWWrJoixpR6t5+cwQ= Received: from BYAPR07CA0024.namprd07.prod.outlook.com (2603:10b6:a02:bc::37) by DM2PR07MB1466.namprd07.prod.outlook.com (2a01:111:e400:50c3::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1017.15; Thu, 2 Aug 2018 20:17:14 +0000 Received: from BY2NAM05FT024.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e52::207) by BYAPR07CA0024.outlook.office365.com (2603:10b6:a02:bc::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1017.15 via Frontend Transport; Thu, 2 Aug 2018 20:17:14 +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 BY2NAM05FT024.mail.protection.outlook.com (10.152.100.161) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.1038.3 via Frontend Transport; Thu, 2 Aug 2018 20:17:13 +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, 2 Aug 2018 13:17:01 -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 w72KH10M007990; Thu, 2 Aug 2018 13:17:01 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w72KH1nq007989; Thu, 2 Aug 2018 13:17:01 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH v3 13/16] qla2xxx: Fix stalled relogin Date: Thu, 2 Aug 2018 13:16:55 -0700 Message-ID: <20180802201658.7903-14-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180802201658.7903-1-himanshu.madhani@cavium.com> References: <20180802201658.7903-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)(376002)(346002)(136003)(396003)(2980300002)(438002)(199004)(189003)(81166006)(48376002)(81156014)(5660300001)(50226002)(106002)(69596002)(16586007)(8676002)(186003)(4326008)(54906003)(2906002)(80596001)(110136005)(6666003)(47776003)(50466002)(87636003)(478600001)(42186006)(44832011)(316002)(8936002)(2616005)(11346002)(336012)(26005)(126002)(486006)(51416003)(476003)(106466001)(76176011)(72206003)(356003)(1076002)(36756003)(86362001)(575784001)(305945005)(14444005)(446003);DIR:OUT;SFP:1101;SCL:1;SRVR:DM2PR07MB1466;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;BY2NAM05FT024;1:gfn2Ck+XT+izzEwfi2qZFTHtCzpsNzasyqv3YtGHUB48ro0mM6dkQMbbi+0we4Z+pOQZgkQzdzMrFtYzVqjxW+UaEJkSRduA0KXXk6xKnKWpkMKReTCmHNZdNqghP0bS X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 35ec7527-84f8-495f-2128-08d5f8b4efa1 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989117)(5600074)(711020)(4608076)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060);SRVR:DM2PR07MB1466; X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1466;3:NwowvD7LjTZQ2/eKQGMTYbxIrg4q/N8cvRxLE+AGqWq8mkVMmqnRi6b4sLxd3UHwS/muz1UjZH+ZDG5oSfBs3I+1wk3CPIVjzKe8YtgpxQVn7IA8o18kOpA6n/MPPSVG7ea4zg8RVCoZwYZvOyfbotBp9ujaRCBJZj3JUgP2dzEZEmCCWQIB0pe87pVLGNnySroYY+ciUtBEjk/IDZJ/UUpdYJ7O8YvGbIouzyuh9qVkkJMCQnrlZHf2CAWU71cEO9yzSTMYwieUErMg4W8MyxKUnRYEBLRYb8v4btpSwRcT9/yqCghyRTjC3ZibJ1kTyStH7wyDOKwCja+RyBdv5Vhr978VjouAUKXlROv/Uj0=;25:4Ctxrf6LcuDBOCvAfua03pjY2qR1kqHE2Lb2H74JyLy4di1rIlyoVnLfE5dvQSkoiAQ0BYnYW4H+rt+Pzch5/Z0jjiLOs92AjNlN0r5W7lynuOYZE3v3MFUXD3Erut9lsJBmOC04gNuVtyqELJ4++zVzNVMxUvNSZWZogXIW/n4QXj+d4liMtH2tiKcErDR5gS7umEF5lx1zZoBxTQbysykMpy8/dtua6ZNH3GdhDw35t6Eir5FDbyOhRjrduC3FHdjiYu4GLyAoijcJ04obVNkZiaNK3bBh/NZ2cctVcxFmYF8LATlJNdkr/N90xg8KKThrjIeIDi3/nXpXerjdYA== X-MS-TrafficTypeDiagnostic: DM2PR07MB1466: X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1466;31:qTshWUo/yDUDdRnb0PbyOtKircm6nMXhaIsvLtbqHIpkyUDY9GFQjN4BOm11ig6kQL8PzwWM2+jPUPxsiZI1PnVDLmO/drWLEvG9vGF+K0JAuhHwEA+HibDr0kfpCxVjyO8y0+Fy6b8tO3zSHU13RuUwPm2sQbua75itzcg1IFr4U0FAyWsjdKeQ7qNS/rQGiBVSPUabWWRb+bJ9XsoAcY1CwlCDWm4qvg4zF1QeOJc=;20:RnDE0TeyYAhQcpVrrxz4Qwcw7AlgvrKSWma4Wcbn4tBS57mTuBqU55EWC91wGM821JMRTGtNvauEsXn1jXY0jBSQGHVImVJS2cgC5NODuX/ii7KYsNhV/24eB4gykrWpE7UsHDIlgZ0tRORQbkgElM/F9nOMcJFlNt1igUab37mL/YQ2nLqSdfmUcXbdBopd4Kfi35Kl3LxL27HMxzE8Uvr/HPg3kBkVOX+ifAhJE8uXdhPj3opI7id3ptmznXmmtU4F0il+2s5UlkXpssqnoX97BGBNt2V6aRbX6/05Wgj6jqAkYeeQxjRSpKVRtTOPkJaJ8vn96920j4mc5TJ+60T118mXHWDbGUQ8JWLrvKureH1pKrolMiAL131f/RSlJU2pE0QoTNAeQIyJ7KV024hgFIPDVSThJMVMBTAHQ6PrKiwECZwhTxngdD1vkdSQ1BL/4lPgGaWi3bKm5jxt6lT01siWVDLINqQ57MhQNXYwV3UaxjtJSuYtGOL4lNGf X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93004095)(3002001)(10201501046)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123558120)(6072148)(201708071742011)(7699016);SRVR:DM2PR07MB1466;BCL:0;PCL:0;RULEID:;SRVR:DM2PR07MB1466; X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1466;4:86mPZG8VrDFvJcCXKQ47mekLUDk3IIeAuGzJmbmHySNdCQrQXNal2uRXDhiVCsAjQ98AgQyC2dHNmu1x1wi9xFQvpzZQXo3KGxam+uz2NC4lXf403CZshPLN+JtYCwYZdg0I+2CAIaf80vtKjAMXRoyHbKVnkmfHqBwV/Oa7raNAsPSLtjnVPFenPeuhPzHchg58kiN9oQOpyIY6pGewfTWqpR97fRfbsy1FPL1Y4hHb2TfD8s0fZGYTsGYnJwmq+fWSRFAA6gYncgCqRo6sMyuS1mUplq+NWNpWQ4LcRVmYkB2c1IbxSJC1nqwWohIL X-Forefront-PRVS: 07521929C1 X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1466;23:N503SAhVI4rmILtFlYoAkoKjzmXI1vJOK+F3IRopdRIjj5iBxd4HqMJwVH59VVDYj+BiETYEQV98zDU+j3dk+qsw6tDwgNfu+v2oMcJTNQEeeCSUoRhtEmeDdXV0ObF65PN7/gouFYfIM0pkyhA4C6kkqzEMOF9WA5H7dMD/9BQZ+B7jFKEiSExWys6heu3kL1CRlD/IyKSjvhyw/+JOAZ6DqBw68Jc6JWh+a9Q1t4iFhvY91kw7RTFaJ9/ShC5KjPRTjELfQrkKoUOaWPwytvRCL9H10sTTIRuXsd5ky1nCBhnLcfrHXBONmE575AWscHIsro81z1niXNF/xSr7dZa686s1LFZFSEMJmLyQALbv9L/yv6c7ioegnpkqztWBwwLkGVt4VoAFST9nhEmNdCFxvsezLg8vNBOEgb0m1rhZsj+2pHCffXC4mLxsAMTPm01D77uIoOYyq/Mal53OUHaO3jdTn+RF7xoJL1U5TfIa2PvhZTmXNRcxBwe6V+iBUY8AKW8nFaFZoo8bqCLIVtUXIjdW/wc5IoeLAUg2iZAqQaJ7cazUNKTLJH9lQK7Q8dDAYc8YCsTQ/jEyJsSn1BhftB/vArEtemrOCfUZkB8V1W0DOyaPigrPHSS5ks3tNs28ttz4jedvUe7oHLaCX3NJt6ghBBn28Ex7/RB4ULu2By5AL/0QYMse679/BmvaQJH5kbbqxQFeGFTQk99fyvEB59M8BKC4bvOCI9Q8KfcCNhh6WurFCy1bgDm2p92XQByi2ORvAZ/7j+aL6gYjeTmCZeHv5EJHEv7R6XGEZUWDyigGhtOYuQgR8oyVMyjQDdMPkIhF9GJH+IJ4yPGyASCNtHrc0yce5stYxt6el3wZdEz2/jtUwKBOTz0n7FD09AsSTgJgqjvbqV1pghKpVnrw90ntCNdVPzuF6ljmEQVVDwvpmI+HyDt2aLTcuHMKrZwr5WVhjKZgjVSs8BophtRvO6BYarAfhOx5zeiYDz6RuRgtD9pni+caK7o30HYd1uQKvUzf3IA2QN9j3CeApTBerdCCaOZSm7eyrXLv58YPZCMWuH21TDuB7OapYxFsQstdOAvMoMTfM7SasVDz+sgceonCjV+Fl5aQVxHSYSMuqopiYzy1xSpzSARVv2LWvzxOcIPX2vFqBapwZCQTSg== X-Microsoft-Antispam-Message-Info: x4TQjOQNh+9dNmP4utsJDLgkd+aH6bHMat7NxiUFS4Xp04VBmKvXk80IBsk8qQkhTWbWJQuPOTZnptW0aTm8H+NgYTRGla1FyVtEUcvPNYMa4vf6/eQPK1Mu94lfoIHhvO+3RPI208IZ4bl99e5Qpi5vhuNj4a/UDzSYs9o8spnIVIKeqtLEJ1GIOlLyT2GWuwTOvgLJc/cOaciexbFoqmsitSY1QsfzwfcTZIbvg8O1b3K69yBJ75IUD4z4hTtrRwgjn4ePzF9Sv+73RJDQriMDFXpsadwxWjY0N3Ff38rfm6T6rgCr0WwILbR4LazIKflmks3yq0TGjXelcLeolG0frnoa9bCDJQnmO5Esyo0= X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1466;6:GYUXiMPFqzmVBJUbaXhghZo6U+PnXzobfPy0l7EgfQnPr+3PSurv+tjtdcSg7Px/onB9MQldax3IdOs0mVB6tmbfGrLwrH4/2ji34sjGPuw2gqz4qDL1RLcTtQcZBppPof5saZ/K8B6s0HrEhauigUFch+2ftgzTi+TaLWSm/mxs6VcKjOVaYAfZewnABSIMBhp3fz1cxZ28VSoHcW8upAIE9bCZT8va4CePN+glqxTPclu7f+wKyJ4jIpbx7BxP7kbQbYsdO2alkSVr8e70yMJoO5FqSOLzaRJWr/pD4Wk8x4RNlXXfau1H+wBkrsqH7KujU0qgyh3Lmvqhcuhe7ChjTO2AyHMgNPi1VExPSi171yLbWO+5v7gJv7dYoWBI7xqg5G32moVfu9xOiIC6y3/leDY/aPPTVucVtWtsQXd7b8pqJIBQM0I0DOFsMuL1/9q/Ubb5uU3s+zMTlef03Q==;5:sAsGiwiji8fXGLt/owDT17GF1V4OV4aRCkdNvm+gZHmoSLlamiCV6Fg+FOpGyW0JliVFOWl+qfEh4KRWGyNB8R9kqlENLvkpc5yIa+yYE03qi8ib0LeswAKbm9LUGNRjDTu4dxVSfUjlCBeOStNgAcWVOq9qrpqN+/VjAEOzntc=;7:SpvQZ/8bb5HJ35Ho4cy8mw+KLiG8HQrni/jrWlMasX5h+CouAN/HvFWNKZJgrBfSYLVQxA5rdLPknBehvOunZgx1cQiYo/lUkkB137ShM2IWTrr9PBpY0ZHmsuVAY0AZGFGMJq2e6fhOtBNeqWPwB497TwJzLDMNZ647gK0y6/h3k3WUeMEohcSC7/fll6/Q0VjQJ9+SezfavVteKODK1vrNcwNonqvqG0YiL+NzIfFRwQCmAF9kzw+/6yXw3KjO SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2018 20:17:13.8878 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 35ec7527-84f8-495f-2128-08d5f8b4efa1 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: DM2PR07MB1466 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 sets and clears FCF_ASYNC_{SENT|ACTIVE} flags to prevent stalling of relogin attempt. Once flag are correctly set/cleared, relogin timer can retry relogin attempt for driver to continue login. Fixes: fa83e65885b9 ("scsi: qla2xxx: ensure async flags are reset correctly") Cc: stable@vger.kernel.org #4.17 Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_init.c | 2 +- drivers/scsi/qla2xxx/qla_iocb.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 75538383de5b..c3c7aa1cb86e 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -431,7 +431,7 @@ qla2x00_async_adisc_sp_done(void *ptr, int res) "Async done-%s res %x %8phC\n", sp->name, res, sp->fcport->port_name); - sp->fcport->flags &= ~FCF_ASYNC_SENT; + sp->fcport->flags &= ~(FCF_ASYNC_SENT | FCF_ASYNC_ACTIVE); memset(&ea, 0, sizeof(ea)); ea.event = FCME_ADISC_DONE; diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c index e1ff2e27e59f..ba14db8d0b8d 100644 --- a/drivers/scsi/qla2xxx/qla_iocb.c +++ b/drivers/scsi/qla2xxx/qla_iocb.c @@ -2634,6 +2634,7 @@ qla24xx_els_dcmd2_iocb(scsi_qla_host_t *vha, int els_opcode, ql_dbg(ql_dbg_io, vha, 0x3073, "Enter: PLOGI portid=%06x\n", fcport->d_id.b24); + fcport->flags |= FCF_ASYNC_SENT; sp->type = SRB_ELS_DCMD; sp->name = "ELS_DCMD"; sp->fcport = fcport;