Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp624480imu; Fri, 11 Jan 2019 06:23:31 -0800 (PST) X-Google-Smtp-Source: ALg8bN43IZ7QN99zcK9gfAuHR2PWGznD9Jn9Sreoy7AuecnK/4HWv39QG3eVMSiWsjntNi/s2qjJ X-Received: by 2002:a62:2044:: with SMTP id g65mr14626373pfg.127.1547216611173; Fri, 11 Jan 2019 06:23:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547216611; cv=none; d=google.com; s=arc-20160816; b=hIKBLJuNfCOD3N47Qh+k+DX9LVw094AyXo3cbgdjhPosYr3b7jmpP2TGYpLVrLvOyY H/ZJ8urypW40cNRCBhF95LqQJRZg0nj1x/9S7a4S4tikNcA/G7Y1POLNfqQAbCnA8QTs htHX+NL+XujeQu5CtSAWPy8WsiyaibsMVxYqEiMeVFx/llC5QOk8O02U+vEo/es362wH wdYUwh2QExCR8eHLsHIgRc5ve3/5r221ukBQ7WHgnKjkYZ2aTXeFXP1esfTLJPAohJ3t 5tDGIJVX8rH9+PRPAgW9KzcfwcrEwDOEEpZYk072PvgDNPAqxj4wA1jeiEQsMFObaBso M89w== 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=q23IN0fnqXkRAXrP7mtAzNDcXuF8wTg9YHTnM2hrTGs=; b=Sqd8vhimKr568Y153/8P57WbRiwtwkDamuSGgHTFs+YyJudo84kJIExx2W1+OXy6Ex PDRmkxcsKQ4uon4ZCIl0HU775ns2Kj3Sn5aFZrFSsDYAaJlU7L0sw+dfBjKIVR3o1sbJ wHN/ETlpNU+Teb9/Kq982YnPiAgPDkMSiDxzI4l3Ogs6HVN7jX6QClHEPhd6biEdnbiV 7imGDt4P9BpczHV4NJeKMcRYuqjLay/QW6tcB3uS6j0xRTHH39DUQKFwr6ryKdtOtzI1 VeLX2MPiq9dbmZuQEh7DvWhY63fyTZngXNupVFhgpLYpkzNrP4pp1iLEoLFemrND0qX2 TxQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="UfGJ6/By"; 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 h3si5049402pll.116.2019.01.11.06.23.15; Fri, 11 Jan 2019 06:23:31 -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="UfGJ6/By"; 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 S2387396AbfAKOP3 (ORCPT + 99 others); Fri, 11 Jan 2019 09:15:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:59594 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733300AbfAKOP1 (ORCPT ); Fri, 11 Jan 2019 09:15:27 -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 026BE20874; Fri, 11 Jan 2019 14:15:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547216126; bh=r7gnNBbSKFEiDcC+rBF0imJTjuf7juRdFw0m50kIlNo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UfGJ6/ByuSOmWCh4kr+bQPMaPNtsNMtXHHN/Nq2a/gW+gtqJ8SFrm9yLAs/ifnWD6 IqSepwEh6B94CqVP+gKjcZmTxLsM2hSB5aVEGjUWtUsdN7Id/StsVZj5b00/ezNa0e mUTQxP2gZ1t3YcKDDHe2oc7TRpolYnq2p2BX7yFE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Steffen Maier , Jens Remus , "Martin K. Petersen" Subject: [PATCH 3.18 31/47] scsi: zfcp: fix posting too many status read buffers leading to adapter shutdown Date: Fri, 11 Jan 2019 15:08:16 +0100 Message-Id: <20190111131000.118374438@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190111130956.170952125@linuxfoundation.org> References: <20190111130956.170952125@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 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Steffen Maier commit 60a161b7e5b2a252ff0d4c622266a7d8da1120ce upstream. Suppose adapter (open) recovery is between opened QDIO queues and before (the end of) initial posting of status read buffers (SRBs). This time window can be seconds long due to FSF_PROT_HOST_CONNECTION_INITIALIZING causing by design looping with exponential increase sleeps in the function performing exchange config data during recovery [zfcp_erp_adapter_strat_fsf_xconf()]. Recovery triggered by local link up. Suppose an event occurs for which the FCP channel would send an unsolicited notification to zfcp by means of a previously posted SRB. We saw it with local cable pull (link down) in multi-initiator zoning with multiple NPIV-enabled subchannels of the same shared FCP channel. As soon as zfcp_erp_adapter_strategy_open_fsf() starts posting the initial status read buffers from within the adapter's ERP thread, the channel does send an unsolicited notification. Since v2.6.27 commit d26ab06ede83 ("[SCSI] zfcp: receiving an unsolicted status can lead to I/O stall"), zfcp_fsf_status_read_handler() schedules adapter->stat_work to re-fill the just consumed SRB from a work item. Now the ERP thread and the work item post SRBs in parallel. Both contexts call the helper function zfcp_status_read_refill(). The tracking of missing (to be posted / re-filled) SRBs is not thread-safe due to separate atomic_read() and atomic_dec(), in order to depend on posting success. Hence, both contexts can see atomic_read(&adapter->stat_miss) == 1. One of the two contexts posts one too many SRB. Zfcp gets QDIO_ERROR_SLSB_STATE on the output queue (trace tag "qdireq1") leading to zfcp_erp_adapter_shutdown() in zfcp_qdio_handler_error(). An obvious and seemingly clean fix would be to schedule stat_work from the ERP thread and wait for it to finish. This would serialize all SRB re-fills. However, we already have another work item wait on the ERP thread: adapter->scan_work runs zfcp_fc_scan_ports() which calls zfcp_fc_eval_gpn_ft(). The latter calls zfcp_erp_wait() to wait for all the open port recoveries during zfcp auto port scan, but in fact it waits for any pending recovery including an adapter recovery. This approach leads to a deadlock. [see also v3.19 commit 18f87a67e6d6 ("zfcp: auto port scan resiliency"); v2.6.37 commit d3e1088d6873 ("[SCSI] zfcp: No ERP escalation on gpn_ft eval"); v2.6.28 commit fca55b6fb587 ("[SCSI] zfcp: fix deadlock between wq triggered port scan and ERP") fixing v2.6.27 commit c57a39a45a76 ("[SCSI] zfcp: wait until adapter is finished with ERP during auto-port"); v2.6.27 commit cc8c282963bd ("[SCSI] zfcp: Automatically attach remote ports")] Instead make the accounting of missing SRBs atomic for parallel execution in both the ERP thread and adapter->stat_work. Signed-off-by: Steffen Maier Fixes: d26ab06ede83 ("[SCSI] zfcp: receiving an unsolicted status can lead to I/O stall") Cc: #2.6.27+ Reviewed-by: Jens Remus Signed-off-by: Martin K. Petersen Signed-off-by: Greg Kroah-Hartman --- drivers/s390/scsi/zfcp_aux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/s390/scsi/zfcp_aux.c +++ b/drivers/s390/scsi/zfcp_aux.c @@ -275,16 +275,16 @@ static void zfcp_free_low_mem_buffers(st */ int zfcp_status_read_refill(struct zfcp_adapter *adapter) { - while (atomic_read(&adapter->stat_miss) > 0) + while (atomic_add_unless(&adapter->stat_miss, -1, 0)) if (zfcp_fsf_status_read(adapter->qdio)) { + atomic_inc(&adapter->stat_miss); /* undo add -1 */ if (atomic_read(&adapter->stat_miss) >= adapter->stat_read_buf_num) { zfcp_erp_adapter_reopen(adapter, 0, "axsref1"); return 1; } break; - } else - atomic_dec(&adapter->stat_miss); + } return 0; }