From patchwork Mon Mar 14 18:14:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Satish Kharat X-Patchwork-Id: 8583471 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D1AD0C0554 for ; Mon, 14 Mar 2016 18:24:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F228120259 for ; Mon, 14 Mar 2016 18:24:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E816020260 for ; Mon, 14 Mar 2016 18:24:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755149AbcCNSYF (ORCPT ); Mon, 14 Mar 2016 14:24:05 -0400 Received: from rcdn-iport-6.cisco.com ([173.37.86.77]:25450 "EHLO rcdn-iport-6.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753792AbcCNSYD (ORCPT ); Mon, 14 Mar 2016 14:24:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=2313; q=dns/txt; s=iport; t=1457979843; x=1459189443; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=N1r/1ooy5fLb42RYsoYE3FSHfaC3UdBOu6uE8SuzBQk=; b=ZDawsNHxt7fWJk+3HBPvtPuK/UbhgGLMMypWwx18WKZ2FEmKhezjqybR EFISCW0kFiFM2c675e3ATUGtAqrHD06U6GfT5sl6wbYw4z1b6P2HrL19P pJ/eWpiuLfI/EwOBwu4xKwXv0hI77XFJB8pzvSziVu/ER7B1It8E2c11/ k=; X-IronPort-AV: E=Sophos;i="5.24,336,1454976000"; d="scan'208";a="82702267" Received: from rcdn-core-3.cisco.com ([173.37.93.154]) by rcdn-iport-6.cisco.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Mar 2016 18:14:28 +0000 Received: from satishkh-lnx.cisco.com (satishkh-lnx.cisco.com [171.71.12.158]) by rcdn-core-3.cisco.com (8.14.5/8.14.5) with ESMTP id u2EIER5O021862; Mon, 14 Mar 2016 18:14:28 GMT From: Satish Kharat To: satishkh@cisco.com, linux-scsi@vger.kernel.org Subject: [PATCH 3/5] Using rport->dd_data to check rport online instead of rport_lookup. Date: Mon, 14 Mar 2016 11:14:20 -0700 Message-Id: <1457979262-26571-3-git-send-email-satishkh@cisco.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1457979262-26571-1-git-send-email-satishkh@cisco.com> References: <1457979262-26571-1-git-send-email-satishkh@cisco.com> MIME-Version: 1.0 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-14.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY, USER_IN_DEF_DKIM_WL autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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’s dd_data which is preserved until its devloss timeout and no protection is required. Fnic driver version changed from 1.6.0.20 to 1.6.0.21 Signed-off-by: Satish Kharat Reviewed-by: Ewan D. Milne --- 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 @@ #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: " diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c index a3e0f69..8492143 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 = 0; unsigned long flags = 0; unsigned long ptr; - struct fc_rport_priv *rdata; spinlock_t *io_lock = NULL; int io_lock_acquired = 0; @@ -455,14 +454,17 @@ static int fnic_queuecommand_lck(struct scsi_cmnd *sc, void (*done)(struct scsi_ return 0; } - rdata = lp->tt.rport_lookup(lp, rport->port_id); - if (!rdata || (rdata->rp_state == 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 = DID_NO_CONNECT; - done(sc); - return 0; + if (rport) { + struct fc_rport_libfc_priv *rp = rport->dd_data; + + if (!rp || rp->rp_state != 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 = DID_NO_CONNECT; + done(sc); + return 0; + } } if (lp->state != LPORT_ST_READY || !(lp->link_up))