From: Ming Lei <ming.lei@redhat.com>
Date: Wed, 18 Aug 2021 22:44:27 +0800
Subject: blk-mq: mark if one queue map uses managed irq
Patch-mainline: Not yet, https://lore.kernel.org/linux-block/20210818144428.896216-1-ming.lei@redhat.com/
References: bsc#1185762
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 <wenxiong@us.ibm.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: John Garry <john.garry@huawei.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
[dwagner: dropped hisi_sas bits, the driver doesn't use manged IRQ yet]
Acked-by: Daniel Wagner <dwagner@suse.de>
---
block/blk-mq-pci.c | 2 ++
block/blk-mq-rdma.c | 7 +++++++
block/blk-mq-virtio.c | 2 ++
include/linux/blk-mq.h | 3 ++-
4 files changed, 13 insertions(+), 1 deletion(-)
--- 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_
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;
--- 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
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:
--- 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_
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:
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -79,7 +79,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;
};
enum hctx_type {