From patchwork Tue Apr 23 12:29:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 10912859 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A54D8112C for ; Tue, 23 Apr 2019 12:30:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 954792863C for ; Tue, 23 Apr 2019 12:30:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 89CF8286AE; Tue, 23 Apr 2019 12:30: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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 29E5E2863C for ; Tue, 23 Apr 2019 12:30:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726204AbfDWM37 (ORCPT ); Tue, 23 Apr 2019 08:29:59 -0400 Received: from mx2.suse.de ([195.135.220.15]:37872 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726150AbfDWM36 (ORCPT ); Tue, 23 Apr 2019 08:29:58 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id C69AFAE2B; Tue, 23 Apr 2019 12:29:57 +0000 (UTC) From: Hannes Reinecke To: Ming Lei Cc: Christoph Hellwig , Jens Axboe , linux-nvme@lists.infradead.org, linux-block@vger.kernel.org, Hannes Reinecke , Hannes@suse.de Subject: [PATCH 5/5] blk-mq: free q->queue_hw_ctx in blk_mq_exit_queue() Date: Tue, 23 Apr 2019 14:29:51 +0200 Message-Id: <20190423122951.134531-6-hare@suse.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190423122951.134531-1-hare@suse.de> References: <20190423122951.134531-1-hare@suse.de> 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 blk_mq_exit_queue() already frees up all hardware contexts, so it should be freeing up the holding array, too. Signed-off-by: Hannes Reinecke queue_hw_ctx[hctx_idx]; + if (q->queue_hw_ctx) + alloc_data.hctx = q->queue_hw_ctx[hctx_idx]; if (!blk_mq_hw_queue_mapped(alloc_data.hctx)) { blk_queue_exit(q); return ERR_PTR(-EXDEV); @@ -2673,7 +2674,8 @@ void blk_mq_release(struct request_queue *q) kobject_put(&hctx->kobj); } - kfree(q->queue_hw_ctx); + /* Ensure that blk_mq_exit_queue() has been called */ + WARN_ON(q->queue_hw_ctx); /* * release .mq_kobj and sw queue's kobject now because @@ -2930,6 +2932,8 @@ void blk_mq_exit_queue(struct request_queue *q) blk_mq_del_queue_tag_set(q); blk_mq_exit_hw_queues(q, set); + kfree(q->queue_hw_ctx); + q->queue_hw_ctx = NULL; } static int __blk_mq_alloc_rq_maps(struct blk_mq_tag_set *set) @@ -3477,6 +3481,9 @@ int blk_poll(struct request_queue *q, blk_qc_t cookie, bool spin) if (current->plug) blk_flush_plug_list(current->plug, false); + if (!q->queue_hw_ctx) + return 0; + hctx = q->queue_hw_ctx[blk_qc_t_to_queue_num(cookie)]; /* diff --git a/block/blk-mq.h b/block/blk-mq.h index c421e3a16e36..14589b9fca84 100644 --- a/block/blk-mq.h +++ b/block/blk-mq.h @@ -188,7 +188,7 @@ static inline bool blk_mq_hctx_stopped(struct blk_mq_hw_ctx *hctx) static inline bool blk_mq_hw_queue_mapped(struct blk_mq_hw_ctx *hctx) { - return hctx->nr_ctx && hctx->tags; + return hctx && hctx->nr_ctx && hctx->tags; } unsigned int blk_mq_in_flight(struct request_queue *q, struct hd_struct *part);