From mboxrd@z Thu Jan 1 00:00:00 1970 From: Satish Kharat Subject: [PATCH v1 3/3] Using rport->dd_data to check rport online instead of rport_lookup. Date: Fri, 18 Mar 2016 11:22:50 -0700 Message-ID: <1458325370-25615-3-git-send-email-satishkh@cisco.com> References: <1458325370-25615-1-git-send-email-satishkh@cisco.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from alln-iport-7.cisco.com ([173.37.142.94]:36888 "EHLO alln-iport-7.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753122AbcCRSXZ (ORCPT ); Fri, 18 Mar 2016 14:23:25 -0400 In-Reply-To: <1458325370-25615-1-git-send-email-satishkh@cisco.com> Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: satishkh@cisco.com, linux-scsi@vger.kernel.org Cc: Sesidhar Baddela When issuing I/O we check if rport is online through libfc rport_lookup() function which needs to be protected by mutex lock that cannot acquired in I/O context. The change is to use midlayer remote port=E2=80=99s dd_data which is preserved until its devloss time= out and no protection is required. The the scsi_cmnd error code is expected to be in the left 16 bits of the result field. Changed to correct this. =46nic driver version changed from 1.6.0.20 to 1.6.0.21 Signed-off-by: Satish Kharat Signed-off-by: Sesidhar Baddela --- * v1 - DID_NO_CONNECT left shifted 16 bits before assigning to sc->result --- drivers/scsi/fnic/fnic.h | 2 +- drivers/scsi/fnic/fnic_scsi.c | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h index 1023eae..9ddc920 100644 --- a/drivers/scsi/fnic/fnic.h +++ b/drivers/scsi/fnic/fnic.h @@ -39,7 +39,7 @@ =20 #define DRV_NAME "fnic" #define DRV_DESCRIPTION "Cisco FCoE HBA Driver" -#define DRV_VERSION "1.6.0.20" +#define DRV_VERSION "1.6.0.21" #define PFX DRV_NAME ": " #define DFX DRV_NAME "%d: " =20 diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scs= i.c index 026b93d..0e874a5 100644 --- a/drivers/scsi/fnic/fnic_scsi.c +++ b/drivers/scsi/fnic/fnic_scsi.c @@ -439,7 +439,6 @@ static int fnic_queuecommand_lck(struct scsi_cmnd *= sc, void (*done)(struct scsi_ int sg_count =3D 0; unsigned long flags =3D 0; unsigned long ptr; - struct fc_rport_priv *rdata; spinlock_t *io_lock =3D NULL; int io_lock_acquired =3D 0; =20 @@ -455,14 +454,17 @@ static int fnic_queuecommand_lck(struct scsi_cmnd= *sc, void (*done)(struct scsi_ return 0; } =20 - rdata =3D lp->tt.rport_lookup(lp, rport->port_id); - if (!rdata || (rdata->rp_state =3D=3D RPORT_ST_DELETE)) { - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "returning IO as rport is removed\n"); - atomic64_inc(&fnic_stats->misc_stats.rport_not_ready); - sc->result =3D DID_NO_CONNECT; - done(sc); - return 0; + if (rport) { + struct fc_rport_libfc_priv *rp =3D rport->dd_data; + + if (!rp || rp->rp_state !=3D RPORT_ST_READY) { + FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, + "returning DID_NO_CONNECT for IO as rport is removed\n"); + atomic64_inc(&fnic_stats->misc_stats.rport_not_ready); + sc->result =3D DID_NO_CONNECT<<16; + done(sc); + return 0; + } } =20 if (lp->state !=3D LPORT_ST_READY || !(lp->link_up)) --=20 2.4.3 -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" i= n the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html