From patchwork Sun Sep 18 07:37:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Gordeev X-Patchwork-Id: 9337637 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 4798F6022E for ; Sun, 18 Sep 2016 07:38:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3DE7D2906A for ; Sun, 18 Sep 2016 07:38:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 32C5E2907B; Sun, 18 Sep 2016 07:38:56 +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=unavailable 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 CAC8F2906A for ; Sun, 18 Sep 2016 07:38:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932385AbcIRHhq (ORCPT ); Sun, 18 Sep 2016 03:37:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51936 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932323AbcIRHhp (ORCPT ); Sun, 18 Sep 2016 03:37:45 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (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 EF56561E52; Sun, 18 Sep 2016 07:37:44 +0000 (UTC) Received: from dhcp-27-118.brq.redhat.com (dhcp-27-122.brq.redhat.com [10.34.27.122]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u8I7bTpZ025554; Sun, 18 Sep 2016 03:37:44 -0400 From: Alexander Gordeev To: linux-kernel@vger.kernel.org Cc: Alexander Gordeev , linux-block@vger.kernel.org Subject: [PATCH 11/14] blk-mq: Move hardware context init code into single location Date: Sun, 18 Sep 2016 09:37:21 +0200 Message-Id: <7aff70063ae3fd118e54d9da3d790a3079853c16.1474183901.git.agordeev@redhat.com> In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Sun, 18 Sep 2016 07:37:44 +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 Move scattered hardware context initialization code into a single function destined to do that, blk_mq_init_hctx() CC: linux-block@vger.kernel.org Signed-off-by: Alexander Gordeev --- block/blk-mq.c | 81 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 40 insertions(+), 41 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index c589096..af6d049 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1696,17 +1696,30 @@ static void blk_mq_exit_hw_queues(struct request_queue *q, q->nr_hw_queues = 0; } -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 struct blk_mq_hw_ctx *blk_mq_init_hctx(struct request_queue *q, + struct blk_mq_tag_set *set, unsigned hctx_idx) { - int node = hctx->numa_node; unsigned flush_start_tag = set->queue_depth; + struct blk_mq_hw_ctx *hctx; + int node; + + node = blk_mq_hw_queue_to_node(q->mq_map, hctx_idx); + if (node == NUMA_NO_NODE) + node = set->numa_node; + + hctx = kzalloc_node(sizeof(*hctx), GFP_KERNEL, node); + if (!hctx) + return NULL; + + if (!zalloc_cpumask_var_node(&hctx->cpumask, GFP_KERNEL, node)) + goto free_hctx; INIT_WORK(&hctx->run_work, blk_mq_run_work_fn); INIT_DELAYED_WORK(&hctx->delay_work, blk_mq_delay_work_fn); spin_lock_init(&hctx->lock); INIT_LIST_HEAD(&hctx->dispatch); + atomic_set(&hctx->nr_active, 0); + hctx->numa_node = node; hctx->queue = q; hctx->queue_num = hctx_idx; hctx->flags = set->flags & ~BLK_MQ_F_TAG_SHARED; @@ -1745,7 +1758,7 @@ static int blk_mq_init_hctx(struct request_queue *q, flush_start_tag + hctx_idx, node)) goto free_fq; - return 0; + return hctx; free_fq: kfree(hctx->fq); @@ -1758,8 +1771,11 @@ static int blk_mq_init_hctx(struct request_queue *q, kfree(hctx->ctxs); unregister_cpu_notifier: blk_mq_unregister_cpu_notifier(&hctx->cpu_notifier); - - return -1; + free_cpumask_var(hctx->cpumask); + free_hctx: + kfree(hctx); + + return NULL; } static void blk_mq_init_cpu_queues(struct request_queue *q, @@ -1971,57 +1987,40 @@ 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); for (i = 0; i < set->nr_hw_queues; i++) { - int node; - if (hctxs[i]) continue; if (!set->tags[i]) break; - node = blk_mq_hw_queue_to_node(q->mq_map, i); - 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]) - break; - - if (!zalloc_cpumask_var_node(&hctxs[i]->cpumask, GFP_KERNEL, - node)) { - kfree(hctxs[i]); - hctxs[i] = NULL; + hctx = blk_mq_init_hctx(q, set, i); + if (!hctx) break; - } - atomic_set(&hctxs[i]->nr_active, 0); - hctxs[i]->numa_node = node; + blk_mq_hctx_kobj_init(hctx); - if (blk_mq_init_hctx(q, set, hctxs[i], i)) { - free_cpumask_var(hctxs[i]->cpumask); - kfree(hctxs[i]); - hctxs[i] = NULL; - break; - } - blk_mq_hctx_kobj_init(hctxs[i]); + 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) { - kobject_put(&hctx->kobj); + if (!hctx) + continue; - if (hctx->tags) { - blk_mq_free_rq_map(set, hctx->tags, j); - set->tags[j] = NULL; - } - blk_mq_exit_hctx(q, set, hctx, j); - 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); + + hctxs[j] = NULL; } q->nr_hw_queues = i; blk_mq_sysfs_register(q);