[PATCH V7 2/3] blk-mq: mark if one queue map uses managed irq
From: Ming Lei <hidden>
Date: 2021-08-18 14:45:48
Subsystem:
block layer, hisilicon sas controller, scsi subsystem, the rest · Maintainers:
Jens Axboe, Xingui Yang, "James E.J. Bottomley", "Martin K. Petersen", Linus Torvalds
Retrieve this info via new added helper of device_has_managed_msi_irq, then we can decide if one hctx needs to be drained before all its CPUs become offline. Tested-by: Wen Xiong <redacted> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: John Garry <redacted> Signed-off-by: Ming Lei <redacted> --- block/blk-mq-pci.c | 2 ++ block/blk-mq-rdma.c | 7 +++++++ block/blk-mq-virtio.c | 2 ++ drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 1 + include/linux/blk-mq.h | 3 ++- 5 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/block/blk-mq-pci.c b/block/blk-mq-pci.c
index b595a94c4d16..e452cda0896a 100644
--- a/block/blk-mq-pci.c
+++ b/block/blk-mq-pci.c@@ -8,6 +8,7 @@ #include <linux/blk-mq-pci.h> #include <linux/pci.h> #include <linux/module.h> +#include <linux/msi.h> #include "blk-mq.h"
@@ -37,6 +38,7 @@ int blk_mq_pci_map_queues(struct blk_mq_queue_map *qmap, struct pci_dev *pdev, for_each_cpu(cpu, mask) qmap->mq_map[cpu] = qmap->queue_offset + queue; } + qmap->use_managed_irq = device_has_managed_msi_irq(&pdev->dev); return 0;
diff --git a/block/blk-mq-rdma.c b/block/blk-mq-rdma.c
index 14f968e58b8f..19ad31c44eab 100644
--- a/block/blk-mq-rdma.c
+++ b/block/blk-mq-rdma.c@@ -36,6 +36,13 @@ int blk_mq_rdma_map_queues(struct blk_mq_queue_map *map, map->mq_map[cpu] = map->queue_offset + queue; } + /* + * RDMA doesn't use managed irq, and nvme rdma driver can allocate + * and submit requests on specified hctx via + * blk_mq_alloc_request_hctx + */ + map->use_managed_irq = false; + return 0; fallback:
diff --git a/block/blk-mq-virtio.c b/block/blk-mq-virtio.c
index 7b8a42c35102..2ce39fb77dce 100644
--- a/block/blk-mq-virtio.c
+++ b/block/blk-mq-virtio.c@@ -7,6 +7,7 @@ #include <linux/blk-mq-virtio.h> #include <linux/virtio_config.h> #include <linux/module.h> +#include <linux/msi.h> #include "blk-mq.h" /**
@@ -38,6 +39,7 @@ int blk_mq_virtio_map_queues(struct blk_mq_queue_map *qmap, for_each_cpu(cpu, mask) qmap->mq_map[cpu] = qmap->queue_offset + queue; } + qmap->use_managed_irq = device_has_managed_msi_irq(&vdev->dev); return 0; fallback:
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
index b0b2361e63fe..7d7df261d346 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c@@ -3562,6 +3562,7 @@ static int map_queues_v2_hw(struct Scsi_Host *shost) for_each_cpu(cpu, mask) qmap->mq_map[cpu] = qmap->queue_offset + queue; } + qmap->use_managed_irq = true; return 0;
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index 22215db36122..fd5540fba4ef 100644
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h@@ -192,7 +192,8 @@ struct blk_mq_hw_ctx { struct blk_mq_queue_map { unsigned int *mq_map; unsigned int nr_queues; - unsigned int queue_offset; + unsigned int queue_offset:31; + unsigned int use_managed_irq:1; }; /**
--
2.31.1