From patchwork Thu Jun 7 05:19:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10451151 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 E811B60375 for ; Thu, 7 Jun 2018 05:19:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D7F04296DB for ; Thu, 7 Jun 2018 05:19:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CC50529865; Thu, 7 Jun 2018 05:19:53 +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 24843296DB for ; Thu, 7 Jun 2018 05:19:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751491AbeFGFTv (ORCPT ); Thu, 7 Jun 2018 01:19:51 -0400 Received: from mail-co1nam03on0051.outbound.protection.outlook.com ([104.47.40.51]:55424 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752529AbeFGFTm (ORCPT ); Thu, 7 Jun 2018 01:19:42 -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=VB8Pr7Dc5FEhQDq+JjH//Q7iJrDQB5NZt3B0rp1RDss=; b=npZomw68n2woUa7j6k7VqyzUrKQOi06FQZQAkPtpVJEEr8VDBZL3ivoXION6Zfr5FS6ty65oVejHWX6IBKSCZDjL0YRrcO2pWNOctpXUCAWNd1Y1ZJsGWffzJazkjz5K1tfyFlXxFHfaT7reQhAZA60+oPbb0iUvRJqonX8Qgho= Received: from DM5PR07CA0106.namprd07.prod.outlook.com (2603:10b6:4:ae::35) by DM5PR07MB3180.namprd07.prod.outlook.com (2603:10b6:3:df::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.820.14; Thu, 7 Jun 2018 05:19:41 +0000 Received: from CO1NAM05FT060.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e50::203) by DM5PR07CA0106.outlook.office365.com (2603:10b6:4:ae::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.841.14 via Frontend Transport; Thu, 7 Jun 2018 05:19:41 +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 CO1NAM05FT060.mail.protection.outlook.com (10.152.96.178) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.841.6 via Frontend Transport; Thu, 7 Jun 2018 05:19: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; Wed, 6 Jun 2018 22:19:29 -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 w575JSHx028019; Wed, 6 Jun 2018 22:19:28 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w575JSp4028018; Wed, 6 Jun 2018 22:19:28 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 11/12] qla2xxx: Fix race between switch cmd completion and timeout Date: Wed, 6 Jun 2018 22:19:25 -0700 Message-ID: <20180607051926.27940-12-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180607051926.27940-1-himanshu.madhani@cavium.com> References: <20180607051926.27940-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)(346002)(39380400002)(396003)(376002)(39860400002)(2980300002)(438002)(189003)(199004)(86362001)(50226002)(50466002)(48376002)(36756003)(8936002)(59450400001)(2906002)(106466001)(72206003)(6666003)(486006)(5660300001)(11346002)(2616005)(446003)(478600001)(476003)(126002)(87636003)(51416003)(336012)(76176011)(44832011)(69596002)(80596001)(106002)(4326008)(8676002)(186003)(16586007)(110136005)(316002)(42186006)(47776003)(54906003)(81156014)(305945005)(356003)(81166006)(26005)(1076002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR07MB3180; 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; CO1NAM05FT060; 1:zvOR9nO9wU4rEoRwx9DXwdZ3L+IXKsd4B7oeQ5v44esb2MIu+TRN/sB2N5+2+7ucP/e09bA1yJ6OpBUi+VjG0yVGkj/eBX0lfU4vAc2Z0SY7pYyiiAXm3Nqm4Z90vg2u X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4608076)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060); SRVR:DM5PR07MB3180; X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3180; 3:vl6NuLFozDqPZtJJy10asGaMVlgMinJxy7JWAUQMFXh6Ayn+IRzVRZk1kasyZ/IOFKxXnLP7a3p1H5qG8KlWiG7+6Tb2tPJ836pCv2zCcdMSPcF5jJDHNTE+G+557McF6vLA8ymONgSmyQl9Vkg3XoWdyDm9F3hrX0Q6ODEvA6Hz+BryBqME6gQIA1VanKJO2+d7CbsT1capxiZQxLBuFm7MuCvRF/tssGWi2IS8dK6Ba8WfOtkd48i+tvcpLbspyREM6U5g/oRS47+0o3OeaZyA2EVTUG4nPgP471+2RJQvRKOjQEEJu9h5/Fq65aCoqL1BIhthHKWMK8BaKRvrMSIuIwkFuKA2lF3gHyqBHvc=; 25:nVTAhVlf6zKOaKoWfCS7UKdDXWZ8TkyzvYb2Ve5MvKZBN7iuaHy9rBeKofwm9tKYjubTFmq7BMVfNKjka3eUtgE8rRg2NFEmsdgogNnsfjQT1PyHNLGWSSLO2Hzkmbsriwj6tuXMPAPiGW+1LymeO6t2OXCYEe9oozXrsv58fb2xDUEb3/26MBBvdO/Z0gkF4SpiaI2+MciAD4XLboWFCsZYdDM23JAX/dAxNnANrspnG5xGQFlz5uPHrFMRd471J2fWoCC+PdR08HzpT7nQ8bozzCydpRK0sBeCgCg+FHo8k6ARzn6U/Ta4KQIQSdqzdTYu+d+xkNUIHQkxCGqSxA== X-MS-TrafficTypeDiagnostic: DM5PR07MB3180: X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3180; 31:2R1LFKIZ3YNBfwrMP493Litr2YqifqBfmdoNyE/WRYKjqoEjfrzu4c3/eKaqXOaT8g7zR9SEY31bJ+FOCc1cj9VytN5bFxAAKXhKfmtyBWEL1WWTM260PU4AnAr8WJXIEIrYOnkrXFwnSHN09qnltmvPqFa930oiWUShkXhEASW131y2yatI3YZXlHN0BGGzaeK58N1OK2YnLrohXWkS9t+g6v6SG3yMVY2JXwpQUc4=; 20:S6Jbo34+hMEBNGSPD+Vi01VweAqXcsd4nsMYQsTXPKs2/lEATewtE/xWqKRRa+gFmCpVtELJhMUmkZwCXb6adSHYwjrumw3DyrEwF3oEpvHeJBweUi1pafvj1Uvk6yQAeUyYvajPXnJtsgbLsSMhc+cpSc2BwfPkJk7Sl2FYEezqTJNJa1d3Ks+up4yLucPGHCgldj3kHeHcSIcUFCJ+Qv12MOafYIGE49OSyw+hYghAihV5pZwc3/0g5uGO8rO4BTNYmRAwBmWSDYAiKJuCU65Q6Ivtib29ePTkrrBXcGl2xBgqWSjjkljSvaFLPZtwsjEsCsAT7MZtsyFX7K1spyzMLmakYuqR7hQuy3c0F8kpLsV+6tX4dWQdUpMJLUz6a/XrJRJv+A4B93QevzJIpE/QT0wRlXenCyeBzFv7obilotivH52KRSbnci6SHI0hIacNvXXlphGM8VWx2QmoVYKQfgaeLHGMuSgOtn6hZFioSO71TGSM5JdPSoyKCnws 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)(8121501046)(5005006)(10201501046)(93006095)(93004095)(3002001)(3231254)(944501410)(52105095)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:DM5PR07MB3180; BCL:0; PCL:0; RULEID:; SRVR:DM5PR07MB3180; X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3180; 4:Xqekyknm7M9Abpfm4chKuWU/Ayto5BOh7jPIqsaFbXOfPZvyI50PsFmILGS8EtiQtUVE9SH4eFXP1hxOyWy9h9zkrvdtSkwNWCX/l/dyaX5P9evxglJwl27K+gSVkRBh8ipoOy3NsURMkNwdJCnGab5RFDcu9DcjxwiYyZcYU8JprGTFFlN0sgSvDX+Zq3IEkkwq99jBrJUy7aEvqgr2LXmkyqyp8inuU5DyPM+rm+3jrAnAUwI8jutcoSGrpaFa+l/lZ31wXSRIr3l0Ji7eqw== X-Forefront-PRVS: 06968FD8C4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR07MB3180; 23:COXx/RpDlrwKbzFuPvgJkSims2GsMmoIXzn/GtUOE?= =?us-ascii?Q?VkwtHXsaYhy6CtbdFr0Hnr7fweo1zGVB/x49TJpNwjrBDEg0nOL6zMehVZP2?= =?us-ascii?Q?ZqhoilZ8V+5UlCiCg+IsmgxA6L3ggC8pYDOuoOM61DfI1YOVdhktkTvwTEn7?= =?us-ascii?Q?ghXoCE75Jz+x0vxQKdfUeX/JXqO3Xsh+IYxWBp5SD6e0Ur9mWye1q9j7x9wC?= =?us-ascii?Q?qyKCCWiDpS87eS25vi2KStfsQPqKp3KDvMmyNFiknxXx+w6lS+wahbFobgk3?= =?us-ascii?Q?7feklvR5U3cLtULJExZmsp616Jr3menU2Je2qsA9f5iIi11OMLeHPd+R/jnE?= =?us-ascii?Q?kMYzArUoSYwKRVQNKzSd7sHTxtqmE1HUgp1boyFudEzp1Qjebuj63iE12qrK?= =?us-ascii?Q?m61H8G6sgixvDtKJYOP6dSjc22GXduV2SuimlpVm1Z1Opn9adlX2eDQPFf/+?= =?us-ascii?Q?8qXUIgRHkA7Xkxrc+/6/p45DPypUBSXxMy8LyPoTLQDHWx6M0M4pVLzONBS0?= =?us-ascii?Q?UZEGA01BuzK3UsKJa8hUzX3PVsg7hnvsxrxfF8O3flJBFIR8jmAK8kMJd359?= =?us-ascii?Q?RwmsmNN98PoWUyk2NjI6fmr/jhWVDe5NEWZjCRND5XjIX9qKytg8aMDEuJlJ?= =?us-ascii?Q?MVhrSBrxZKTvptUwCqDscXZzRpCytSnxikYWLLZzXbvOVuy2tcBjTpqaMrfv?= =?us-ascii?Q?sU8Kzzpj+BzxPaiVl2pMALdILfatSjZKaRq2XVhNLjULfgHMklAquuVYVqfh?= =?us-ascii?Q?fG8pboJ5J3Vlb8kJIu/KjMFqalCnamyXG9ND/aEVET+iTA6gwfXEpMlnrmYQ?= =?us-ascii?Q?h+WP3CvUB/J5003xs6j8jgw1Fv8M4TXXTH9yVa/NAezSLZmnJj8ToLrhoz9T?= =?us-ascii?Q?HQYngnUTnfesnqX9IdTEGnhRBod8uEpW4iaDVJ5MlLPujPEcCkEM2ry3xRJk?= =?us-ascii?Q?MR+bwT3Lk4G2sM2xsrEwfMChY3Ze2X5V3oXjodFWyDdtWip2zkp3WXAGeeq9?= =?us-ascii?Q?ecv9RQKRv2qkapA/XBLEV76oE3Lx3SqG2zFWdibuFetM+oSlUUuHLSchkzzu?= =?us-ascii?Q?ubBGFz8EgFJ0vTiSqppI+hligdy6ejndhDFR6e62xe6/Yl8HgeP8t2bYiSK7?= =?us-ascii?Q?tNL4MWFHHeD6oOzNNNVn9tOD3qHMvWm?= X-Microsoft-Antispam-Message-Info: WuSUw57+o/uxWGMrB3ROIow5wNj4gM2C2r4hlPgTd82qv0xU/Yyjtm8LlUYbsz8yABbzZ4tH+XrRkTSqDg1R2jnWn/XlVygYCXidA+mrpYz2GUoBuIfqyNJBTR3SQ9zy1nJ7Y9aSOdyCXVtfS5LLzNcnP1t0Vc//k4PNDgtc/XXwEj4UNajevWo5+h8xtZy3 X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3180; 6:ig5BaZkAgKZ06l8AhBjhPn0n5dClu6q1hgKhvYI4DwbrxvIQSRo4VdNhtzORg4VmZQ4wRKnI60UHwQRHTtz45Z1Zv9nf0CGpW25s0m0vqminXf0O8qFvLRjPAyLne0Pq3FX68Z/Ir5Dl0vzH7wjs/HOEGxjYvOeUS1rp+wLovv1CeVxEPBNgsK55DnF1d2B3566zDhMId64Hw+Cmh5svn4UE+o87PzVtRZTy4vdPGqU9ayBlknJzcHb9q7Yug8Vy06gaqf2CAJ9bPzpTH5Gv8oKUscTupfhff9Mxh1+mgXTDATRsoNpJBFh5OxzfFiZziXI7ZbDBVFy5joOHKL2Tpa4w6NSldhZwDAcaIUepgjEojM56qW8VLKnVRHOWK5PgX74jyNoy+FEEPTgflpdjzSHub1b81x8uII4x6ao8P+o/cRaPuU7vYObCeekbdNC6o9m/RPrQswx8utKDud5Q4g==; 5:lhFDJb/Yb2x/HGxPufNiKxAClFyM+RxRg0hVd38A1hGbm7Efi8hQpe1g7ZfwSLa9SBiM+M3Agc2Vs9kGhfroUCK9WEPSNtZGUaYyCdThQdhGOzjJ7j2xkhOOIZ9JQIr2sUy3MpOP7GxSy2iEIGAKRBBhjEs6PGMUUfZ6X7haxSo=; 24:XLR/XAG5rCPcU9wSRLmCNz7bXnAYGN8Z13Kc1zOy7oOas1dT/7viyJNhyAfZ3GBIoM74UM+DMrw0UKazvUT7mHqHqSozhgHii0VWMkas1js= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3180; 7:m1TEAbFIZ4Tw6pFovj/SgQgjsVPzXfDo9NYC27JktO5lJR77d1DEDH8DB4BwEBcdiOqL2o3PtOytaE+E4qRhKqfrpXora0OdzO2gdGqZ3P4CGmLcf46MyutqLU71dcwsv+wov3krbwNkQwP4BXhqkjzow5e/qcN7IlGVFuy8+FSfaInzgaNty+wSuSpkGHJKiSiVQ1DNj7Eyc13Ro5V1JUwzDL5PPzlad+/4nu0CIXnhhEgTlA9Uvp0uMVKa6U76 X-MS-Office365-Filtering-Correlation-Id: 5765e6c6-2c85-412b-f58a-08d5cc364598 X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jun 2018 05:19:40.8245 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5765e6c6-2c85-412b-f58a-08d5cc364598 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: DM5PR07MB3180 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 race condition between switch cmd completion and timeout timer. Timer has popped triggers command free. On IOCB completion, stale sp point was reused. Instead, an abort will be sent to FW to nudge the command out of FW, where the normal completion will take place. RIP: 0010:qla2x00_chk_ms_status+0xf3/0x1b0 [qla2xxx] Call Trace: qla24xx_els_ct_entry.isra.15+0x1d4/0x2b0 [qla2xxx] qla24xx_msix_rsp_q+0x39/0xf0 [qla2xxx] qla24xx_process_response_queue+0xbc/0x2b0 [qla2xxx] qla24xx_msix_rsp_q+0x8a/0xf0 [qla2xxx] __handle_irq_event_percpu+0xa0/0x1f0 Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_def.h | 1 + drivers/scsi/qla2xxx/qla_gbl.h | 2 +- drivers/scsi/qla2xxx/qla_init.c | 75 ++++++++++++++++++++++++++++++----------- 3 files changed, 58 insertions(+), 20 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index 9a98f1c73f5e..416b5ac29666 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h @@ -313,6 +313,7 @@ struct srb_cmd { #define SRB_CRC_CTX_DMA_VALID BIT_2 /* DIF: context DMA valid */ #define SRB_CRC_PROT_DMA_VALID BIT_4 /* DIF: prot DMA valid */ #define SRB_CRC_CTX_DSD_VALID BIT_5 /* DIF: dsd_list valid */ +#define SRB_WAKEUP_ON_COMP BIT_6 /* To identify if a srb is of T10-CRC type. @sp => srb_t pointer */ #define IS_PROT_IO(sp) (sp->flags & SRB_CRC_CTX_DSD_VALID) diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h index 00fbd49a9a7a..6f2a37220a55 100644 --- a/drivers/scsi/qla2xxx/qla_gbl.h +++ b/drivers/scsi/qla2xxx/qla_gbl.h @@ -213,7 +213,7 @@ extern int qla24xx_post_upd_fcport_work(struct scsi_qla_host *, fc_port_t *); void qla2x00_handle_login_done_event(struct scsi_qla_host *, fc_port_t *, uint16_t *); int qla24xx_post_gnl_work(struct scsi_qla_host *, fc_port_t *); -int qla24xx_async_abort_cmd(srb_t *); +int qla24xx_async_abort_cmd(srb_t *, bool); int qla24xx_post_relogin_work(struct scsi_qla_host *vha); /* diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index addfc53a7bb5..f6211bd7c86e 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -50,16 +50,15 @@ qla2x00_sp_timeout(struct timer_list *t) { srb_t *sp = from_timer(sp, t, u.iocb_cmd.timer); struct srb_iocb *iocb; - scsi_qla_host_t *vha = sp->vha; struct req_que *req; unsigned long flags; - spin_lock_irqsave(&vha->hw->hardware_lock, flags); - req = vha->hw->req_q_map[0]; + spin_lock_irqsave(sp->qpair->qp_lock_ptr, flags); + req = sp->qpair->req; req->outstanding_cmds[sp->handle] = NULL; iocb = &sp->u.iocb_cmd; + spin_unlock_irqrestore(sp->qpair->qp_lock_ptr, flags); iocb->timeout(sp); - spin_unlock_irqrestore(&vha->hw->hardware_lock, flags); } void @@ -100,6 +99,8 @@ qla2x00_async_iocb_timeout(void *data) srb_t *sp = data; fc_port_t *fcport = sp->fcport; struct srb_iocb *lio = &sp->u.iocb_cmd; + int rc, h; + unsigned long flags; if (fcport) { ql_dbg(ql_dbg_disc, fcport->vha, 0x2071, @@ -114,11 +115,26 @@ qla2x00_async_iocb_timeout(void *data) switch (sp->type) { case SRB_LOGIN_CMD: - /* Retry as needed. */ - lio->u.logio.data[0] = MBS_COMMAND_ERROR; - lio->u.logio.data[1] = lio->u.logio.flags & SRB_LOGIN_RETRIED ? - QLA_LOGIO_LOGIN_RETRIED : 0; - sp->done(sp, QLA_FUNCTION_TIMEOUT); + rc = qla24xx_async_abort_cmd(sp, false); + if (rc) { + /* Retry as needed. */ + lio->u.logio.data[0] = MBS_COMMAND_ERROR; + lio->u.logio.data[1] = + lio->u.logio.flags & SRB_LOGIN_RETRIED ? + QLA_LOGIO_LOGIN_RETRIED : 0; + spin_lock_irqsave(sp->qpair->qp_lock_ptr, flags); + for (h = 1; h < sp->qpair->req->num_outstanding_cmds; + h++) { + if (sp->qpair->req->outstanding_cmds[h] == + sp) { + sp->qpair->req->outstanding_cmds[h] = + NULL; + break; + } + } + spin_unlock_irqrestore(sp->qpair->qp_lock_ptr, flags); + sp->done(sp, QLA_FUNCTION_TIMEOUT); + } break; case SRB_LOGOUT_CMD: case SRB_CT_PTHRU_CMD: @@ -127,7 +143,21 @@ qla2x00_async_iocb_timeout(void *data) case SRB_NACK_PRLI: case SRB_NACK_LOGO: case SRB_CTRL_VP: - sp->done(sp, QLA_FUNCTION_TIMEOUT); + rc = qla24xx_async_abort_cmd(sp, false); + if (rc) { + spin_lock_irqsave(sp->qpair->qp_lock_ptr, flags); + for (h = 1; h < sp->qpair->req->num_outstanding_cmds; + h++) { + if (sp->qpair->req->outstanding_cmds[h] == + sp) { + sp->qpair->req->outstanding_cmds[h] = + NULL; + break; + } + } + spin_unlock_irqrestore(sp->qpair->qp_lock_ptr, flags); + sp->done(sp, QLA_FUNCTION_TIMEOUT); + } break; } } @@ -1596,7 +1626,7 @@ qla24xx_abort_iocb_timeout(void *data) struct srb_iocb *abt = &sp->u.iocb_cmd; abt->u.abt.comp_status = CS_TIMEOUT; - complete(&abt->u.abt.comp); + sp->done(sp, QLA_FUNCTION_TIMEOUT); } static void @@ -1605,12 +1635,16 @@ qla24xx_abort_sp_done(void *ptr, int res) srb_t *sp = ptr; struct srb_iocb *abt = &sp->u.iocb_cmd; - if (del_timer(&sp->u.iocb_cmd.timer)) - complete(&abt->u.abt.comp); + if (del_timer(&sp->u.iocb_cmd.timer)) { + if (sp->flags & SRB_WAKEUP_ON_COMP) + complete(&abt->u.abt.comp); + else + sp->free(sp); + } } int -qla24xx_async_abort_cmd(srb_t *cmd_sp) +qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait) { scsi_qla_host_t *vha = cmd_sp->vha; fc_port_t *fcport = cmd_sp->fcport; @@ -1625,6 +1659,8 @@ qla24xx_async_abort_cmd(srb_t *cmd_sp) abt_iocb = &sp->u.iocb_cmd; sp->type = SRB_ABT_CMD; sp->name = "abort"; + if (wait) + sp->flags = SRB_WAKEUP_ON_COMP; abt_iocb->timeout = qla24xx_abort_iocb_timeout; init_completion(&abt_iocb->u.abt.comp); @@ -1648,10 +1684,11 @@ qla24xx_async_abort_cmd(srb_t *cmd_sp) "Abort command issued - hdl=%x, target_id=%x\n", cmd_sp->handle, fcport->tgt_id); - wait_for_completion(&abt_iocb->u.abt.comp); - - rval = abt_iocb->u.abt.comp_status == CS_COMPLETE ? - QLA_SUCCESS : QLA_FUNCTION_FAILED; + if (wait) { + wait_for_completion(&abt_iocb->u.abt.comp); + rval = abt_iocb->u.abt.comp_status == CS_COMPLETE ? + QLA_SUCCESS : QLA_FUNCTION_FAILED; + } done_free_sp: sp->free(sp); @@ -1687,7 +1724,7 @@ qla24xx_async_abort_command(srb_t *sp) return qlafx00_fx_disc(vha, &vha->hw->mr.fcport, FXDISC_ABORT_IOCTL); - return qla24xx_async_abort_cmd(sp); + return qla24xx_async_abort_cmd(sp, true); } static void