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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E920C433F5 for ; Sun, 26 Sep 2021 02:05:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5E97561090 for ; Sun, 26 Sep 2021 02:05:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230234AbhIZCHL (ORCPT ); Sat, 25 Sep 2021 22:07:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:42346 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230211AbhIZCHL (ORCPT ); Sat, 25 Sep 2021 22:07:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632621935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=iD8iAO6SxcuOVGj9+NOAiSVsBKAdqRovyOZoGGLTDWg=; b=UkwYwpJqRMLR213fOzBlb1B31XABt+BDg15A5mnrX6JYqyLEb5vfQBwSw8JpL4g106qnq8 EFXuhNUb5qsKL5H6WXaFwZT42KXzlO3jrQyCn4j9jpb7T4Zvbty1+XzIHmaqJSdo6YzV66 EgC9LaNxrpDLvjhDeydEwE7rkn1WDi0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-416-NsUiWob3O06nOLCN33BcoA-1; Sat, 25 Sep 2021 22:05:33 -0400 X-MC-Unique: NsUiWob3O06nOLCN33BcoA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 293FF362FA; Sun, 26 Sep 2021 02:05:32 +0000 (UTC) Received: from T590 (ovpn-8-17.pek2.redhat.com [10.72.8.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8C0B21A7E9; Sun, 26 Sep 2021 02:05:16 +0000 (UTC) Date: Sun, 26 Sep 2021 10:05:31 +0800 From: Ming Lei To: John Garry Cc: axboe@kernel.dk, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org, hare@suse.de Subject: Re: [PATCH v4 11/13] blk-mq: Refactor and rename blk_mq_free_map_and_{requests->rqs}() Message-ID: References: <1632472110-244938-1-git-send-email-john.garry@huawei.com> <1632472110-244938-12-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1632472110-244938-12-git-send-email-john.garry@huawei.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org On Fri, Sep 24, 2021 at 04:28:28PM +0800, John Garry wrote: > Refactor blk_mq_free_map_and_requests() such that it can be used at many > sites at which the tag map and rqs are freed. > > Also rename to blk_mq_free_map_and_rqs(), which is shorter and matches the > alloc equivalent. > > Suggested-by: Ming Lei > Signed-off-by: John Garry > Reviewed-by: Hannes Reinecke > --- > block/blk-mq-tag.c | 3 +-- > block/blk-mq.c | 40 ++++++++++++++++++++++++---------------- > block/blk-mq.h | 4 +++- > 3 files changed, 28 insertions(+), 19 deletions(-) > > diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c > index db99f1246795..a0ecc6d88f84 100644 > --- a/block/blk-mq-tag.c > +++ b/block/blk-mq-tag.c > @@ -607,8 +607,7 @@ int blk_mq_tag_update_depth(struct blk_mq_hw_ctx *hctx, > if (!new) > return -ENOMEM; > > - blk_mq_free_rqs(set, *tagsptr, hctx->queue_num); > - blk_mq_free_rq_map(*tagsptr, set->flags); > + blk_mq_free_map_and_rqs(set, *tagsptr, hctx->queue_num); > *tagsptr = new; > } else { > /* > diff --git a/block/blk-mq.c b/block/blk-mq.c > index 46772773b9c4..464ea20b9bcb 100644 > --- a/block/blk-mq.c > +++ b/block/blk-mq.c > @@ -2878,15 +2878,15 @@ static bool __blk_mq_alloc_map_and_rqs(struct blk_mq_tag_set *set, > return set->tags[hctx_idx]; > } > > -static void blk_mq_free_map_and_requests(struct blk_mq_tag_set *set, > - unsigned int hctx_idx) > +void blk_mq_free_map_and_rqs(struct blk_mq_tag_set *set, > + struct blk_mq_tags *tags, > + unsigned int hctx_idx) > { > unsigned int flags = set->flags; > > - if (set->tags && set->tags[hctx_idx]) { > - blk_mq_free_rqs(set, set->tags[hctx_idx], hctx_idx); > - blk_mq_free_rq_map(set->tags[hctx_idx], flags); > - set->tags[hctx_idx] = NULL; > + if (tags) { > + blk_mq_free_rqs(set, tags, hctx_idx); > + blk_mq_free_rq_map(tags, flags); > } > } > > @@ -2967,8 +2967,10 @@ static void blk_mq_map_swqueue(struct request_queue *q) > * fallback in case of a new remap fails > * allocation > */ > - if (i && set->tags[i]) > - blk_mq_free_map_and_requests(set, i); > + if (i && set->tags[i]) { > + blk_mq_free_map_and_rqs(set, set->tags[i], i); > + set->tags[i] = NULL; > + } > > hctx->tags = NULL; > continue; > @@ -3264,8 +3266,8 @@ static void blk_mq_realloc_hw_ctxs(struct blk_mq_tag_set *set, > struct blk_mq_hw_ctx *hctx = hctxs[j]; > > if (hctx) { > - if (hctx->tags) > - blk_mq_free_map_and_requests(set, j); > + blk_mq_free_map_and_rqs(set, set->tags[j], j); > + set->tags[j] = NULL; > blk_mq_exit_hctx(q, set, hctx, j); > hctxs[j] = NULL; > } > @@ -3361,8 +3363,10 @@ static int __blk_mq_alloc_rq_maps(struct blk_mq_tag_set *set) > return 0; > > out_unwind: > - while (--i >= 0) > - blk_mq_free_map_and_requests(set, i); > + while (--i >= 0) { > + blk_mq_free_map_and_rqs(set, set->tags[i], i); > + set->tags[i] = NULL; > + } > > return -ENOMEM; > } > @@ -3557,8 +3561,10 @@ int blk_mq_alloc_tag_set(struct blk_mq_tag_set *set) > return 0; > > out_free_mq_rq_maps: > - for (i = 0; i < set->nr_hw_queues; i++) > - blk_mq_free_map_and_requests(set, i); > + for (i = 0; i < set->nr_hw_queues; i++) { > + blk_mq_free_map_and_rqs(set, set->tags[i], i); > + set->tags[i] = NULL; > + } > out_free_mq_map: > for (i = 0; i < set->nr_maps; i++) { > kfree(set->map[i].mq_map); > @@ -3590,8 +3596,10 @@ void blk_mq_free_tag_set(struct blk_mq_tag_set *set) > { > int i, j; > > - for (i = 0; i < set->nr_hw_queues; i++) > - blk_mq_free_map_and_requests(set, i); > + for (i = 0; i < set->nr_hw_queues; i++) { > + blk_mq_free_map_and_rqs(set, set->tags[i], i); > + set->tags[i] = NULL; > + } There are 5 callers in which 'set->tags[i]' is cleared, so just wondering why you don't clear set->tags[i] at default in blk_mq_free_map_and_rqs(). And just call __blk_mq_free_map_and_rqs() for the only other user? Thanks, Ming