From patchwork Thu Jul 11 10:26:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Gordeev X-Patchwork-Id: 258394 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C68432C008C for ; Thu, 11 Jul 2013 20:24:42 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755391Ab3GKKYl (ORCPT ); Thu, 11 Jul 2013 06:24:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61842 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751868Ab3GKKYk (ORCPT ); Thu, 11 Jul 2013 06:24:40 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r6BAONBO022198 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 11 Jul 2013 06:24:24 -0400 Received: from dhcp-26-207.brq.redhat.com (dhcp-26-122.brq.redhat.com [10.34.26.122]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r6BAOJDr028092 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Thu, 11 Jul 2013 06:24:22 -0400 Date: Thu, 11 Jul 2013 12:26:30 +0200 From: Alexander Gordeev To: "Nicholas A. Bellinger" Cc: Tejun Heo , linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org, Jeff Garzik , "Nicholas A. Bellinger" , Jens Axboe Subject: Re: [PATCH RESEND 0/1] AHCI: Optimize interrupt processing Message-ID: <20130711102630.GA11133@dhcp-26-207.brq.redhat.com> References: <20130521235003.GE6985@mtj.dyndns.org> <20130522143923.GD19383@dhcp-26-207.brq.redhat.com> <20130522170305.GD9563@kernel.dk> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20130522170305.GD9563@kernel.dk> User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org On Wed, May 22, 2013 at 07:03:05PM +0200, Jens Axboe wrote: > On Wed, May 22 2013, Alexander Gordeev wrote: > > On Wed, May 22, 2013 at 08:50:03AM +0900, Tejun Heo wrote: > > > Hmmmmmm..... I'd normally apply this patch but block layer is just > > > growing multi-queue support and libata is likely to be converted to mq > > > in foreseeable future, so I'm a bit hesitant to make irq handling more > > > sophiscated right now. Would you be interested in looking into > > > converting libata to blk mq support? I'm pretty sure it'd yield far > > > better outcome if done properly. > > > > I am not committing, but will look into it, sure. > > Would be most awesome, I'm sure Nic would not mind a bit of help on the > SCSI/libata side :-) Hi Nicholas, Could you please clarify the status of SCSI MQ support? Is it usable now? I tried git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git, but it does not appear working without (at least) changes below to SCSI lib: Thanks! > And personally, can't wait to run it on the laptop! That's right, I > alpha test on the laptop. > > -- > Jens Axboe > diff --git a/drivers/scsi/scsi-mq.c b/drivers/scsi/scsi-mq.c index ca6ff67..d8cc7a4 100644 --- a/drivers/scsi/scsi-mq.c +++ b/drivers/scsi/scsi-mq.c @@ -155,6 +155,7 @@ void scsi_mq_done(struct scsi_cmnd *sc) static struct blk_mq_ops scsi_mq_ops = { .queue_rq = scsi_mq_queue_rq, .map_queue = blk_mq_map_queue, + .timeout = scsi_times_out, .alloc_hctx = blk_mq_alloc_single_hw_queue, .free_hctx = blk_mq_free_single_hw_queue, }; diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 65360db..33aa373 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -283,7 +283,10 @@ int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, /* * head injection *required* here otherwise quiesce won't work */ - blk_execute_rq(req->q, NULL, req, 1); + if (q->mq_ops) + blk_mq_execute_rq(req->q, req); + else + blk_execute_rq(req->q, NULL, req, 1); /* * Some devices (USB mass-storage in particular) may transfer @@ -298,12 +301,8 @@ int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, *resid = req->resid_len; ret = req->errors; out: - if (q->mq_ops) { - printk("scsi_execute(): Calling blk_mq_free_request >>>\n"); - blk_mq_free_request(req); - } else { + if (!q->mq_ops) blk_put_request(req); - } return ret; }