From patchwork Sun Sep 18 07:37:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Gordeev X-Patchwork-Id: 9337641 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 1D8326022E for ; Sun, 18 Sep 2016 07:39:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 13AF72906A for ; Sun, 18 Sep 2016 07:39:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 088002907B; Sun, 18 Sep 2016 07:39:00 +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 985132906A for ; Sun, 18 Sep 2016 07:38:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934899AbcIRHi6 (ORCPT ); Sun, 18 Sep 2016 03:38:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37582 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932343AbcIRHhq (ORCPT ); Sun, 18 Sep 2016 03:37:46 -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 1755A7D0FB; Sun, 18 Sep 2016 07:37:46 +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 u8I7bTpa025554; Sun, 18 Sep 2016 03:37:45 -0400 From: Alexander Gordeev To: linux-kernel@vger.kernel.org Cc: Alexander Gordeev , linux-block@vger.kernel.org Subject: [PATCH 12/14] blk-mq: Rework blk_mq_init_hctx() function Date: Sun, 18 Sep 2016 09:37:22 +0200 Message-Id: <46cd9de883dde4c85fd31f5ca4b1fbafb64f5728.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.27]); Sun, 18 Sep 2016 07:37:46 +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_init_hctx() function so all memory allocations are done before data initialization and callbacks invocation. As result, the latter is avoided in tight memory conditions. CC: linux-block@vger.kernel.org Signed-off-by: Alexander Gordeev --- block/blk-mq.c | 50 ++++++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index af6d049..5ecbb5f 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1714,6 +1714,22 @@ static struct blk_mq_hw_ctx *blk_mq_init_hctx(struct request_queue *q, if (!zalloc_cpumask_var_node(&hctx->cpumask, GFP_KERNEL, node)) goto free_hctx; + /* + * Allocate space for all possible cpus to avoid allocation at + * runtime + */ + hctx->ctxs = kmalloc_node(nr_cpu_ids * sizeof(void *), + GFP_KERNEL, node); + if (!hctx->ctxs) + goto free_cpumask; + + if (blk_mq_alloc_bitmap(&hctx->ctx_map, node)) + goto free_ctxs; + + hctx->fq = blk_alloc_flush_queue(q, hctx->numa_node, set->cmd_size); + if (!hctx->fq) + goto free_bitmap; + 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); @@ -1722,55 +1738,37 @@ static struct blk_mq_hw_ctx *blk_mq_init_hctx(struct request_queue *q, hctx->numa_node = node; hctx->queue = q; hctx->queue_num = hctx_idx; + hctx->nr_ctx = 0; hctx->flags = set->flags & ~BLK_MQ_F_TAG_SHARED; + hctx->tags = set->tags[hctx_idx]; blk_mq_init_cpu_notifier(&hctx->cpu_notifier, blk_mq_hctx_notify, hctx); blk_mq_register_cpu_notifier(&hctx->cpu_notifier); - hctx->tags = set->tags[hctx_idx]; - - /* - * Allocate space for all possible cpus to avoid allocation at - * runtime - */ - hctx->ctxs = kmalloc_node(nr_cpu_ids * sizeof(void *), - GFP_KERNEL, node); - if (!hctx->ctxs) - goto unregister_cpu_notifier; - - if (blk_mq_alloc_bitmap(&hctx->ctx_map, node)) - goto free_ctxs; - - hctx->nr_ctx = 0; - if (set->ops->init_hctx && set->ops->init_hctx(hctx, set->driver_data, hctx_idx)) - goto free_bitmap; - - hctx->fq = blk_alloc_flush_queue(q, hctx->numa_node, set->cmd_size); - if (!hctx->fq) - goto exit_hctx; + goto unregister_cpu_notifier; if (set->ops->init_request && set->ops->init_request(set->driver_data, hctx->fq->flush_rq, hctx_idx, flush_start_tag + hctx_idx, node)) - goto free_fq; + goto exit_hctx; return hctx; - free_fq: - kfree(hctx->fq); exit_hctx: if (set->ops->exit_hctx) set->ops->exit_hctx(hctx, hctx_idx); + unregister_cpu_notifier: + blk_mq_unregister_cpu_notifier(&hctx->cpu_notifier); + kfree(hctx->fq); free_bitmap: blk_mq_free_bitmap(&hctx->ctx_map); free_ctxs: kfree(hctx->ctxs); - unregister_cpu_notifier: - blk_mq_unregister_cpu_notifier(&hctx->cpu_notifier); + free_cpumask: free_cpumask_var(hctx->cpumask); free_hctx: kfree(hctx);