From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755134Ab0J0S1V (ORCPT <rfc822;w@1wt.eu>);
	Wed, 27 Oct 2010 14:27:21 -0400
Received: from sabe.cs.wisc.edu ([128.105.6.20]:40749 "EHLO sabe.cs.wisc.edu"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1755079Ab0J0S1T (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Wed, 27 Oct 2010 14:27:19 -0400
Message-ID: <4CC86E36.8060102@cs.wisc.edu>
Date: Wed, 27 Oct 2010 13:23:50 -0500
From: Mike Christie <michaelc@cs.wisc.edu>
User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.12) Gecko/20100907 Fedora/3.0.7-1.fc12 Thunderbird/3.0.7
MIME-Version: 1.0
To: "Nicholas A. Bellinger" <nab@linux-iscsi.org>
CC: linux-scsi <linux-scsi@vger.kernel.org>,
        linux-kernel <linux-kernel@vger.kernel.org>,
        Vasu Dev <vasu.dev@linux.intel.com>,
        Tim Chen <tim.c.chen@linux.intel.com>, Andi Kleen <ak@linux.intel.com>,
        Matthew Wilcox <willy@linux.intel.com>,
        James Bottomley <James.Bottomley@suse.de>,
        Jens Axboe <jaxboe@fusionio.com>, James Smart <james.smart@emulex.com>,
        Andrew Vasquez <andrew.vasquez@qlogic.com>,
        FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>,
        Hannes Reinecke <hare@suse.de>, Joe Eykholt <jeykholt@cisco.com>,
        Christoph Hellwig <hch@lst.de>, Jon Hawley <warthog9@kernel.org>,
        MPTFusionLinux <DL-MPTFusionLinux@lsi.com>,
        "eata.c maintainer" <dario.ballabio@inwind.it>,
        Luben Tuikov <ltuikov@yahoo.com>, mvsas maintainer <kewei@marvell.com>,
        pm8001 maintainer Jack Wang <jack_wang@usish.com>
Subject: Re: [PATCH] scsi: Add SHT->unlocked_qcmd for host_lock less SHT->queuecommand()
 dispatch
References: <1288139559-12019-1-git-send-email-nab@linux-iscsi.org>
In-Reply-To: <1288139559-12019-1-git-send-email-nab@linux-iscsi.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 10/26/2010 07:32 PM, Nicholas A. Bellinger wrote:
> diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
> index fec47de..f5933dd 100644
> --- a/drivers/scsi/iscsi_tcp.c
> +++ b/drivers/scsi/iscsi_tcp.c
> @@ -882,6 +882,7 @@ static struct scsi_host_template iscsi_sw_tcp_sht = {
>   	.target_alloc		= iscsi_target_alloc,
>   	.proc_name		= "iscsi_tcp",
>   	.this_id		= -1,
> +	.unlocked_qcmd		= 1,
>   };
>
>   static struct iscsi_transport iscsi_sw_tcp_transport = {
> diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
> index 633e090..7e4134e 100644
> --- a/drivers/scsi/libiscsi.c
> +++ b/drivers/scsi/libiscsi.c
> @@ -1615,7 +1615,6 @@ int iscsi_queuecommand(struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *))
>
>   	host = sc->device->host;
>   	ihost = shost_priv(host);
> -	spin_unlock(host->host_lock);
>
>   	cls_session = starget_to_session(scsi_target(sc->device));
>   	session = cls_session->dd_data;
> @@ -1706,7 +1705,6 @@ int iscsi_queuecommand(struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *))
>
>   	session->queued_cmdsn++;
>   	spin_unlock(&session->lock);
> -	spin_lock(host->host_lock);
>   	return 0;
>
>   prepd_reject:
> @@ -1716,7 +1714,6 @@ reject:
>   	spin_unlock(&session->lock);
>   	ISCSI_DBG_SESSION(session, "cmd 0x%x rejected (%d)\n",
>   			  sc->cmnd[0], reason);
> -	spin_lock(host->host_lock);
>   	return SCSI_MLQUEUE_TARGET_BUSY;
>
>   prepd_fault:
> @@ -1733,7 +1730,6 @@ fault:
>   		scsi_in(sc)->resid = scsi_in(sc)->length;
>   	}
>   	done(sc);
> -	spin_lock(host->host_lock);
>   	return 0;
>   }
>   EXPORT_SYMBOL_GPL(iscsi_queuecommand);


Hey,

iscsi_tcp, drivers/infiniband/ulp/iser/ib_iser, drivers/scsi/cxgb3i, 
drivers/scsi/bnx2i, and drivers/scsi/be2iscsi use libiscsi's 
iscsi_queuecommand function, so they should all use the same setting 
unlocked_qcmd=1.