From patchwork Wed Aug 23 22:05:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9918511 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 61A63600C5 for ; Wed, 23 Aug 2017 22:06:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5448028A7C for ; Wed, 23 Aug 2017 22:06:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 48C2C28A82; Wed, 23 Aug 2017 22:06:07 +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=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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 6475B28A7C for ; Wed, 23 Aug 2017 22:06:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751194AbdHWWGD (ORCPT ); Wed, 23 Aug 2017 18:06:03 -0400 Received: from mail-by2nam01on0053.outbound.protection.outlook.com ([104.47.34.53]:35136 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751187AbdHWWF6 (ORCPT ); Wed, 23 Aug 2017 18:05:58 -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; bh=O8uDlNQDCn/cu70/E24Xw5i7VlyPtUEpcdKA/UHHGw8=; b=LFuOWQTfkjoWm1qqKivGBvov9gTrR/Na59Q2hUvrQA5RkIcvQRoSSk8QTCQ5qB9JAkTrA/HpuDVGF9XkuNAsm0B+579AJXKQ8+LocV/zjBOyrGyzUu42/oAZ7+C0IlOKY2ErXqexJBlF+98yvYf6GXrPlWdu+BnPwTOjJGYt7Cc= Received: from CY1PR07CA0027.namprd07.prod.outlook.com (10.166.202.37) by CY1PR07MB2522.namprd07.prod.outlook.com (10.167.16.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1385.9; Wed, 23 Aug 2017 22:05:57 +0000 Received: from BL2FFO11OLC004.protection.gbl (2a01:111:f400:7c09::124) by CY1PR07CA0027.outlook.office365.com (2a01:111:e400:c60a::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1362.18 via Frontend Transport; Wed, 23 Aug 2017 22:05:57 +0000 Authentication-Results: spf=none (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=none action=none header.from=cavium.com; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by BL2FFO11OLC004.mail.protection.outlook.com (10.173.161.188) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.1341.15 via Frontend Transport; Wed, 23 Aug 2017 22:05:56 +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, 23 Aug 2017 15:05:28 -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 v7NM5RqH003218; Wed, 23 Aug 2017 15:05:27 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id v7NM5R9I003217; Wed, 23 Aug 2017 15:05:27 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 17/31] qla2xxx: Add timeout ability to wait_for_sess_deletion(). Date: Wed, 23 Aug 2017 15:05:11 -0700 Message-ID: <20170823220525.3115-18-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170823220525.3115-1-himanshu.madhani@cavium.com> References: <20170823220525.3115-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)(6009001)(2980300002)(428002)(199003)(189002)(76176999)(50986999)(4326008)(101416001)(2906002)(50466002)(478600001)(626005)(87636003)(81166006)(8676002)(72206003)(47776003)(81156014)(54906002)(5660300001)(48376002)(2950100002)(6666003)(189998001)(69596002)(8936002)(305945005)(80596001)(86362001)(1076002)(5003940100001)(106466001)(105586002)(356003)(33646002)(42186005)(50226002)(36756003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR07MB2522; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; PTR:50-232-66-26-static.hfc.comcastbusiness.net; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC004; 1:6B4mhOy9el5fI8kk1aAXO5OZkq9+wAy7YwO9uKrh3sbhHb1LoJZ89mgpTB/smqGU4j811qBWAUtmvtm3AcPcVUAXM2Y6HXPFiW3BqZvbQMSTHU9sllNaM1M46qWalq/V X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c763206d-ae25-43aa-762e-08d4ea73219a X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(300000502095)(300135100095)(22001)(2017030254152)(300000503095)(300135400095)(2017052603190)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY1PR07MB2522; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2522; 3:OikI90pIipSNgPF/lwf9zLYs3ZUNlZHCP22Eae2n/M/IfkvHFNaIY6h1Ol4MAZrhW5Q8j0e/R5cnNicMqOBYAijG3HIalF0ftDyuA757VD+ZdG9TGqKZ2XdmDi+DnXC42Re2FDTBxieGmSfdQKRBDnfupJOt428CrsOTyRUo3yYyY7bshuj4PAzTZ8/wwTo1vgBocJh/duvaJ2wwOpfAJ0qzwWGPEoOP9DtXJYuS0oWlgYNPW5zHAIIHgtr/T9G46dUiSyWrY1XGrQdqDZc20Jb97C18e1SmS5YkLNKyyb6HLEGvHTp5v6HEdZjCh2oAz0B9iMDYLzH+6mp91H3WSQ==; 25:0HG/NpXCEAoKOU0e50lmi0YJts1bGvdRM9hElGuip0ANZB6u8WUEbBqNQOW5/qVe+HPoLDSQFDdtyqWo4TT/1jcv415yapSsXCWdbvKWyiVgFC95BAnOw/YBM8kuok01M6xCHivD9XInMsH3iGek8JJDttadIB/YdSScv4H7Dn0Y6YSaInYx7ChcXySGfDzA0yZDH/81NGnAcuOwW0rQf/L24gPVc5GTsmEHWBIlpBMCCN/O+XZplET8ktcE9IAqhbVD2XwbJY1WRtNz4OzgkFBQjEZqDSNnwS/8hJUJnvtWzGW8d1dSd/md97hlL2zkPsmNbbO6n3hWUOBZ/sITRQ==; 31:JWD1CK7q/JQ69vjU+pawopCzV6wHThIrfjFrYzumcpfLtRwlR1EC66lLr0aCu8TEDE1gLA4FQxz563cMONu26LpJvi1rx2q5CjVaVtwrWgtpttioFRJmmEexvPnwuY3nmZBg8KfQy5mMWCETJN+dV1AytJ2E8ngzVCO1eyLGbNYNF0ejuLcLUWApxa/vQGLhX/ieRTQhxW6bQZGeuTJWdDoYyo3FE/C8muAdHp8N0p4= X-MS-TrafficTypeDiagnostic: CY1PR07MB2522: X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2522; 20:gVQsETe6AImeb3eolt2NMsvmkVhosHgVngxptZVp1axuaKfhLtnK74qWdZYOzzEl5r+eHroBYp5bFZjeyzqf474djygNmF0gbaUlR7Ye2XBOuXfJY1AbexJD1EzOnm066wcyn+1gtUZIpWPoIxvVh70iRKH8U0Ws/24P1Ovc2XcesP7qWcMKtn7eA8amJsmb1Ossy00CaW2W/wgUEp8B6XONns4JS202JALNxh87Ja3nYiBLCcCNw6KQX5a/P0wGBltCCf2L9foavNvsaUuy+G4akIChqMXRmPltT3rzioTEv7FTUqvK4m1ZXNwc7UT1yS8ZlRHBLni4iySfs/if7C3Rnw2heueLu6qYDxXnMaU1Iloo4kkm+15+bQfB5iVoYzqhtvlQ9hidaUCJICO9i5jRIchJ2qRXQh5wauOcDk37mYc6xsnGFAFwn/i2FYsl4QhHQBy2aKg3G9xnVfIwUXggTKmdzBb7sy2OEeYD6KCkVHjDicStqRs4hQLAEh36; 4:my1//hMvvD7hV/Di5KBlo5/blDuIRpNhMVjyqm5BEYJgbiS86ZurpASpazUM3Uxd8M2J+6PMEhY0fkKlYJK3SZ2OcxiMEXXBHV8GQPnQYPU/6rFqbd/DebcVvJpCLkzo233dGPEPA1qiCGAqu755AdOeGh9R2RXvBj4iJfHiK3eUni9bBv88Nbe1WQ3F3Ax5/URndFaOM8qVtogAyxAn6b7Sg20jjDy6w/n+kSuCn9nP0jyLS07nzG7Ll3dOOJL/ X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(13016025)(13018025)(100000703101)(100105400095)(3002001)(10201501046)(93006095)(93001095)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123560025)(20161123562025)(20161123555025)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR07MB2522; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR07MB2522; X-Forefront-PRVS: 040866B734 X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2522; 23:Gk/cJEYPy8lrDBCTVZ6I2xEPQ4QSWGKaPyYK2JK9YEVgGtBELaKleeK0+pBU6Ir9AGdV6mH887BQjN5w4kDKDqalPjBXK5pNAEDd3lypgpeFncpdrD+SQtmZq1xdNLXS/bFc1K7jFp0qJ8mMEMm//NTjD+s9MsCNdI5fOvrWZdLlB989FKWDcaCFW/LZL99RFlqLkiz08QVoHIG6jd1DnFj39RnE9MYopIXuAIoCuhPk5cl1hxSwS8hodaX7+vICw/WC5t0pUKJgZnSPFJKhd7X/Yek8pbIrJSkpT2uwK5nHi1CmlsjdgJLt/TOE8DhOaKORVfoRPRojaOw32I8EHEKF63RJuGhZB0ALv6JTvFgXQ9lu4v5+UB+aK1KtwN+qAD5KC6foHsbSQcp8gnSnl48X/NjCmans9T7EGGUXX7W/RO4NGZgElPkdnvL/AMgxOVIYtVWX+o0rX/N0GBlPGFrKWmdz2X8nBv5SeS1LAoK0rII3mmyLCSjRzVX0EA7dsTx3r4qA7U84r2Cz+TP08qAzk8c7noF6qPmhdPG1t+bStykJw74AeBOXGtulK9x9gHU0nR3nxzUATWT+likiI6XWekxD18Bx9ud5t+zJxjcEQT+I8e4hNDW5TEc0Nm3YPbUb1zBQBWm+HRZ4cHu4RjY/JXUmheFZasZnWOStxv7X9Tg8bfZRjaA36ax6IV6UkwvFH8Aj/ve2oizKGdDQqLd1peH0jJnR5yw3vtC50p0z20kPzWWrMLOC9XSEbTehT0DN1ghzeHhIHSnBjHWaZfy7TjB/LHGH4TKV7uxs9BvNxVvn+7m0dDMPIiRlpqU8CmRqOBdi1XrEmfnf0QNMO2k5OsWF0d/GU9ESls8l4n/uDrQVrw7kJ74jf84iyYQ6nsmVL5yyOrCIkB01VNHhu4i/DJE7I1ERQFECYgskc H+06ZFXYDDQhz3cmN5vwwFt X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2522; 6:tTlaLnYE+ArfBd6UbHbC4dNZ0gAU7KbixGl+lr5JRB67yXMg9W7Wwfj7b0oqpZD1EzW83Hz6lid7UCodvvv2/ZuNICT6Ds+J4sVuKuSaVPfUN08QceBUfFdz8tLM6CLr6GD3p7AfUqF3yUAZdOL2Xky6BwobYvtrgD4nLx6Q5ZO9acx8iIWSEOfwNQur5OzNoG/gA6jQRl2dvPPIh6v3qLVZQzBnkTUA2aT7HnQPKNAgssNBg8+6FCD9LiQ+32MWXO9lqnvzuQ3Nh/qmtCROKI9A3a6QWtgK/+KGeBsQyVaz5s+cD9XABhFo5n5kSCHNwEqZ5bU0DiTgz8NYl/2cyQ==; 5:sm4QEUUIXmNE6BnhB7G4cipEO++PYUoUL9Z0m/MRIxg7WkWDMWKjLLggKq5MNtAZT4TVG51666TCwQNJP7ULI8Q3sC8EbgABdc0kbv4FZ5/ucEb2TSiAozpnB8k6zmR7qb4yLk4h8dNsFCJjcCw07w==; 24:JuWioZcLYob52AN/4ZmESaohf6j+347YyHoErXYfzauLVk0fG9dwxsN/YehaVTLgCFDbLmwCyp7pwi5zeAEcFSNS2s1pETzy34gjTFLMW1Y=; 7:DdbWRveAcPyYJd5TfyLIviV7X7hH/tX+wzSIANPxljW3f0RQ+0YsvYCmBrOuzAForhj5MajKYH1BreZrI2LZqdZxVsBw6ZL36syaZURjjQDfaeTSai+E/7Wa5AspOV43RIazq7eMy0YEnQjaq02W0Hs4apVzAwQPHlRehIE/4OYxrs7bi0HDXDLZsTBaZ0uGW3P17KUkBHsamrME4AXMCB7IkQNJGQXQGNJtrvbTqmc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2017 22:05:56.8560 (UTC) 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: CY1PR07MB2522 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: Joe Carnuccio Signed-off-by: Joe Carnuccio Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_os.c | 2 +- drivers/scsi/qla2xxx/qla_target.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 10c3ee53ec3a..c217cec4dd49 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -1141,7 +1141,7 @@ qla2x00_wait_for_sess_deletion(scsi_qla_host_t *vha) { qla2x00_mark_all_devices_lost(vha, 0); - wait_event(vha->fcport_waitQ, test_fcport_count(vha)); + wait_event_timeout(vha->fcport_waitQ, test_fcport_count(vha), 10*HZ); } /* diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index 3bcfbee2ae26..6a6d9db6479f 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c @@ -1479,7 +1479,7 @@ int qlt_stop_phase1(struct qla_tgt *tgt) ql_dbg(ql_dbg_tgt_mgt, vha, 0xf00a, "Waiting for tgt %p: sess_count=%d\n", tgt, tgt->sess_count); - wait_event(tgt->waitQ, test_tgt_sess_count(tgt)); + wait_event_timeout(tgt->waitQ, test_tgt_sess_count(tgt), 10*HZ); /* Big hammer */ if (!ha->flags.host_shutting_down && @@ -1487,7 +1487,7 @@ int qlt_stop_phase1(struct qla_tgt *tgt) qlt_disable_vha(vha); /* Wait for sessions to clear out (just in case) */ - wait_event(tgt->waitQ, test_tgt_sess_count(tgt)); + wait_event_timeout(tgt->waitQ, test_tgt_sess_count(tgt), 10*HZ); return 0; } EXPORT_SYMBOL(qlt_stop_phase1);