From: Ming Lei <ming.lei@redhat.com>
To: Jens Axboe <axboe@kernel.dk>, Christoph Hellwig <hch@lst.de>,
linux-block@vger.kernel.org, linux-nvme@lists.infradead.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Bjorn Helgaas <bhelgaas@google.com>,
linux-pci@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
Sagi Grimberg <sagi@grimberg.me>, Daniel Wagner <dwagner@suse.de>,
Wen Xiong <wenxiong@us.ibm.com>,
John Garry <john.garry@huawei.com>,
Hannes Reinecke <hare@suse.de>, Keith Busch <kbusch@kernel.org>,
Ming Lei <ming.lei@redhat.com>
Subject: [PATCH V4 2/3] blk-mq: mark if one queue map uses managed irq
Date: Thu, 15 Jul 2021 20:08:43 +0800 [thread overview]
Message-ID: <20210715120844.636968-3-ming.lei@redhat.com> (raw)
In-Reply-To: <20210715120844.636968-1-ming.lei@redhat.com>
Retrieve this info via the field 'irq_affinity_managed' of 'struct
device' in queue map helpers.
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
block/blk-mq-pci.c | 1 +
block/blk-mq-rdma.c | 3 +++
block/blk-mq-virtio.c | 1 +
include/linux/blk-mq.h | 3 ++-
4 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/block/blk-mq-pci.c b/block/blk-mq-pci.c
index b595a94c4d16..aa0bdb80d0ce 100644
--- a/block/blk-mq-pci.c
+++ b/block/blk-mq-pci.c
@@ -37,6 +37,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 = pdev->dev.irq_affinity_managed;
return 0;
diff --git a/block/blk-mq-rdma.c b/block/blk-mq-rdma.c
index 14f968e58b8f..7b10d8bd2a37 100644
--- a/block/blk-mq-rdma.c
+++ b/block/blk-mq-rdma.c
@@ -36,6 +36,9 @@ int blk_mq_rdma_map_queues(struct blk_mq_queue_map *map,
map->mq_map[cpu] = map->queue_offset + queue;
}
+ /* So far RDMA doesn't use managed irq */
+ map->use_managed_irq = false;
+
return 0;
fallback:
diff --git a/block/blk-mq-virtio.c b/block/blk-mq-virtio.c
index 7b8a42c35102..b57a0aa6d900 100644
--- a/block/blk-mq-virtio.c
+++ b/block/blk-mq-virtio.c
@@ -38,6 +38,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 = vdev->dev.irq_affinity_managed;
return 0;
fallback:
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index 1d18447ebebc..d54a795ec971 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
next prev parent reply other threads:[~2021-07-15 12:09 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-15 12:08 [PATCH V4 0/3] blk-mq: fix blk_mq_alloc_request_hctx Ming Lei
2021-07-15 12:08 ` [PATCH V4 1/3] driver core: mark device as irq affinity managed if any irq is managed Ming Lei
2021-07-15 12:40 ` Greg Kroah-Hartman
2021-07-16 2:17 ` Ming Lei
2021-07-16 20:01 ` Bjorn Helgaas
2021-07-17 9:30 ` Ming Lei
2021-07-21 0:30 ` Bjorn Helgaas
2021-07-19 7:51 ` John Garry
2021-07-19 9:44 ` Christoph Hellwig
2021-07-19 10:39 ` John Garry
2021-07-20 2:38 ` Ming Lei
2021-07-21 7:20 ` Thomas Gleixner
2021-07-21 7:24 ` Christoph Hellwig
2021-07-21 9:44 ` John Garry
2021-07-21 20:22 ` Thomas Gleixner
2021-07-22 7:48 ` John Garry
2021-07-21 20:14 ` Thomas Gleixner
2021-07-21 20:32 ` Christoph Hellwig
2021-07-21 22:38 ` Thomas Gleixner
2021-07-22 7:46 ` Christoph Hellwig
2021-07-15 12:08 ` Ming Lei [this message]
2021-07-15 12:08 ` [PATCH V4 3/3] blk-mq: don't deactivate hctx if managed irq isn't used Ming Lei
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210715120844.636968-3-ming.lei@redhat.com \
--to=ming.lei@redhat.com \
--cc=axboe@kernel.dk \
--cc=bhelgaas@google.com \
--cc=dwagner@suse.de \
--cc=gregkh@linuxfoundation.org \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=john.garry@huawei.com \
--cc=kbusch@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-pci@vger.kernel.org \
--cc=sagi@grimberg.me \
--cc=tglx@linutronix.de \
--cc=wenxiong@us.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).