Skip to content

blk-mq: fix blk_mq_alloc_request_hctx

Ming Lei linux-block 6 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v7 Latest3 patches 8 repliesIn review
  2. v63 patches 10 repliesSuperseded
  3. v53 patches 7 repliesSuperseded
Earlier versions · 3
VersionPostedPatchesRepliesStatus
v43 patches18 repliesSuperseded
v26 patches17 repliesSuperseded
v12 patches22 repliesSuperseded

Changes in v7 from the cover letter

- move blk_mq_hctx_use_managed_irq() into block/blk-mq.c, 3/3

Patches in v7 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3genirq: add device_has_managed_msi_irqinclude/linux/msi.h kernel/irq/msi.c+23 -01 reply
2/3blk-mq: mark if one queue map uses managed irqblock/blk-mq-pci.c block/blk-mq-rdma.c block/blk-mq-virtio.c +2 more+14 -11 reply
3/3blk-mq: don't deactivate hctx if managed irq isn't usedblock/blk-mq.c+25 -106 replies

Reviews trailers per patch

All 3 patches have a Reviewed-by or Acked-by.

PatchWen XiongChristoph HellwigJohn GarrySagi Grimberg
1/3T-b R-b
2/3T-b R-b R-b R-b
3/3T-b R-b R-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.

Read the v7 thread

Cover letter [PATCH V7 0/3] blk-mq: fix blk_mq_alloc_request_hctx

Hi,

blk_mq_alloc_request_hctx() is used by NVMe fc/rdma/tcp/loop to connect io queue. Also the sw ctx is chosen as the 1st online cpu in hctx->cpumask. However, all cpus in hctx->cpumask may be offline.

This usage model isn't well supported by blk-mq which supposes allocator is always done on one online CPU in hctx->cpumask. This assumption is related with managed irq, which also requires blk-mq to drain inflight request in this hctx when the last cpu in hctx->cpumask is going to offline.

However, NVMe fc/rdma/tcp/loop don't use managed irq, so we should allow them to ask for request allocation when the specified hctx is inactive (all cpus in hctx->cpumask are offline). Fix blk_mq_alloc_request_hctx() by allowing to allocate request when all CPUs of this hctx are offline.

Wen Xiong has verified V4 in her nvmef test.

V7:
- move blk_mq_hctx_use_managed_irq() into block/blk-mq.c, 3/3

V6:
- move device_has_managed_msi_irq() into kernel/irq/msi.c

V5:
- take John Garry's suggestion to replace device field with new helper of device_has_managed_msi_irq()
V4:
- remove patches for cleanup queue map helpers
- take Christoph's suggestion to add field into 'struct device' for describing if managed irq is allocated from one device

V3:
- cleanup map queues helpers, and remove pci/virtio/rdma queue helpers
- store use managed irq info into qmap

V2:
- use flag of BLK_MQ_F_MANAGED_IRQ
- pass BLK_MQ_F_MANAGED_IRQ from driver explicitly
- kill BLK_MQ_F_STACKING

Ming Lei (3):
genirq: add device_has_managed_msi_irq
blk-mq: mark if one queue map uses managed irq
blk-mq: don't deactivate hctx if managed irq isn't used

 block/blk-mq-pci.c                     |  2 ++
 block/blk-mq-rdma.c                    |  7 ++++++
 block/blk-mq-virtio.c                  |  2 ++
 block/blk-mq.c                         | 35 ++++++++++++++++++--------
 drivers/scsi/hisi_sas/hisi_sas_v2_hw.c |  1 +
 include/linux/blk-mq.h                 |  3 ++-
 include/linux/msi.h                    |  5 ++++
 kernel/irq/msi.c                       | 18 +++++++++++++
 8 files changed, 62 insertions(+), 11 deletions(-)
Signature · 1 line
2.31.1