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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 2ECE7CA9EAF for ; Sun, 27 Oct 2019 21:32:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EBD0C205C9 for ; Sun, 27 Oct 2019 21:32:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211978; bh=KZRpUOb3mPBcUo8o24araf8SxsKewq/8Rl1F83Gkluk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=egGn3qn5lpjxm57bQyihxxMwOG2EgHJ2JjGry2EZ1h/5L6SQ/XZ7JQ9R3dRafr2Bm j/2nV4TGWR4LV/r3+DjROlKCjsY1p0HrlOjL4tRVBIDNVHtwp+58Q5GPkvrG5J3RtW AZF1n6WUuB+4QgmW1lJdUUqRGEDvhAyicEAI2Wjc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730336AbfJ0VNr (ORCPT ); Sun, 27 Oct 2019 17:13:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:60868 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730319AbfJ0VNn (ORCPT ); Sun, 27 Oct 2019 17:13:43 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id ACDC72064A; Sun, 27 Oct 2019 21:13:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572210823; bh=KZRpUOb3mPBcUo8o24araf8SxsKewq/8Rl1F83Gkluk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Tncne9isyzMA62+KHmJn7ogYo9DC+Ssj2AlGl1MqIyjnvZqomLeMpLEyk3YRP/TU2 A6Fq2QDmX6pL2ZCwaxhqudq7XUVd+rDug22XUlNxigl/eU1AAF5KREV96bDEri7QTG 9i3Ory58X+KM4gjSdbet2QhwAe+q7M79bERgg4Lk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Quinn Tran , Himanshu Madhani , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 4.19 04/93] scsi: qla2xxx: Fix unbound sleep in fcport delete path. Date: Sun, 27 Oct 2019 22:00:16 +0100 Message-Id: <20191027203252.814477126@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203251.029297948@linuxfoundation.org> References: <20191027203251.029297948@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 7a1cc0b25e594..d6dc320f81a7a 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c @@ -1023,6 +1023,7 @@ void qlt_free_session_done(struct work_struct *work) if (logout_started) { bool traced = false; + u16 cnt = 0; while (!READ_ONCE(sess->logout_completed)) { if (!traced) { @@ -1032,6 +1033,9 @@ 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