Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp2661386imj; Mon, 11 Feb 2019 06:38:22 -0800 (PST) X-Google-Smtp-Source: AHgI3IZev2xI7kc3HuRRGuhUpPlCN6EDcgGVT6DVZJixzXJ/MDWxQILISYMlM6p9gMEjkvlDHPSO X-Received: by 2002:aa7:8245:: with SMTP id e5mr28342036pfn.172.1549895902749; Mon, 11 Feb 2019 06:38:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549895902; cv=none; d=google.com; s=arc-20160816; b=krSyW5O5XLXfgub8WliJQvF5AwOhw0tEmZjCO/LNWaJ6OCn5/8T5+9VC7PKKWn1wZx t8C6usDHPqOZnnqhQRcEM8uXGDhh/uBQCi7eAbDfJ1Um3G/HgE9wWuCYBE7edafq1ugb jCTxe/IJzCrdPPhOuVZ6wUVH3SCHQSMRtTU5rn9mJraMX4yGnTEEpMz2ipLBTSkJIBWy iWooQ98fGOEwdecNtds4TiVDQUfmrfhEsbVhk/TZke9Wh1pAZLKfcDoqEVrAFgdXWMI7 scKEwVgUqlD5gwWLJ5ZCpsUc5xYmMJ5s040Zck3wPwAHUrOz/g97wmpos5igmbfjyRCs eayg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=HnngZf6G0Qe4I23X/V7kw5MqCHNauLUO8EfOaf3rbgQ=; b=pcfAWxAXBfj5ui+RyXxu0z2bDJ50ob66YKlqQkltVySlHOFlqy/AYnbtr5QorTN7C8 9BLwHD9ynqRdVBwjRWYG7osCHAfjvKleMxxxZ6Oda2Ex31EbKA1JmFLSsO9oH1HAjTkV Zq1/xj466LM3WSoRAaoSE0OyuykecZYMBJc47HxSmmU/qBln/ix3SMFVptW+VBK7cfYC NgiQhLIrvFG+cHfQDsZHnTQTGzZVMFaWJ/us72vGGElAFacoM4uoxTwDWp3nT5jcHF5U NLRwF9676AudXw7KH0PKmcJC2WSO7isro+b5di4On7IxTfy2n1eymlJBVy+3Kah5iNYb Lnxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bBxxncVY; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b5si2225639pgl.254.2019.02.11.06.38.06; Mon, 11 Feb 2019 06:38:22 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bBxxncVY; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730998AbfBKOhQ (ORCPT + 99 others); Mon, 11 Feb 2019 09:37:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:46536 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730980AbfBKOhO (ORCPT ); Mon, 11 Feb 2019 09:37:14 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (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 723C221B18; Mon, 11 Feb 2019 14:37:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549895833; bh=TyjVEQTUM45xJ027sF3TCc/yB1CnsZoueeFb47WgYTU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bBxxncVYxQUHNOfZZHsdaKFaGhktONDBLGom2Y8MBXiEtQpF/cbg6twHeeMhLtRfz eEtG0561dTZDYNKgfJBN+JthxPXnXZiP3cki31sFGEjAaNr2guI9VQ079hDMvMCsEg 7Dt9WEmdmyUhBmR8atIoqu3m74twdDPZhM1Db9nc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vaibhav Jain , "Martin K. Petersen" Subject: [PATCH 4.20 337/352] scsi: cxlflash: Prevent deadlock when adapter probe fails Date: Mon, 11 Feb 2019 15:19:24 +0100 Message-Id: <20190211141908.563842445@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141846.543045703@linuxfoundation.org> References: <20190211141846.543045703@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ From: Vaibhav Jain commit bb61b843ffd46978d7ca5095453e572714934eeb upstream. Presently when an error is encountered during probe of the cxlflash adapter, a deadlock is seen with cpu thread stuck inside cxlflash_remove(). Below is the trace of the deadlock as logged by khungtaskd: cxlflash 0006:00:00.0: cxlflash_probe: init_afu failed rc=-16 INFO: task kworker/80:1:890 blocked for more than 120 seconds. Not tainted 5.0.0-rc4-capi2-kexec+ #2 "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. kworker/80:1 D 0 890 2 0x00000808 Workqueue: events work_for_cpu_fn Call Trace: 0x4d72136320 (unreliable) __switch_to+0x2cc/0x460 __schedule+0x2bc/0xac0 schedule+0x40/0xb0 cxlflash_remove+0xec/0x640 [cxlflash] cxlflash_probe+0x370/0x8f0 [cxlflash] local_pci_probe+0x6c/0x140 work_for_cpu_fn+0x38/0x60 process_one_work+0x260/0x530 worker_thread+0x280/0x5d0 kthread+0x1a8/0x1b0 ret_from_kernel_thread+0x5c/0x80 INFO: task systemd-udevd:5160 blocked for more than 120 seconds. The deadlock occurs as cxlflash_remove() is called from cxlflash_probe() without setting 'cxlflash_cfg->state' to STATE_PROBED and the probe thread starts to wait on 'cxlflash_cfg->reset_waitq'. Since the device was never successfully probed the 'cxlflash_cfg->state' never changes from STATE_PROBING hence the deadlock occurs. We fix this deadlock by setting the variable 'cxlflash_cfg->state' to STATE_PROBED in case an error occurs during cxlflash_probe() and just before calling cxlflash_remove(). Cc: stable@vger.kernel.org Fixes: c21e0bbfc485("cxlflash: Base support for IBM CXL Flash Adapter") Signed-off-by: Vaibhav Jain Signed-off-by: Martin K. Petersen Signed-off-by: Greg Kroah-Hartman --- drivers/scsi/cxlflash/main.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/scsi/cxlflash/main.c +++ b/drivers/scsi/cxlflash/main.c @@ -3694,6 +3694,7 @@ static int cxlflash_probe(struct pci_dev host->max_cmd_len = CXLFLASH_MAX_CDB_LEN; cfg = shost_priv(host); + cfg->state = STATE_PROBING; cfg->host = host; rc = alloc_mem(cfg); if (rc) { @@ -3782,6 +3783,7 @@ out: return rc; out_remove: + cfg->state = STATE_PROBED; cxlflash_remove(pdev); goto out; }