From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2BA04C6786F for ; Tue, 30 Oct 2018 18:33:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E590F20823 for ; Tue, 30 Oct 2018 18:33:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="hj5IG0Ue" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E590F20823 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727988AbeJaD1e (ORCPT ); Tue, 30 Oct 2018 23:27:34 -0400 Received: from mail-it1-f195.google.com ([209.85.166.195]:54024 "EHLO mail-it1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726522AbeJaD1d (ORCPT ); Tue, 30 Oct 2018 23:27:33 -0400 Received: by mail-it1-f195.google.com with SMTP id f16-v6so7407220ita.3 for ; Tue, 30 Oct 2018 11:32:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bYfeBORDH+1H7Y7Fu0ilm7RpfNFuYSSIGJoZ2gOL4PI=; b=hj5IG0UeewVl2Znvwz0gMlfJ9YDkC8/4uCUrMhLz9/AmHsd92a6ZIgxpbCDgvraqqD XpCTxEVaBzzLyG8LE3L7in71E8OnRVvWVc2wpmbP75/dFKhbxiBDj+JQ2jMNg4INWivN mEK73LRpKrtXS3rk8uYtIFziV16jYLicA2zcQSRcom5XupWoHgiDfZvqSTxdzacrLPFT klJshYCtiFLU9EJleQDdVZbHTqbT1/RcxjGjxxHBSDOVdkLWwaXhR/tnaH7zB85yozF4 UUMuVpwJrG26jGqHgUxcNxIWL5jt7fKJWXzZOHaOaxZ3PPN6fxzI2a7AxWamLEPzmolR ZT5Q== 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; bh=bYfeBORDH+1H7Y7Fu0ilm7RpfNFuYSSIGJoZ2gOL4PI=; b=irLoEUgXkajb8R6Pb3/nGqqVp/VGiSXNXSY41iXmDybUGwqPzi6Goky+/FAR59NtTN YoRCOZBNrAtCKO1OLLlywQWQoSNSt1Zm6rneAdqtP0zI2gmDETJA2gHcfqLma5zCc91Y jhuLUJ+riCoNwxWW8Y7IKtmiLLFUL4fBQ/EdSWhkUDgjMBV5W9WwC3Gasglb80aVa02I RosdMpBxftVmGs4FekYfS7GZk8w9Qfa7zcfdFSQfafECJ7xkoWf3Kxn+o6jrKXvXQOQl DMts1DSR1xNc8ODLOJbF7e812lO8/82VVhCAaBpk5QykxCLhzZ4jSm2hjUp2ojoy/9ZJ Elhg== X-Gm-Message-State: AGRZ1gJwuSrEnxDZENYIQTcEbLQG7tK/sLmvPPOv6juZtDiKgzkM2DEf 2LV6EC3Fj6RnV4bf35x8oIhOgA== X-Google-Smtp-Source: AJdET5e3xnldilSIOqLjzD9xjVtYs8eyUl2jGtfEOjo5CRQos8C1M+du/0Tp0uYociGycVUHFLul1Q== X-Received: by 2002:a24:8247:: with SMTP id t68-v6mr23361itd.68.1540924377786; Tue, 30 Oct 2018 11:32:57 -0700 (PDT) Received: from localhost.localdomain ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id o20-v6sm4895739itc.34.2018.10.30.11.32.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Oct 2018 11:32:56 -0700 (PDT) From: Jens Axboe To: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 01/16] blk-mq: kill q->mq_map Date: Tue, 30 Oct 2018 12:32:37 -0600 Message-Id: <20181030183252.17857-2-axboe@kernel.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181030183252.17857-1-axboe@kernel.dk> References: <20181030183252.17857-1-axboe@kernel.dk> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It's just a pointer to set->mq_map, use that instead. Move the assignment a bit earlier, so we always know it's valid. Reviewed-by: Christoph Hellwig Reviewed-by: Hannes Reinecke Reviewed-by: Bart Van Assche Signed-off-by: Jens Axboe --- block/blk-mq.c | 13 ++++--------- block/blk-mq.h | 4 +++- include/linux/blkdev.h | 2 -- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 21e4147c4810..22d5beaab5a0 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -2321,7 +2321,7 @@ static void blk_mq_map_swqueue(struct request_queue *q) * If the cpu isn't present, the cpu is mapped to first hctx. */ for_each_possible_cpu(i) { - hctx_idx = q->mq_map[i]; + hctx_idx = set->mq_map[i]; /* unmapped hw queue can be remapped after CPU topo changed */ if (!set->tags[hctx_idx] && !__blk_mq_alloc_rq_map(set, hctx_idx)) { @@ -2331,7 +2331,7 @@ static void blk_mq_map_swqueue(struct request_queue *q) * case, remap the current ctx to hctx[0] which * is guaranteed to always have tags allocated */ - q->mq_map[i] = 0; + set->mq_map[i] = 0; } ctx = per_cpu_ptr(q->queue_ctx, i); @@ -2429,8 +2429,6 @@ static void blk_mq_del_queue_tag_set(struct request_queue *q) static void blk_mq_add_queue_tag_set(struct blk_mq_tag_set *set, struct request_queue *q) { - q->tag_set = set; - mutex_lock(&set->tag_list_lock); /* @@ -2467,8 +2465,6 @@ void blk_mq_release(struct request_queue *q) kobject_put(&hctx->kobj); } - q->mq_map = NULL; - kfree(q->queue_hw_ctx); /* @@ -2588,7 +2584,7 @@ static void blk_mq_realloc_hw_ctxs(struct blk_mq_tag_set *set, int node; struct blk_mq_hw_ctx *hctx; - node = blk_mq_hw_queue_to_node(q->mq_map, i); + node = blk_mq_hw_queue_to_node(set->mq_map, i); /* * If the hw queue has been mapped to another numa node, * we need to realloc the hctx. If allocation fails, fallback @@ -2665,8 +2661,6 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set, if (!q->queue_hw_ctx) goto err_percpu; - q->mq_map = set->mq_map; - blk_mq_realloc_hw_ctxs(set, q); if (!q->nr_hw_queues) goto err_hctxs; @@ -2675,6 +2669,7 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set, blk_queue_rq_timeout(q, set->timeout ? set->timeout : 30 * HZ); q->nr_queues = nr_cpu_ids; + q->tag_set = set; q->queue_flags |= QUEUE_FLAG_MQ_DEFAULT; diff --git a/block/blk-mq.h b/block/blk-mq.h index 9497b47e2526..9536be06d022 100644 --- a/block/blk-mq.h +++ b/block/blk-mq.h @@ -75,7 +75,9 @@ extern int blk_mq_hw_queue_to_node(unsigned int *map, unsigned int); static inline struct blk_mq_hw_ctx *blk_mq_map_queue(struct request_queue *q, int cpu) { - return q->queue_hw_ctx[q->mq_map[cpu]]; + struct blk_mq_tag_set *set = q->tag_set; + + return q->queue_hw_ctx[set->mq_map[cpu]]; } /* diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index c675e2b5af62..4223ae2d2198 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -412,8 +412,6 @@ struct request_queue { const struct blk_mq_ops *mq_ops; - unsigned int *mq_map; - /* sw queues */ struct blk_mq_ctx __percpu *queue_ctx; unsigned int nr_queues; -- 2.17.1