| Message ID | 20210721091723.1152456-3-ming.lei@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | blk-mq: fix blk_mq_alloc_request_hctx | expand |
On Wed, Jul 21, 2021 at 05:17:22PM +0800, Ming Lei wrote: > + /* So far RDMA doesn't use managed irq */ > + map->use_managed_irq = false; It certainly did when I wrote this code. The comment should be something "sigh, someone fucked up the rdma queue mapping. No managed irqs for now". Otherwise looks fine: Reviewed-by: Christoph Hellwig <hch@lst.de>
On 21/07/2021 10:17, Ming Lei wrote: FWIW, Reviewed-by: John Garry <john.garry@huawei.com> > 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; late nit: I'd be inclined to call this "drain_hw_queue" or similar, which is what it means to blk-mq > }; Thanks
On Wed, Jul 21, 2021 at 07:53:22PM +0100, John Garry wrote: > On 21/07/2021 10:17, Ming Lei wrote: > > FWIW, > > Reviewed-by: John Garry <john.garry@huawei.com> > > > 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; > > late nit: I'd be inclined to call this "drain_hw_queue" or similar, which is > what it means to blk-mq But 'drain_hw_queue' isn't straightforward when it is checked in blk_mq_alloc_request_hctx(). Thanks, Ming
On Wed, Jul 21, 2021 at 04:37:16PM +0200, Christoph Hellwig wrote: > On Wed, Jul 21, 2021 at 05:17:22PM +0800, Ming Lei wrote: > > + /* So far RDMA doesn't use managed irq */ > > + map->use_managed_irq = false; > > It certainly did when I wrote this code. The comment should be > something "sigh, someone fucked up the rdma queue mapping. No managed > irqs for now". But if it rdma queue mapping uses managed irq, the issue in blk_mq_alloc_request_hctx() can be hard to fix, :-( Thanks, Ming
diff --git a/block/blk-mq-pci.c b/block/blk-mq-pci.c index b595a94c4d16..7011854a562a 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 = 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..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..bea91ac5996d 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 = 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 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; }; /**
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. 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 + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 1 + include/linux/blk-mq.h | 3 ++- 5 files changed, 8 insertions(+), 1 deletion(-)