mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Madhani, Himanshu" <Himanshu.Madhani@cavium.com>
To: Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com>,
	"qla2xxx-upstream@qlogic.com" <qla2xxx-upstream@qlogic.com>
Cc: "martin.petersen@oracle.com" <martin.petersen@oracle.com>,
	"jejb@linux.vnet.ibm.com" <jejb@linux.vnet.ibm.com>,
	"linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] qla2xxx: do not abort all commands in the adapter during EEH recovery
Date: Mon, 14 Nov 2016 22:07:01 +0000	[thread overview]
Message-ID: <15B66EB6-63CD-46D3-B6A9-444CCD181D2B@cavium.com> (raw)
In-Reply-To: <1479158782-4544-1-git-send-email-mauricfo@linux.vnet.ibm.com>



On 11/14/16, 1:26 PM, "Mauricio Faria de Oliveira" <mauricfo@linux.vnet.ibm.com> wrote:

>The previous commit ("qla2xxx: fix invalid DMA access after command
>aborts in PCI device remove") introduced a regression during an EEH
>recovery, since the change to the qla2x00_abort_all_cmds() function
>calls qla2xxx_eh_abort(), which verifies the EEH recovery condition
>but handles it heavy-handed. (commit a465537ad1a4 "qla2xxx: Disable
>the adapter and skip error recovery in case of register disconnect.")
>
>This problem warrants a more general/optimistic solution right into
>qla2xxx_eh_abort()  (eg in case a real command abort arrives during
>EEH recovery, or if it takes long enough to trigger command aborts);
>but it's still worth to add a check to ensure the code added by the
>previous commit is correct and contained within its owner function.
>
>This commit just adds a 'if (!ha->flags.eeh_busy)' check around it.
>(ahem; a trivial fix for this -rc series; sorry for this oversight.)
>
>With it applied, both PCI device remove and EEH recovery works fine.
>
>Fixes: 1535aa75a3d8 ("scsi: qla2xxx: fix invalid DMA access after
>command aborts in PCI device remove")
>Signed-off-by: Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com>
>---
> drivers/scsi/qla2xxx/qla_os.c | 21 +++++++++++++--------
> 1 file changed, 13 insertions(+), 8 deletions(-)
>
>diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
>index 567fa080e261..56d6142852a5 100644
>--- a/drivers/scsi/qla2xxx/qla_os.c
>+++ b/drivers/scsi/qla2xxx/qla_os.c
>@@ -1456,15 +1456,20 @@ uint32_t qla2x00_isp_reg_stat(struct qla_hw_data *ha)
> 		for (cnt = 1; cnt < req->num_outstanding_cmds; cnt++) {
> 			sp = req->outstanding_cmds[cnt];
> 			if (sp) {
>-				/* Get a reference to the sp and drop the lock.
>-				 * The reference ensures this sp->done() call
>-				 * - and not the call in qla2xxx_eh_abort() -
>-				 * ends the SCSI command (with result 'res').
>+				/* Don't abort commands in adapter during EEH
>+				 * recovery as it's not accessible/responding.
> 				 */
>-				sp_get(sp);
>-				spin_unlock_irqrestore(&ha->hardware_lock, flags);
>-				qla2xxx_eh_abort(GET_CMD_SP(sp));
>-				spin_lock_irqsave(&ha->hardware_lock, flags);
>+				if (!ha->flags.eeh_busy) {
>+					/* Get a reference to the sp and drop the lock.
>+					 * The reference ensures this sp->done() call
>+					 * - and not the call in qla2xxx_eh_abort() -
>+					 * ends the SCSI command (with result 'res').
>+					 */
>+					sp_get(sp);
>+					spin_unlock_irqrestore(&ha->hardware_lock, flags);
>+					qla2xxx_eh_abort(GET_CMD_SP(sp));
>+					spin_lock_irqsave(&ha->hardware_lock, flags);
>+				}
> 				req->outstanding_cmds[cnt] = NULL;
> 				sp->done(vha, sp, res);
> 			}
>-- 
>1.8.3.1
>

Acked-by: Himanshu Madhani <himanshu.madhani@cavium.com>

Thanks,
Himanshu

  reply	other threads:[~2016-11-14 22:23 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-14 21:26 Mauricio Faria de Oliveira
2016-11-14 22:07 ` Madhani, Himanshu [this message]
2016-11-14 23:39 ` Martin K. Petersen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=15B66EB6-63CD-46D3-B6A9-444CCD181D2B@cavium.com \
    --to=himanshu.madhani@cavium.com \
    --cc=jejb@linux.vnet.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=mauricfo@linux.vnet.ibm.com \
    --cc=qla2xxx-upstream@qlogic.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®