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=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_MUTT autolearn=ham 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 BE37CC10F11 for ; Thu, 25 Apr 2019 00:55:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 905FE2175B for ; Thu, 25 Apr 2019 00:55:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728392AbfDYAz5 (ORCPT ); Wed, 24 Apr 2019 20:55:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44924 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726455AbfDYAz5 (ORCPT ); Wed, 24 Apr 2019 20:55:57 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E169685362; Thu, 25 Apr 2019 00:55:56 +0000 (UTC) Received: from ming.t460p (ovpn-8-18.pek2.redhat.com [10.72.8.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 30F055D706; Thu, 25 Apr 2019 00:55:47 +0000 (UTC) Date: Thu, 25 Apr 2019 08:55:43 +0800 From: Ming Lei To: Christoph Hellwig Cc: Jens Axboe , linux-block@vger.kernel.org, Hannes Reinecke , Keith Busch , linux-nvme@lists.infradead.org, Sagi Grimberg , James Smart , Dongli Zhang , Bart Van Assche , linux-scsi@vger.kernel.org, "Martin K . Petersen" , "James E . J . Bottomley" Subject: Re: [PATCH V7 4/9] blk-mq: move all hctx alloction & initialization into __blk_mq_alloc_and_init_hctx Message-ID: <20190425005542.GC22636@ming.t460p> References: <20190424110221.17435-1-ming.lei@redhat.com> <20190424110221.17435-5-ming.lei@redhat.com> <20190424162223.GD23854@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190424162223.GD23854@lst.de> User-Agent: Mutt/1.9.1 (2017-09-22) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 25 Apr 2019 00:55:57 +0000 (UTC) Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org On Wed, Apr 24, 2019 at 06:22:23PM +0200, Christoph Hellwig wrote: > On Wed, Apr 24, 2019 at 07:02:16PM +0800, Ming Lei wrote: > > Move all hctx related allocation and initialization into > > __blk_mq_alloc_and_init_hctx, and prepare for splitting blk_mq_alloc_and_init_hctx > > into real two functions, one is for allocate everything, and another is for > > initializing everyting. > > > > Cc: Dongli Zhang > > Cc: James Smart > > Cc: Bart Van Assche > > Cc: linux-scsi@vger.kernel.org, > > Cc: Martin K . Petersen , > > Cc: Christoph Hellwig , > > Cc: James E . J . Bottomley , > > Reviewed-by: Hannes Reinecke > > Tested-by: James Smart > > Signed-off-by: Ming Lei > > --- > > block/blk-mq.c | 93 +++++++++++++++++++++++++++------------------------------- > > 1 file changed, 44 insertions(+), 49 deletions(-) > > > > diff --git a/block/blk-mq.c b/block/blk-mq.c > > index 862eb41f24f8..fea25363488d 100644 > > --- a/block/blk-mq.c > > +++ b/block/blk-mq.c > > @@ -2290,15 +2290,45 @@ static void blk_mq_exit_hw_queues(struct request_queue *q, > > } > > } > > > > -static int blk_mq_init_hctx(struct request_queue *q, > > - struct blk_mq_tag_set *set, > > - struct blk_mq_hw_ctx *hctx, unsigned hctx_idx) > > +static int blk_mq_hw_ctx_size(struct blk_mq_tag_set *tag_set) > > { > > - int node; > > + int hw_ctx_size = sizeof(struct blk_mq_hw_ctx); > > + > > + BUILD_BUG_ON(ALIGN(offsetof(struct blk_mq_hw_ctx, srcu), > > + __alignof__(struct blk_mq_hw_ctx)) != > > + sizeof(struct blk_mq_hw_ctx)); > > + > > + if (tag_set->flags & BLK_MQ_F_BLOCKING) > > + hw_ctx_size += sizeof(struct srcu_struct); > > + > > + return hw_ctx_size; > > +} > > + > > +static struct blk_mq_hw_ctx * > > +__blk_mq_alloc_and_init_hctx(struct request_queue *q, > > + struct blk_mq_tag_set *set, > > + unsigned hctx_idx, int node) > > +{ > > + struct blk_mq_hw_ctx *hctx; > > + > > + hctx = kzalloc_node(blk_mq_hw_ctx_size(set), > > + GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY, > > + node); > > + if (!hctx) > > + goto fail_alloc_hctx; > > + > > + if (!zalloc_cpumask_var_node(&hctx->cpumask, > > + GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY, > > Maybe throw in a > > const gfp_t gfp = GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY; > > as the first line to shorten these two a bit.. > > > static struct blk_mq_hw_ctx *blk_mq_alloc_and_init_hctx( > > struct blk_mq_tag_set *set, struct request_queue *q, > > int hctx_idx, int node) > > { > > + return __blk_mq_alloc_and_init_hctx(q, set, hctx_idx, node); > > } > > I really don't the point of this wrapper. If we need it later > we should introduce it there. It prepares for the following patch, otherwise the whole patch may become difficult to review. thanks, Ming