From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C614FC433E2 for ; Fri, 11 Sep 2020 09:53:10 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 722E82075A for ; Fri, 11 Sep 2020 09:53:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="MdAozW50" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 722E82075A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=qipb8cCLMagqvaHJIx0Ur/NR2nguXr+5GgvV+RezIHk=; b=MdAozW50HQwTPy4Mfg7V0tUYw TSCzE5nuIPzYqQQ5brJt6A9idrnkYMwhdOu87MUQStolD56YVmiFsN3ETruay+TrTAC6a0Zs7+LLz a4hmGMY9PQpozJaMzPAMqvQSW7hlojSsAHM9eUPY4i9d+mbcPZZDwS4N0kn5tIpnzuLuZ+Nxy4Jnk WLDF9QLsdT/ADpwvKTH4LFyFiMLwJZggR17bIUxE8PKS8qn2r1RhSjWjmpMUNTcOfsqAAQJYhSv3X 6/hvs00eYK2rgfKzDR9/qA3yKfkknG+idmktq+r8jqaNdE1t/qOLfyEDUuusvDmL4O5hJ8tndVTiA hBhr5O2TQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGfjv-0007Xz-At; Fri, 11 Sep 2020 09:53:07 +0000 Received: from verein.lst.de ([213.95.11.211]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGfjs-0007Vm-7D for linux-nvme@lists.infradead.org; Fri, 11 Sep 2020 09:53:05 +0000 Received: by verein.lst.de (Postfix, from userid 2407) id 4C59B68B02; Fri, 11 Sep 2020 11:52:58 +0200 (CEST) Date: Fri, 11 Sep 2020 11:52:58 +0200 From: Christoph Hellwig To: Ming Lei Subject: Re: [PATCH] blk-mq: always allow reserved allocation in hctx_may_queue Message-ID: <20200911095258.GA914@lst.de> References: <20200911094453.160109-1-ming.lei@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200911094453.160109-1-ming.lei@redhat.com> User-Agent: Mutt/1.5.17 (2007-11-01) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200911_055304_362852_13264629 X-CRM114-Status: GOOD ( 11.87 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jens Axboe , "Ewan D . Milne" , linux-block@vger.kernel.org, David Milburn , linux-nvme@lists.infradead.org, Christoph Hellwig Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org On Fri, Sep 11, 2020 at 05:44:53PM +0800, Ming Lei wrote: > unsigned int tag_offset = rq->mq_hctx->tags->nr_reserved_tags; > int tag; > + bool reserved = blk_mq_tag_is_reserved(rq->mq_hctx->sched_tags, > + rq->internal_tag); > > blk_mq_tag_busy(rq->mq_hctx); > > - if (blk_mq_tag_is_reserved(rq->mq_hctx->sched_tags, rq->internal_tag)) { > + if (reserved) { > bt = rq->mq_hctx->tags->breserved_tags; > tag_offset = 0; > } > > - if (!hctx_may_queue(rq->mq_hctx, bt)) > + if (!reserved && !hctx_may_queue(rq->mq_hctx, bt)) What about: if (blk_mq_tag_is_reserved(rq->mq_hctx->sched_tags, rq->internal_tag)) { bt = rq->mq_hctx->tags->breserved_tags; tag_offset = 0; } else { if (!hctx_may_queue(rq->mq_hctx, bt)) return false; } which seems a little easier to follow? Otherwise looks good: Reviewed-by: Christoph Hellwig _______________________________________________ Linux-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme