From patchwork Mon Apr 3 21:42:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 9660641 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 283F36016C for ; Mon, 3 Apr 2017 21:43:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 19C9928395 for ; Mon, 3 Apr 2017 21:43:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0EC4D28469; Mon, 3 Apr 2017 21:43:09 +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.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 AC52C28395 for ; Mon, 3 Apr 2017 21:43:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751817AbdDCVnI (ORCPT ); Mon, 3 Apr 2017 17:43:08 -0400 Received: from mail-pg0-f47.google.com ([74.125.83.47]:32800 "EHLO mail-pg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751649AbdDCVnH (ORCPT ); Mon, 3 Apr 2017 17:43:07 -0400 Received: by mail-pg0-f47.google.com with SMTP id x125so132434444pgb.0 for ; Mon, 03 Apr 2017 14:43:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=swIePSxyTG00gZFnoBUgQ9MpabG2RNgAR+Iah3odnRk=; b=UfXycyiD4F0nP6p9d2Mn9crPHD5kNXuClWUd5kkcRYwjhZVhfvtnTdCL6V2Udl8Wuw /AUXmpj81dNBlzlWga4rV7aF8ScAfxswOOm7ZtZsbCcaD9JM0G+BsOg06L2MQjvz/iUn 6bUtix3bp/U9MmgxdfIl3QlP6Dn/Y/hzdN5UxQWtTtevR77+uWz/vlqpZ5o+TrKXoP37 0fT+51o6iKhcyDPj+DZEUZ8s+6MNRJ0CJTJLoEaaLt6SyNKjCDD0RdoX+iehnaPDiQro IylxF2/NO7CkjNbStDlMfsITUcon2+lmh9oa7f7HZgUiMUvul9pm/Sz7Hj2LGaxpgPR9 Amhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=swIePSxyTG00gZFnoBUgQ9MpabG2RNgAR+Iah3odnRk=; b=uQLGe3iZMmH8VvnfoFuEeesxSgoy54OFzlaoywLQ7eCP9RlGXkDw5zbTd1GL4rfIJk h8rj4O0U5tcYIAExvxTmTpRDO4grQeb5a3cYZtSTfl+4RUSBOlpqZLgVL5EkMDhi8IF5 OlqbwEk7mOFyEG9yrKhGpPwU9LuZowImmy7at/FcJTIXQqoXOySIJ15NPfacwpV1sTA6 HX9/mNjuv/xa/IdLsTQEfcYPklTyru9ILSL2SPFyrdDW2Hk3rh7WUKKFMShQFo9isnib D/Jj1stqgi7Ac/cHfjNk4P88xjJ+ltpeeo+41V3y/acHEpNSoQplW87lH44VHbb9sitT Vf8Q== X-Gm-Message-State: AFeK/H3vbMkradJzL++RBklkL3KWyjNANq8MfssWOxIzxIii7a46XUrT+WVGDamqJTIdUc7v X-Received: by 10.84.137.165 with SMTP id 34mr23715759pln.125.1491255786590; Mon, 03 Apr 2017 14:43:06 -0700 (PDT) Received: from vader.thefacebook.com ([2620:10d:c090:200::8:3198]) by smtp.gmail.com with ESMTPSA id w186sm27682980pgb.35.2017.04.03.14.43.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Apr 2017 14:43:06 -0700 (PDT) From: Omar Sandoval To: Jens Axboe , linux-block@vger.kernel.org Cc: kernel-team@fb.com Subject: [PATCH 2/5] blk-mq-sched: set up scheduler tags when bringing up new queues Date: Mon, 3 Apr 2017 14:42:02 -0700 Message-Id: <1ed3d9bdcfc855a9546b05fa59bb23dc3f85f726.1491254827.git.osandov@fb.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: References: In-Reply-To: References: 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 From: Omar Sandoval If a new hardware queue is added at runtime, we don't allocate scheduler tags for it, leading to a crash. This hooks up the scheduler framework to blk_mq_{init,exit}_hctx() to make sure everything gets properly initialized/freed. Signed-off-by: Omar Sandoval --- block/blk-mq-sched.c | 22 ++++++++++++++++++++++ block/blk-mq-sched.h | 5 +++++ block/blk-mq.c | 9 ++++++++- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c index e08ba915343e..3fd918bb13a2 100644 --- a/block/blk-mq-sched.c +++ b/block/blk-mq-sched.c @@ -460,6 +460,28 @@ void blk_mq_sched_teardown(struct request_queue *q) blk_mq_sched_free_tags(set, hctx, i); } +int blk_mq_sched_init_hctx(struct request_queue *q, struct blk_mq_hw_ctx *hctx, + unsigned int hctx_idx) +{ + struct elevator_queue *e = q->elevator; + + if (!e) + return 0; + + return blk_mq_sched_alloc_tags(q, hctx, hctx_idx); +} + +void blk_mq_sched_exit_hctx(struct request_queue *q, struct blk_mq_hw_ctx *hctx, + unsigned int hctx_idx) +{ + struct elevator_queue *e = q->elevator; + + if (!e) + return; + + blk_mq_sched_free_tags(q->tag_set, hctx, hctx_idx); +} + int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e) { struct blk_mq_hw_ctx *hctx; diff --git a/block/blk-mq-sched.h b/block/blk-mq-sched.h index 873f9af5a35b..19db25e0c95a 100644 --- a/block/blk-mq-sched.h +++ b/block/blk-mq-sched.h @@ -35,6 +35,11 @@ void blk_mq_sched_move_to_dispatch(struct blk_mq_hw_ctx *hctx, int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e); void blk_mq_sched_teardown(struct request_queue *q); +int blk_mq_sched_init_hctx(struct request_queue *q, struct blk_mq_hw_ctx *hctx, + unsigned int hctx_idx); +void blk_mq_sched_exit_hctx(struct request_queue *q, struct blk_mq_hw_ctx *hctx, + unsigned int hctx_idx); + int blk_mq_sched_init(struct request_queue *q); static inline bool diff --git a/block/blk-mq.c b/block/blk-mq.c index 061fc2cc88d3..ac830cb488d7 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1839,6 +1839,8 @@ static void blk_mq_exit_hctx(struct request_queue *q, hctx->fq->flush_rq, hctx_idx, flush_start_tag + hctx_idx); + blk_mq_sched_exit_hctx(q, hctx, hctx_idx); + if (set->ops->exit_hctx) set->ops->exit_hctx(hctx, hctx_idx); @@ -1905,9 +1907,12 @@ static int blk_mq_init_hctx(struct request_queue *q, set->ops->init_hctx(hctx, set->driver_data, hctx_idx)) goto free_bitmap; + if (blk_mq_sched_init_hctx(q, hctx, hctx_idx)) + goto exit_hctx; + hctx->fq = blk_alloc_flush_queue(q, hctx->numa_node, set->cmd_size); if (!hctx->fq) - goto exit_hctx; + goto sched_exit_hctx; if (set->ops->init_request && set->ops->init_request(set->driver_data, @@ -1922,6 +1927,8 @@ static int blk_mq_init_hctx(struct request_queue *q, free_fq: kfree(hctx->fq); + sched_exit_hctx: + blk_mq_sched_exit_hctx(q, hctx, hctx_idx); exit_hctx: if (set->ops->exit_hctx) set->ops->exit_hctx(hctx, hctx_idx);