From patchwork Fri May 12 10:31:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 9723889 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5105360382 for ; Fri, 12 May 2017 10:31:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4487E287FB for ; Fri, 12 May 2017 10:31:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 392E528808; Fri, 12 May 2017 10:31:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BCD01287FB for ; Fri, 12 May 2017 10:31:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752954AbdELKbd (ORCPT ); Fri, 12 May 2017 06:31:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54192 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751985AbdELKbc (ORCPT ); Fri, 12 May 2017 06:31:32 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5251F7F4C0; Fri, 12 May 2017 10:31:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 5251F7F4C0 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=ming.lei@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 5251F7F4C0 Received: from localhost (vpn1-5-87.pek2.redhat.com [10.72.5.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6EFB818BB7; Fri, 12 May 2017 10:31:24 +0000 (UTC) From: Ming Lei To: Jens Axboe , linux-block@vger.kernel.org Cc: Bart Van Assche , Omar Sandoval , Ming Lei Subject: [PATCH v4 2/4] blk-mq: introduce blk_mq_get_queue_depth() Date: Fri, 12 May 2017 18:31:01 +0800 Message-Id: <20170512103103.24485-3-ming.lei@redhat.com> In-Reply-To: <20170512103103.24485-1-ming.lei@redhat.com> References: <20170512103103.24485-1-ming.lei@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 12 May 2017 10:31:32 +0000 (UTC) Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The hardware queue depth can be resized via blk_mq_update_nr_requests(), so introduce this helper for retrieving queue's depth easily. Reviewed-by: Omar Sandoval Signed-off-by: Ming Lei --- block/blk-mq.c | 15 +++++++++++++++ block/blk-mq.h | 1 + 2 files changed, 16 insertions(+) diff --git a/block/blk-mq.c b/block/blk-mq.c index fb2607bc3f05..389d53a6c1d6 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -2139,6 +2139,21 @@ static void blk_mq_map_swqueue(struct request_queue *q, } } +/* + * Queue depth can be changed via blk_mq_update_nr_requests(), + * so use this helper to retrieve queue's depth. + */ +int blk_mq_get_queue_depth(struct request_queue *q) +{ + /* + * All queues have same queue depth, need to revisit + * if per hw-queue depth is supported. + */ + struct blk_mq_tags *tags = q->tag_set->tags[0]; + + return tags->bitmap_tags.sb.depth + tags->breserved_tags.sb.depth; +} + static void queue_set_hctx_shared(struct request_queue *q, bool shared) { struct blk_mq_hw_ctx *hctx; diff --git a/block/blk-mq.h b/block/blk-mq.h index cc67b48e3551..d49d46de2923 100644 --- a/block/blk-mq.h +++ b/block/blk-mq.h @@ -138,6 +138,7 @@ void __blk_mq_finish_request(struct blk_mq_hw_ctx *hctx, struct blk_mq_ctx *ctx, void blk_mq_finish_request(struct request *rq); struct request *__blk_mq_alloc_request(struct blk_mq_alloc_data *data, unsigned int op); +int blk_mq_get_queue_depth(struct request_queue *q); static inline bool blk_mq_hctx_stopped(struct blk_mq_hw_ctx *hctx) {