Skip to content

Commit d4ec47f

Browse files
Max GurtovoyChristoph Hellwig
authored andcommitted
nvme-pci: initialize tagset numa value to the value of the ctrl
Both admin's and drive's tagsets should be set according the numa node of the controller. Signed-off-by: Max Gurtovoy <[email protected]> Signed-off-by: Christoph Hellwig <[email protected]>
1 parent 635333e commit d4ec47f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/nvme/host/pci.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1593,7 +1593,7 @@ static int nvme_alloc_admin_tags(struct nvme_dev *dev)
15931593

15941594
dev->admin_tagset.queue_depth = NVME_AQ_MQ_TAG_DEPTH;
15951595
dev->admin_tagset.timeout = ADMIN_TIMEOUT;
1596-
dev->admin_tagset.numa_node = dev_to_node(dev->dev);
1596+
dev->admin_tagset.numa_node = dev->ctrl.numa_node;
15971597
dev->admin_tagset.cmd_size = sizeof(struct nvme_iod);
15981598
dev->admin_tagset.flags = BLK_MQ_F_NO_SCHED;
15991599
dev->admin_tagset.driver_data = dev;
@@ -2259,7 +2259,7 @@ static void nvme_dev_add(struct nvme_dev *dev)
22592259
if (dev->io_queues[HCTX_TYPE_POLL])
22602260
dev->tagset.nr_maps++;
22612261
dev->tagset.timeout = NVME_IO_TIMEOUT;
2262-
dev->tagset.numa_node = dev_to_node(dev->dev);
2262+
dev->tagset.numa_node = dev->ctrl.numa_node;
22632263
dev->tagset.queue_depth =
22642264
min_t(int, dev->q_depth, BLK_MQ_MAX_DEPTH) - 1;
22652265
dev->tagset.cmd_size = sizeof(struct nvme_iod);

0 commit comments

Comments
 (0)