From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4CB30C47404 for ; Wed, 9 Oct 2019 17:28:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1D0D920679 for ; Wed, 9 Oct 2019 17:28:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570642099; bh=ItEhc048PXZwT136OTNM/zwLx86InmHB7Ps6M9y1Pi8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IpLCDhw7ISDOAsQV0D8I2/wnF7zYsZKDPaakQXEIAYkoZe/Ao3AmQniohWrrqXZDl 2U+QdBs3b9fCbzPA2dHZWGZUoSurm8ERaqaNOxpkuBAY20/n7Z945jz3AqHkGxIxxv jp4fHoln/oPGKcuw2a9gF/6Zpn0YhvqKA7vXH/Io= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732301AbfJIRYZ (ORCPT ); Wed, 9 Oct 2019 13:24:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:49050 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732289AbfJIRYZ (ORCPT ); Wed, 9 Oct 2019 13:24:25 -0400 Received: from sasha-vm.mshome.net (unknown [167.220.2.234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 69598222BD; Wed, 9 Oct 2019 17:24:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570641864; bh=ItEhc048PXZwT136OTNM/zwLx86InmHB7Ps6M9y1Pi8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hjUy1hkbUAq2BAjjUrnPHVEQRmElwBmeP/ZGKwx90LnOfzLn9+agA4dpDADueOQco gZJujUGLqaUOIh7GWYXG/zRWOTf15emrRubMcVfsM3l/cZEmJUaasMPqIqWkDBzDdJ GxzJ9ONa4GU4AJuzreLUANYKTLWXUbwCnQmrYD1o= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Quinn Tran , Himanshu Madhani , "Martin K . Petersen" , Sasha Levin , linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 04/21] scsi: qla2xxx: Fix unbound sleep in fcport delete path. Date: Wed, 9 Oct 2019 13:05:57 -0400 Message-Id: <20191009170615.32750-4-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191009170615.32750-1-sashal@kernel.org> References: <20191009170615.32750-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Quinn Tran [ Upstream commit c3b6a1d397420a0fdd97af2f06abfb78adc370df ] There are instances, though rare, where a LOGO request cannot be sent out and the thread in free session done can wait indefinitely. Fix this by putting an upper bound to sleep. Link: https://lore.kernel.org/r/20190912180918.6436-3-hmadhani@marvell.com Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/qla2xxx/qla_target.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index 87e04c4a49821..11753ed3433ca 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c @@ -996,6 +996,7 @@ static void qlt_free_session_done(struct work_struct *work) if (logout_started) { bool traced = false; + u16 cnt = 0; while (!ACCESS_ONCE(sess->logout_completed)) { if (!traced) { @@ -1005,6 +1006,9 @@ static void qlt_free_session_done(struct work_struct *work) traced = true; } msleep(100); + cnt++; + if (cnt > 200) + break; } ql_dbg(ql_dbg_disc, vha, 0xf087, -- 2.20.1