From patchwork Mon Feb 27 15:36:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sagi Grimberg X-Patchwork-Id: 9593509 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 9282760471 for ; Mon, 27 Feb 2017 15:36:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8379F281DB for ; Mon, 27 Feb 2017 15:36:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 782FE2849A; Mon, 27 Feb 2017 15:36:36 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 72A92281DB for ; Mon, 27 Feb 2017 15:36:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751757AbdB0Pg1 (ORCPT ); Mon, 27 Feb 2017 10:36:27 -0500 Received: from merlin.infradead.org ([205.233.59.134]:47786 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751676AbdB0Pg0 (ORCPT ); Mon, 27 Feb 2017 10:36:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Message-Id:Date:Subject:To:From:Sender: Reply-To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=dhcgVLzVCVjwFLS3VwhBsswz0d11i6hYQ0EzvwoJ6Hg=; b=NKpfXQ1lZoviDQ1yZKA/qHJPTs IjFuDWNeL0hXmMYPheTi9UsXaxWIlrrTBAQxPLfj6plgdZtmz6jIwSAG2ouZpH6XrY8L3vcuzYQJ3 JGGZqFBrKkJM1W3zu/YjMq8b52W86X4h/4v5uVrVRWBHEkNFS1dMGUA1gCP3nULtWE0CaSL6CXMiJ O4UsgkO5tllsALlMGdp6bGX8/naKu6/9PJ5A6q6eqdHcDjdpF+4gtFxMUjrfrhNiVLP3cWEPOE7FO C4KSZHfhXizxJH84MXFTssaeo+SeCE1tCajW45BfrTjXghLTBMx1iqtNjkB8z317Rjj36hQkqVbUR cv+2/Ndw==; Received: from bzq-82-81-101-184.red.bezeqint.net ([82.81.101.184] helo=bombadil.infradead.org) by merlin.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1ciNLb-0005lT-TY; Mon, 27 Feb 2017 15:36:24 +0000 From: Sagi Grimberg To: Jens Axboe , linux-block@vger.kernel.org, linux-nvme@lists.infradead.org Subject: [PATCH 1/2] blk-mq-sched: Allocate sched reserved tags as specified in the original queue tagset Date: Mon, 27 Feb 2017 17:36:20 +0200 Message-Id: <1488209781-1084-1-git-send-email-sagi@grimberg.me> X-Mailer: git-send-email 2.7.4 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 Signed-off-by: Sagi Grimberg --- block/blk-mq-sched.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c index 98c7b061781e..46ca965fff5c 100644 --- a/block/blk-mq-sched.c +++ b/block/blk-mq-sched.c @@ -454,7 +454,8 @@ int blk_mq_sched_setup(struct request_queue *q) */ ret = 0; queue_for_each_hw_ctx(q, hctx, i) { - hctx->sched_tags = blk_mq_alloc_rq_map(set, i, q->nr_requests, 0); + hctx->sched_tags = blk_mq_alloc_rq_map(set, i, + q->nr_requests, set->reserved_tags); if (!hctx->sched_tags) { ret = -ENOMEM; break;