From patchwork Mon Sep 9 12:05:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurence Oberman X-Patchwork-Id: 11137749 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 310C51599 for ; Mon, 9 Sep 2019 12:06:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0DC582067B for ; Mon, 9 Sep 2019 12:06:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387569AbfIIMGI (ORCPT ); Mon, 9 Sep 2019 08:06:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38892 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726654AbfIIMGI (ORCPT ); Mon, 9 Sep 2019 08:06:08 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 35C5610CC1F7; Mon, 9 Sep 2019 12:06:08 +0000 (UTC) Received: from rhel7lobe.redhat.com (ovpn-125-48.rdu2.redhat.com [10.10.125.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id AFE4150; Mon, 9 Sep 2019 12:06:07 +0000 (UTC) From: Laurence Oberman To: loberman@redhat.com, QLogic-Storage-Upstream@qlogic.com, linux-scsi@vger.kernel.org Subject: [PATCH] bnx2fc: Handle scope bits when array returns BUSY or TASK_SET_FULL Date: Mon, 9 Sep 2019 08:05:56 -0400 Message-Id: <1568030756-17428-1-git-send-email-loberman@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.65]); Mon, 09 Sep 2019 12:06:08 +0000 (UTC) Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org The qla2xxx driver had this issue as well when the newer array firmware returned the retry_delay_timer in the fcp_rsp. The bnx2fc is not handling the masking of the scope bits either so the retry_delay_timestamp value lands up being a large value added to the timer timestamp delaying I/O for up to 27 Minutes. This patch adds similar code to handle this to the bnx2fc driver to avoid the huge delay. V2. Indent comments as suggested Signed-off-by: Laurence Oberman Reviewed-by: Lee Duncan Reviewed-by: Chad Dupuis --- drivers/scsi/bnx2fc/bnx2fc_io.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) if (io_req->fcp_resid) scsi_set_resid(sc_cmd, io_req->fcp_resid); diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c index 9e50e5b..39f4aeb 100644 --- a/drivers/scsi/bnx2fc/bnx2fc_io.c +++ b/drivers/scsi/bnx2fc/bnx2fc_io.c @@ -1928,6 +1928,7 @@ void bnx2fc_process_scsi_cmd_compl(struct bnx2fc_cmd *io_req, struct bnx2fc_rport *tgt = io_req->tgt; struct scsi_cmnd *sc_cmd; struct Scsi_Host *host; + u16 scope, qualifier = 0; /* scsi_cmd_cmpl is called with tgt lock held */ @@ -1997,12 +1998,28 @@ void bnx2fc_process_scsi_cmd_compl(struct bnx2fc_cmd *io_req, if (io_req->cdb_status == SAM_STAT_TASK_SET_FULL || io_req->cdb_status == SAM_STAT_BUSY) { + /* Newer array firmware with BUSY or + * TASK_SET_FULL may return a status that needs + * the scope bits masked. + * Or a huge delay timestamp up to 27 minutes + * can result. + */ + if (fcp_rsp->retry_delay_timer) { + /* Upper 2 bits */ + scope = fcp_rsp->retry_delay_timer + & 0xC000; + /* Lower 14 bits */ + qualifier = fcp_rsp->retry_delay_timer + & 0x3FFF; + } + if (scope > 0 && qualifier > 0 && + qualifier <= 0x3FEF) { /* Set the jiffies + retry_delay_timer * 100ms for the rport/tgt */ - tgt->retry_delay_timestamp = jiffies + - fcp_rsp->retry_delay_timer * HZ / 10; + tgt->retry_delay_timestamp = jiffies + + (qualifier * HZ / 10); + } } - }