From patchwork Sun Oct 9 21:30:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Gordeev X-Patchwork-Id: 9368663 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 007FC6048F for ; Sun, 9 Oct 2016 21:30:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D2C9028B49 for ; Sun, 9 Oct 2016 21:30:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF33428B55; Sun, 9 Oct 2016 21:30:24 +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 4CD5228B49 for ; Sun, 9 Oct 2016 21:30:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751294AbcJIVaX (ORCPT ); Sun, 9 Oct 2016 17:30:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53984 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751027AbcJIVaW (ORCPT ); Sun, 9 Oct 2016 17:30:22 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A1ACE4E4C0; Sun, 9 Oct 2016 21:30:21 +0000 (UTC) Received: from dhcp-27-118.brq.redhat.com (dhcp-27-122.brq.redhat.com [10.34.27.122]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u99LUIjD000999 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sun, 9 Oct 2016 17:30:20 -0400 Date: Sun, 9 Oct 2016 23:30:18 +0200 From: Alexander Gordeev To: Sagi Grimberg Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org Subject: [PATCH v3 6/8] blk-mq: Rework blk_mq_realloc_hw_ctxs() Message-ID: <20161009213017.GA21398@dhcp-27-118.brq.redhat.com> References: <7459c980dd965b5f7b91e3bf1c3114d658535229.1475241231.git.agordeev@redhat.com> <259f9d8c-e552-7565-5e05-88a1c8430317@grimberg.me> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <259f9d8c-e552-7565-5e05-88a1c8430317@grimberg.me> User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Sun, 09 Oct 2016 21:30:21 +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 Rework blk_mq_realloc_hw_ctxs() so deallocation is done in order reverse to allocation and indentation is bit more easy to read. CC: linux-block@vger.kernel.org Signed-off-by: Alexander Gordeev --- block/blk-mq.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 15c03c2..d2c11fc 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1895,6 +1895,7 @@ static void blk_mq_realloc_hw_ctxs(struct blk_mq_tag_set *set, struct request_queue *q) { int i, j; + struct blk_mq_hw_ctx *hctx; struct blk_mq_hw_ctx **hctxs = q->queue_hw_ctx; blk_mq_sysfs_unregister(q); @@ -1908,33 +1909,36 @@ static void blk_mq_realloc_hw_ctxs(struct blk_mq_tag_set *set, if (node == NUMA_NO_NODE) node = set->numa_node; - hctxs[i] = kzalloc_node(sizeof(struct blk_mq_hw_ctx), - GFP_KERNEL, node); - if (!hctxs[i]) + hctx = kzalloc_node(sizeof(*hctx), GFP_KERNEL, node); + if (!hctx) break; - if (blk_mq_init_hctx(q, set, hctxs[i], i, node)) { - kfree(hctxs[i]); - hctxs[i] = NULL; + if (blk_mq_init_hctx(q, set, hctx, i, node)) { + kfree(hctx); break; } - blk_mq_hctx_kobj_init(hctxs[i]); + + blk_mq_hctx_kobj_init(hctx); + hctxs[i] = hctx; } for (j = i; j < q->nr_hw_queues; j++) { - struct blk_mq_hw_ctx *hctx = hctxs[j]; + hctx = hctxs[j]; - if (hctx) { - if (hctx->tags) { - blk_mq_free_rq_map(set, hctx->tags, j); - set->tags[j] = NULL; - } - blk_mq_exit_hctx(q, set, hctx, j); - kobject_put(&hctx->kobj); - kfree(hctx->ctxs); - kfree(hctx); - hctxs[j] = NULL; + if (!hctx) + continue; + hctxs[j] = NULL; + kobject_put(&hctx->kobj); + + if (hctx->tags) { + blk_mq_free_rq_map(set, hctx->tags, j); + set->tags[j] = NULL; } + + blk_mq_exit_hctx(q, set, hctx, j); + + kfree(hctx->ctxs); + kfree(hctx); } q->nr_hw_queues = i; blk_mq_sysfs_register(q);