* [PATCH v3 for-4.6 0/4] Provide better active I/O termination handlers
@ 2016-03-10 11:58 Sagi Grimberg
2016-03-10 11:58 ` [PATCH v3 for-4.6 1/4] blk-mq: Export tagset iter function Sagi Grimberg
` (5 more replies)
0 siblings, 6 replies; 11+ messages in thread
From: Sagi Grimberg @ 2016-03-10 11:58 UTC (permalink / raw)
This patchset adds helper to active IO termination to block layer
based on the pci nvme_clear_queues() functionality. This is needed
for live shutdowns and resets during live IO and it's not nvme/pci
specific and will be needed for other transports as well.
This patchset applies on top of "for-4.6-drivers" patchset.
Changes from v2:
- Added mtip32xxx conversion from Keith
Changes from v1:
- rebase on top of for-4.6-drivers (small fuzz)
- incorporate a fix from hch to carefully check for valid tagsets
Changes from v0:
- Removed the nvme core helpers for IO termination and have pci
use blk-mq helper directly
- Rebased on top of Keith and Christoph's patches
Keith Busch (1):
mtip32xx: Convert to use blk_mq_tagset_busy_iter
Sagi Grimberg (3):
blk-mq: Export tagset iter function
nvme: Use blk-mq helper for IO termination
blk-mq: Make blk_mq_all_tag_busy_iter static
block/blk-mq-tag.c | 17 ++++++++++++++---
drivers/block/mtip32xx/mtip32xx.c | 6 +++---
drivers/nvme/host/pci.c | 19 +++++--------------
include/linux/blk-mq.h | 4 ++--
4 files changed, 24 insertions(+), 22 deletions(-)
--
1.8.4.3
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v3 for-4.6 1/4] blk-mq: Export tagset iter function
2016-03-10 11:58 [PATCH v3 for-4.6 0/4] Provide better active I/O termination handlers Sagi Grimberg
@ 2016-03-10 11:58 ` Sagi Grimberg
2016-03-10 11:58 ` [PATCH v3 for-4.6 2/4] nvme: Use blk-mq helper for IO termination Sagi Grimberg
` (4 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Sagi Grimberg @ 2016-03-10 11:58 UTC (permalink / raw)
Its useful to iterate on all the active tags in cases
where we will need to fail all the queues IO.
Signed-off-by: Sagi Grimberg <sagig at mellanox.com>
[hch: carefully check for valid tagsets]
Reviewed-by: Christoph Hellwig <hch at lst.de>
Reviewed-by: Johannes Thumshirn <jthumshirn at suse.de>
---
block/blk-mq-tag.c | 12 ++++++++++++
include/linux/blk-mq.h | 2 ++
2 files changed, 14 insertions(+)
diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c
index abdbb47405cb..2fd04286f103 100644
--- a/block/blk-mq-tag.c
+++ b/block/blk-mq-tag.c
@@ -474,6 +474,18 @@ void blk_mq_all_tag_busy_iter(struct blk_mq_tags *tags, busy_tag_iter_fn *fn,
}
EXPORT_SYMBOL(blk_mq_all_tag_busy_iter);
+void blk_mq_tagset_busy_iter(struct blk_mq_tag_set *tagset,
+ busy_tag_iter_fn *fn, void *priv)
+{
+ int i;
+
+ for (i = 0; i < tagset->nr_hw_queues; i++) {
+ if (tagset->tags && tagset->tags[i])
+ blk_mq_all_tag_busy_iter(tagset->tags[i], fn, priv);
+ }
+}
+EXPORT_SYMBOL(blk_mq_tagset_busy_iter);
+
void blk_mq_queue_tag_busy_iter(struct request_queue *q, busy_iter_fn *fn,
void *priv)
{
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index 15a73d49fd1d..865ee7016b72 100644
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -240,6 +240,8 @@ void blk_mq_run_hw_queues(struct request_queue *q, bool async);
void blk_mq_delay_queue(struct blk_mq_hw_ctx *hctx, unsigned long msecs);
void blk_mq_all_tag_busy_iter(struct blk_mq_tags *tags, busy_tag_iter_fn *fn,
void *priv);
+void blk_mq_tagset_busy_iter(struct blk_mq_tag_set *tagset,
+ busy_tag_iter_fn *fn, void *priv);
void blk_mq_freeze_queue(struct request_queue *q);
void blk_mq_unfreeze_queue(struct request_queue *q);
void blk_mq_freeze_queue_start(struct request_queue *q);
--
1.8.4.3
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v3 for-4.6 2/4] nvme: Use blk-mq helper for IO termination
2016-03-10 11:58 [PATCH v3 for-4.6 0/4] Provide better active I/O termination handlers Sagi Grimberg
2016-03-10 11:58 ` [PATCH v3 for-4.6 1/4] blk-mq: Export tagset iter function Sagi Grimberg
@ 2016-03-10 11:58 ` Sagi Grimberg
2016-03-10 11:58 ` [PATCH v3 for-4.6 3/4] mtip32xx: Convert to use blk_mq_tagset_busy_iter Sagi Grimberg
` (3 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Sagi Grimberg @ 2016-03-10 11:58 UTC (permalink / raw)
blk-mq offers a tagset iterator so let's use that
instead of using nvme_clear_queues.
Note, we changed nvme_queue_cancel_ios name to nvme_cancel_io
as there is no concept of a queue now in this function (we
also lost the print).
Signed-off-by: Sagi Grimberg <sagig at mellanox.com>
Reviewed-by: Christoph Hellwig <hch at lst.de>
Acked-by: Keith Busch <keith.busch at intel.com>
Reviewed-by: Johannes Thumshirn <jthumshirn at suse.de>
---
drivers/nvme/host/pci.c | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index e9f18e1d73e5..b713b390aa4f 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -982,16 +982,15 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)
return BLK_EH_RESET_TIMER;
}
-static void nvme_cancel_queue_ios(struct request *req, void *data, bool reserved)
+static void nvme_cancel_io(struct request *req, void *data, bool reserved)
{
- struct nvme_queue *nvmeq = data;
+ struct nvme_dev *dev = data;
int status;
if (!blk_mq_request_started(req))
return;
- dev_warn(nvmeq->dev->ctrl.device,
- "Cancelling I/O %d QID %d\n", req->tag, nvmeq->qid);
+ dev_warn(dev->ctrl.device, "Cancelling I/O %d\n", req->tag);
status = NVME_SC_ABORT_REQ;
if (blk_queue_dying(req->q))
@@ -1048,14 +1047,6 @@ static int nvme_suspend_queue(struct nvme_queue *nvmeq)
return 0;
}
-static void nvme_clear_queue(struct nvme_queue *nvmeq)
-{
- spin_lock_irq(&nvmeq->q_lock);
- if (nvmeq->tags && *nvmeq->tags)
- blk_mq_all_tag_busy_iter(*nvmeq->tags, nvme_cancel_queue_ios, nvmeq);
- spin_unlock_irq(&nvmeq->q_lock);
-}
-
static void nvme_disable_admin_queue(struct nvme_dev *dev, bool shutdown)
{
struct nvme_queue *nvmeq = dev->queues[0];
@@ -1779,8 +1770,8 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown)
}
nvme_dev_unmap(dev);
- for (i = dev->queue_count - 1; i >= 0; i--)
- nvme_clear_queue(dev->queues[i]);
+ blk_mq_tagset_busy_iter(&dev->tagset, nvme_cancel_io, dev);
+ blk_mq_tagset_busy_iter(&dev->admin_tagset, nvme_cancel_io, dev);
mutex_unlock(&dev->shutdown_lock);
}
--
1.8.4.3
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v3 for-4.6 3/4] mtip32xx: Convert to use blk_mq_tagset_busy_iter
2016-03-10 11:58 [PATCH v3 for-4.6 0/4] Provide better active I/O termination handlers Sagi Grimberg
2016-03-10 11:58 ` [PATCH v3 for-4.6 1/4] blk-mq: Export tagset iter function Sagi Grimberg
2016-03-10 11:58 ` [PATCH v3 for-4.6 2/4] nvme: Use blk-mq helper for IO termination Sagi Grimberg
@ 2016-03-10 11:58 ` Sagi Grimberg
2016-03-15 8:23 ` Christoph Hellwig
2016-03-10 11:58 ` [PATCH v3 for-4.6 4/4] blk-mq: Make blk_mq_all_tag_busy_iter static Sagi Grimberg
` (2 subsequent siblings)
5 siblings, 1 reply; 11+ messages in thread
From: Sagi Grimberg @ 2016-03-10 11:58 UTC (permalink / raw)
From: Keith Busch <keith.busch@intel.com>
Only a single tags array anyway.
Signed-off-by: Keith Busch <keith.busch at intel.com>
Reviewed-by: Johannes Thumshirn <jthumshirn at suse.de>
Signed-off-by: Sagi Grimberg <sagig at mellanox.com>
---
drivers/block/mtip32xx/mtip32xx.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index cc2e71d0a77f..2cc86f70c01f 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -3000,14 +3000,14 @@ restart_eh:
"Completion workers still active!");
spin_lock(dd->queue->queue_lock);
- blk_mq_all_tag_busy_iter(*dd->tags.tags,
+ blk_mq_tagset_busy_iter(&dd->tags,
mtip_queue_cmd, dd);
spin_unlock(dd->queue->queue_lock);
set_bit(MTIP_PF_ISSUE_CMDS_BIT, &dd->port->flags);
if (mtip_device_reset(dd))
- blk_mq_all_tag_busy_iter(*dd->tags.tags,
+ blk_mq_tagset_busy_iter(&dd->tags,
mtip_abort_cmd, dd);
clear_bit(MTIP_PF_TO_ACTIVE_BIT, &dd->port->flags);
@@ -4174,7 +4174,7 @@ static int mtip_block_remove(struct driver_data *dd)
blk_mq_freeze_queue_start(dd->queue);
blk_mq_stop_hw_queues(dd->queue);
- blk_mq_all_tag_busy_iter(dd->tags.tags[0], mtip_no_dev_cleanup, dd);
+ blk_mq_tagset_busy_iter(&dd->tags, mtip_no_dev_cleanup, dd);
/*
* Delete our gendisk structure. This also removes the device
--
1.8.4.3
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v3 for-4.6 4/4] blk-mq: Make blk_mq_all_tag_busy_iter static
2016-03-10 11:58 [PATCH v3 for-4.6 0/4] Provide better active I/O termination handlers Sagi Grimberg
` (2 preceding siblings ...)
2016-03-10 11:58 ` [PATCH v3 for-4.6 3/4] mtip32xx: Convert to use blk_mq_tagset_busy_iter Sagi Grimberg
@ 2016-03-10 11:58 ` Sagi Grimberg
2016-03-10 12:38 ` [PATCH v3 for-4.6 0/4] Provide better active I/O termination handlers Sagi Grimberg
2016-04-03 16:30 ` sagig
5 siblings, 0 replies; 11+ messages in thread
From: Sagi Grimberg @ 2016-03-10 11:58 UTC (permalink / raw)
No caller outside the blk-mq code so we can settle
with it static.
Signed-off-by: Sagi Grimberg <sagig at mellanox.com>
Reviewed-by: Christoph Hellwig <hch at lst.de>
Reviewed-by: Johannes Thumshirn <jthumshirn at suse.de>
---
block/blk-mq-tag.c | 5 ++---
include/linux/blk-mq.h | 2 --
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c
index 2fd04286f103..56a0c37a3d06 100644
--- a/block/blk-mq-tag.c
+++ b/block/blk-mq-tag.c
@@ -464,15 +464,14 @@ static void bt_tags_for_each(struct blk_mq_tags *tags,
}
}
-void blk_mq_all_tag_busy_iter(struct blk_mq_tags *tags, busy_tag_iter_fn *fn,
- void *priv)
+static void blk_mq_all_tag_busy_iter(struct blk_mq_tags *tags,
+ busy_tag_iter_fn *fn, void *priv)
{
if (tags->nr_reserved_tags)
bt_tags_for_each(tags, &tags->breserved_tags, 0, fn, priv, true);
bt_tags_for_each(tags, &tags->bitmap_tags, tags->nr_reserved_tags, fn, priv,
false);
}
-EXPORT_SYMBOL(blk_mq_all_tag_busy_iter);
void blk_mq_tagset_busy_iter(struct blk_mq_tag_set *tagset,
busy_tag_iter_fn *fn, void *priv)
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index 865ee7016b72..ecd7ea33a99f 100644
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -238,8 +238,6 @@ void blk_mq_start_hw_queues(struct request_queue *q);
void blk_mq_start_stopped_hw_queues(struct request_queue *q, bool async);
void blk_mq_run_hw_queues(struct request_queue *q, bool async);
void blk_mq_delay_queue(struct blk_mq_hw_ctx *hctx, unsigned long msecs);
-void blk_mq_all_tag_busy_iter(struct blk_mq_tags *tags, busy_tag_iter_fn *fn,
- void *priv);
void blk_mq_tagset_busy_iter(struct blk_mq_tag_set *tagset,
busy_tag_iter_fn *fn, void *priv);
void blk_mq_freeze_queue(struct request_queue *q);
--
1.8.4.3
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v3 for-4.6 0/4] Provide better active I/O termination handlers
2016-03-10 11:58 [PATCH v3 for-4.6 0/4] Provide better active I/O termination handlers Sagi Grimberg
` (3 preceding siblings ...)
2016-03-10 11:58 ` [PATCH v3 for-4.6 4/4] blk-mq: Make blk_mq_all_tag_busy_iter static Sagi Grimberg
@ 2016-03-10 12:38 ` Sagi Grimberg
2016-03-21 14:52 ` Christoph Hellwig
2016-04-03 16:30 ` sagig
5 siblings, 1 reply; 11+ messages in thread
From: Sagi Grimberg @ 2016-03-10 12:38 UTC (permalink / raw)
> This patchset adds helper to active IO termination to block layer
> based on the pci nvme_clear_queues() functionality. This is needed
> for live shutdowns and resets during live IO and it's not nvme/pci
> specific and will be needed for other transports as well.
>
> This patchset applies on top of "for-4.6-drivers" patchset.
Actually, it applies against for-next now...
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v3 for-4.6 3/4] mtip32xx: Convert to use blk_mq_tagset_busy_iter
2016-03-10 11:58 ` [PATCH v3 for-4.6 3/4] mtip32xx: Convert to use blk_mq_tagset_busy_iter Sagi Grimberg
@ 2016-03-15 8:23 ` Christoph Hellwig
0 siblings, 0 replies; 11+ messages in thread
From: Christoph Hellwig @ 2016-03-15 8:23 UTC (permalink / raw)
Looks fine,
Reviewed-by: Christoph Hellwig <hch at lst.de>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v3 for-4.6 0/4] Provide better active I/O termination handlers
2016-03-10 12:38 ` [PATCH v3 for-4.6 0/4] Provide better active I/O termination handlers Sagi Grimberg
@ 2016-03-21 14:52 ` Christoph Hellwig
0 siblings, 0 replies; 11+ messages in thread
From: Christoph Hellwig @ 2016-03-21 14:52 UTC (permalink / raw)
Jens, is this something still worth picking up for 4.6?
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v3 for-4.6 0/4] Provide better active I/O termination handlers
2016-03-10 11:58 [PATCH v3 for-4.6 0/4] Provide better active I/O termination handlers Sagi Grimberg
` (4 preceding siblings ...)
2016-03-10 12:38 ` [PATCH v3 for-4.6 0/4] Provide better active I/O termination handlers Sagi Grimberg
@ 2016-04-03 16:30 ` sagig
2016-04-07 15:07 ` Jens Axboe
2016-04-12 19:42 ` Jens Axboe
5 siblings, 2 replies; 11+ messages in thread
From: sagig @ 2016-04-03 16:30 UTC (permalink / raw)
Hey Jens,
So this got left behind in the 4.6 pull request...
Can we at least queue it up for 4.7?
Cheers,
Sagi.
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v3 for-4.6 0/4] Provide better active I/O termination handlers
2016-04-03 16:30 ` sagig
@ 2016-04-07 15:07 ` Jens Axboe
2016-04-12 19:42 ` Jens Axboe
1 sibling, 0 replies; 11+ messages in thread
From: Jens Axboe @ 2016-04-07 15:07 UTC (permalink / raw)
> On Apr 3, 2016,@9:30 AM, sagig <sagi@grimberg.me> wrote:
>
> Hey Jens,
>
> So this got left behind in the 4.6 pull request...
>
> Can we at least queue it up for 4.7?
I'll queue it up for 4.7 - traveling this week, will get to it Monday.
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v3 for-4.6 0/4] Provide better active I/O termination handlers
2016-04-03 16:30 ` sagig
2016-04-07 15:07 ` Jens Axboe
@ 2016-04-12 19:42 ` Jens Axboe
1 sibling, 0 replies; 11+ messages in thread
From: Jens Axboe @ 2016-04-12 19:42 UTC (permalink / raw)
On 04/03/2016 10:30 AM, sagig wrote:
> Hey Jens,
>
> So this got left behind in the 4.6 pull request...
It was late for 4.6, sent out the day before...
> Can we at least queue it up for 4.7?
Certainly, being queued up now.
--
Jens Axboe
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2016-04-12 19:42 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-10 11:58 [PATCH v3 for-4.6 0/4] Provide better active I/O termination handlers Sagi Grimberg
2016-03-10 11:58 ` [PATCH v3 for-4.6 1/4] blk-mq: Export tagset iter function Sagi Grimberg
2016-03-10 11:58 ` [PATCH v3 for-4.6 2/4] nvme: Use blk-mq helper for IO termination Sagi Grimberg
2016-03-10 11:58 ` [PATCH v3 for-4.6 3/4] mtip32xx: Convert to use blk_mq_tagset_busy_iter Sagi Grimberg
2016-03-15 8:23 ` Christoph Hellwig
2016-03-10 11:58 ` [PATCH v3 for-4.6 4/4] blk-mq: Make blk_mq_all_tag_busy_iter static Sagi Grimberg
2016-03-10 12:38 ` [PATCH v3 for-4.6 0/4] Provide better active I/O termination handlers Sagi Grimberg
2016-03-21 14:52 ` Christoph Hellwig
2016-04-03 16:30 ` sagig
2016-04-07 15:07 ` Jens Axboe
2016-04-12 19:42 ` Jens Axboe
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.