Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp7353533yba; Thu, 2 May 2019 08:29:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqwZ2gHBuC+5RHruTtpQ4fPE1DfsihuhUZlFUaN7R2kI7zJr4TxWf9pyej/1IwBKkPo09xsC X-Received: by 2002:a63:d345:: with SMTP id u5mr4355229pgi.83.1556810981954; Thu, 02 May 2019 08:29:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556810981; cv=none; d=google.com; s=arc-20160816; b=pnF5vdynjasQjFvX+q/4Afc3beUA4dWrMZugVILnYseFJe48mtuOf2sDVtE24GqD/u 5wWLWWVAfc3aH69jbVEqc8dgaObdGwndRAqn5A6OSNfxn31p6OpXp4V1mFRs8J936tEj kqwDBKe+y+qhU5AWPf+8jkSpHhleVeXX8xhmrtCKrZuqjsFMOTv/u9DS9JWDG+BXFSKx 4qNiDMugqIBpiSZ791tvBtJwoYWPM0Fx04MGCQOs0PLuVQCtaegRqXg01Md3e2kkdqK2 OGeGfLJTfgO+K4/yebZWDAbiBxEHY/8iwiIXTPVwNuNdxvQebiNBC1ryzx9m8sz4es7m g9LA== 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=6L9ekHjPH+uxg4Ds5mNUmg1001VHrJRuT1C+gdSPEfo=; b=uvfs5qPbOfrRPxaKpyxkOKU0RDqvf95iLBbui4Njacy7Y+CvZfkrjmIbapfKnJ7j5b 5bZpjTvis3w6m2u12TjLYt6wKw/ao9/P7x3BOuPrqPA9t3vXQ7oNT7Cs4/lgYZGokvQs Z23b0qKBOuTjRK3FKpbatQuJmrrWbC4co82/+wLyZzaEZ412gPECRB+++72OWKafHq29 9jfrp9AFNDJ5fJZRhAJtIjMw3Sw10R/gkTZDeKxwOlaB4iS/ZE0vSwMBaTusJh/HURhD cdtpqgZkM3ZIrw5fL//vV05MqipetQTzGj9DYu+CfYNih8Y+el/ttU1zcb8N2/c+jHO8 jz1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=iUf2buWA; 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 142si17543136pfu.129.2019.05.02.08.29.26; Thu, 02 May 2019 08:29:41 -0700 (PDT) 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=iUf2buWA; 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 S1726894AbfEBP14 (ORCPT + 99 others); Thu, 2 May 2019 11:27:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:44870 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728086AbfEBP1y (ORCPT ); Thu, 2 May 2019 11:27:54 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 4B1A220675; Thu, 2 May 2019 15:27:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556810872; bh=X9UCvOZx8Uswl8YEp9+L7iY07QcjNK7mbhseX3f3PvY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iUf2buWAxP5jJLZurroLSTWTiRl/Pwg6LoseAoHb0pY3KZN71xY9wxWshdEqyWalN FM9XdWgaZnUsQuZUscw8VwC7FLcOOKuDGRTAOmwbxI1eGBwZve8NVhpwrdgLzDZaLx Mypu0eke7wuvqpnjIDmJ3r8CXtJaMFb35MbKsgQg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Steffen Maier , Benjamin Block , Jens Remus , "Martin K. Petersen" , "Sasha Levin (Microsoft)" Subject: [PATCH 4.19 62/72] scsi: zfcp: reduce flood of fcrscn1 trace records on multi-element RSCN Date: Thu, 2 May 2019 17:21:24 +0200 Message-Id: <20190502143338.277006883@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190502143333.437607839@linuxfoundation.org> References: <20190502143333.437607839@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 [ Upstream commit c8206579175c34a2546de8a74262456278a7795a ] If an incoming ELS of type RSCN contains more than one element, zfcp suboptimally causes repeated erp trigger NOP trace records for each previously failed port. These could be ports that went away. It loops over each RSCN element, and for each of those in an inner loop over all zfcp_ports. The trigger to recover failed ports should be just the reception of some RSCN, no matter how many elements it has. So we can loop over failed ports separately, and only then loop over each RSCN element to handle the non-failed ports. The call chain was: zfcp_fc_incoming_rscn for (i = 1; i < no_entries; i++) _zfcp_fc_incoming_rscn list_for_each_entry(port, &adapter->port_list, list) if (masked port->d_id match) zfcp_fc_test_link if (!port->d_id) zfcp_erp_port_reopen "fcrscn1" <=== In order the reduce the "flooding" of the REC trace area in such cases, we factor out handling the failed ports to be outside of the entries loop: zfcp_fc_incoming_rscn if (no_entries > 1) <=== list_for_each_entry(port, &adapter->port_list, list) <=== if (!port->d_id) zfcp_erp_port_reopen "fcrscn1" <=== for (i = 1; i < no_entries; i++) _zfcp_fc_incoming_rscn list_for_each_entry(port, &adapter->port_list, list) if (masked port->d_id match) zfcp_fc_test_link Abbreviated example trace records before this code change: Tag : fcrscn1 WWPN : 0x500507630310d327 ERP want : 0x02 ERP need : 0x02 Tag : fcrscn1 WWPN : 0x500507630310d327 ERP want : 0x02 ERP need : 0x00 NOP => superfluous trace record The last trace entry repeats if there are more than 2 RSCN elements. Signed-off-by: Steffen Maier Reviewed-by: Benjamin Block Reviewed-by: Jens Remus Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin (Microsoft) --- drivers/s390/scsi/zfcp_fc.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c index f6c415d6ef48..5eb7aabe2d8b 100644 --- a/drivers/s390/scsi/zfcp_fc.c +++ b/drivers/s390/scsi/zfcp_fc.c @@ -239,10 +239,6 @@ static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range, list_for_each_entry(port, &adapter->port_list, list) { if ((port->d_id & range) == (ntoh24(page->rscn_fid) & range)) zfcp_fc_test_link(port); - if (!port->d_id) - zfcp_erp_port_reopen(port, - ZFCP_STATUS_COMMON_ERP_FAILED, - "fcrscn1"); } read_unlock_irqrestore(&adapter->port_list_lock, flags); } @@ -250,6 +246,7 @@ static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range, static void zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req) { struct fsf_status_read_buffer *status_buffer = (void *)fsf_req->data; + struct zfcp_adapter *adapter = fsf_req->adapter; struct fc_els_rscn *head; struct fc_els_rscn_page *page; u16 i; @@ -263,6 +260,22 @@ static void zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req) no_entries = be16_to_cpu(head->rscn_plen) / sizeof(struct fc_els_rscn_page); + if (no_entries > 1) { + /* handle failed ports */ + unsigned long flags; + struct zfcp_port *port; + + read_lock_irqsave(&adapter->port_list_lock, flags); + list_for_each_entry(port, &adapter->port_list, list) { + if (port->d_id) + continue; + zfcp_erp_port_reopen(port, + ZFCP_STATUS_COMMON_ERP_FAILED, + "fcrscn1"); + } + read_unlock_irqrestore(&adapter->port_list_lock, flags); + } + for (i = 1; i < no_entries; i++) { /* skip head and start with 1st element */ page++; -- 2.19.1