[PATCH 1/2] blk-mq: allocate blk_mq_tags and requests in correct node

Path	csiph.com!news.redatomik.org!aioe.org!bofh.it!news.nic.it!robomod
From	Shaohua Li <shli@fb.com>
Newsgroups	linux.kernel
Subject	[PATCH 1/2] blk-mq: allocate blk_mq_tags and requests in correct node
Date	Wed, 01 Feb 2017 05:30:01 +0100
Message-ID	<t5UIp-1aG-5@gated-at.bofh.it> (permalink)
X-Original-To	<linux-kernel@vger.kernel.org>, <linux-block@vger.kernel.org>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=facebook; bh=LcCig3BtuhNTJ1ieAwau6WAwM/E+bPym1GvWDl5UzmU=; b=W2Iyq82ufe+cqy8hoARyvCSZdx5Nv/eaNy5rhAazyPYAxoeLse7Qh1m4XXkEHx980Al0 f4TbrNcenZD+Iblg902GvcO8+TbCdenG+2N590VPLIHrqX2KVsmd+CPGifG/Na3c3bDK ECJHe6iOGX+O/qzvcHAKDbeEsLtpUF6PK2E=
SMTP-Origin-Hostprefix	devbig
SMTP-Origin-Hostname	devbig638.prn2.facebook.com
SMTP-Origin-Cluster	prn2c22
X-Mailer	git-send-email 2.9.3
X-Fb-Internal	Safe
MIME-Version	1.0
Content-Type	text/plain
X-Proofpoint-Spam-Reason	safe
X-Fb-Internal	Safe
X-Proofpoint-Virus-Version	vendor=fsecure engine=2.50.10432:,, definitions=2017-01-31_12:,, signatures=0
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	59
Organization	linux.* mail to news gateway
X-Original-Cc	<hch@lst.de>, <axboe@fb.com>
X-Original-Date	Tue, 31 Jan 2017 20:25:51 -0800
X-Original-Message-ID	<1c91ab2c0073598592f66f007ff72cfa58a17a54.1485922654.git.shli@fb.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1571265

Show key headers only | View raw

blk_mq_tags/requests of specific hardware queue are mostly used in
specific cpus, which might not be in the same numa node as disk. For
example, a nvme card is in node 0. half hardware queue will be used by
node 0, the other node 1.

Signed-off-by: Shaohua Li <shli@fb.com>
---
 block/blk-mq.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/block/blk-mq.c b/block/blk-mq.c
index c3400b5..90a37ba 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1594,9 +1594,13 @@ static struct blk_mq_tags *blk_mq_init_rq_map(struct blk_mq_tag_set *set,
 	struct blk_mq_tags *tags;
 	unsigned int i, j, entries_per_page, max_order = 4;
 	size_t rq_size, left;
+	int node;
+
+	node = blk_mq_hw_queue_to_node(set->mq_map, hctx_idx);
+	if (node == NUMA_NO_NODE)
+		node = set->numa_node;
 
-	tags = blk_mq_init_tags(set->queue_depth, set->reserved_tags,
-				set->numa_node,
+	tags = blk_mq_init_tags(set->queue_depth, set->reserved_tags, node,
 				BLK_MQ_FLAG_TO_ALLOC_POLICY(set->flags));
 	if (!tags)
 		return NULL;
@@ -1605,7 +1609,7 @@ static struct blk_mq_tags *blk_mq_init_rq_map(struct blk_mq_tag_set *set,
 
 	tags->rqs = kzalloc_node(set->queue_depth * sizeof(struct request *),
 				 GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY,
-				 set->numa_node);
+				 node);
 	if (!tags->rqs) {
 		blk_mq_free_tags(tags);
 		return NULL;
@@ -1629,7 +1633,7 @@ static struct blk_mq_tags *blk_mq_init_rq_map(struct blk_mq_tag_set *set,
 			this_order--;
 
 		do {
-			page = alloc_pages_node(set->numa_node,
+			page = alloc_pages_node(node,
 				GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY | __GFP_ZERO,
 				this_order);
 			if (page)
@@ -1660,7 +1664,7 @@ static struct blk_mq_tags *blk_mq_init_rq_map(struct blk_mq_tag_set *set,
 			if (set->ops->init_request) {
 				if (set->ops->init_request(set->driver_data,
 						tags->rqs[i], hctx_idx, i,
-						set->numa_node)) {
+						node)) {
 					tags->rqs[i] = NULL;
 					goto fail;
 				}
-- 
2.9.3

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/2] blk-mq: allocate blk_mq_tags and requests in correct node Shaohua Li <shli@fb.com> - 2017-02-01 05:30 +0100
  Re: [PATCH 1/2] blk-mq: allocate blk_mq_tags and requests in         correct node Christoph Hellwig <hch@lst.de> - 2017-02-01 10:40 +0100

csiph-web