nvme: fix refcounting imbalance when all paths are down
PATCH v8 1/1 nvme: fix refcounting imbalance when all paths are down
When the last path to a ns_head drops the current code
removes the ns_head from the subsystem list, but will only delete the disk itself if the last reference to the ns_head drops. This is causing an refcounting imbalance eg when applications have a reference to the disk, as then they'll never get notified that the disk is in fact dead.
This patch moves the call 'del_gendisk' into nvme_mpath_check_last_path(), ensuring that the disk can be properly removed and applications get the appropriate notifications.
Changes to v7:
- Move the list_del() call outside of nvme_mpath_check_last_path() Changes to v6:
- Move the list_del() into nvme_mpath_check_last_path()
- Drop the tests for GENHD_FL_UP
Changes to v5:
- Synchronize between nvme_init_ns_head() and nvme_mpath_check_last_path()
- Check for removed gendisk in nvme_ns_head_submit_bio() Changes to v4:
- Call del_gendisk() in nvme_mpath_check_last_path() to avoid deadlock Changes to v3:
- Simplify if() clause to detect duplicate namespaces
Changes to v2:
- Drop memcpy() statement
Changes to v1:
- Always check NSIDs after reattach
--- drivers/nvme/host/core.c | 14 +++++++++++--- drivers/nvme/host/multipath.c | 11 +++++++++-- drivers/nvme/host/nvme.h | 11 ++--------- 3 files changed, 22 insertions(+), 14 deletions(-)
drivers/nvme/host/core.c +11 -3
@@ -3813,6 +3813,8 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid,static void nvme_ns_remove (struct nvme_ns *ns) { +bool last_path = false; +if (test_and_set_bit (NVME_NS_REMOVING , &ns->flags))return ;
@@ -3821,8 +3823,6 @@ static void nvme_ns_remove(struct nvme_ns *ns)mutex_lock (&ns->ctrl->subsys->lock);list_del_rcu (&ns->siblings); -if (list_empty (&ns->head->list)) -list_del_init (&ns->head->entry);mutex_unlock (&ns->ctrl->subsys->lock);synchronize_rcu ();/* guarantee not available in head->list */
@@ -3842,7 +3842,15 @@ static void nvme_ns_remove(struct nvme_ns *ns)list_del_init (&ns->list);up_write (&ns->ctrl->namespaces_rwsem); -nvme_mpath_check_last_path (ns); +/* Synchronize with nvme_init_ns_head() */ +mutex_lock (&ns->head->subsys->lock); +if (list_empty (&ns->head->list)) { +list_del_init (&ns->head->entry); + last_path = true; + } +mutex_unlock (&ns->head->subsys->lock); +if (last_path) +nvme_mpath_check_last_path (ns->head);nvme_put_ns (ns); }
drivers/nvme/host/multipath.c +9 -2
@@ -771,20 +771,27 @@ void nvme_mpath_add_disk(struct nvme_ns *ns, struct nvme_id_ns *id)#endif } -void nvme_mpath_remove_disk (struct nvme_ns_head *head) +void nvme_mpath_check_last_path (struct nvme_ns_head *head) {if (!head->disk)return ; +kblockd_schedule_work (&head->requeue_work);if (head->disk->flags &GENHD_FL_UP ) {nvme_cdev_del (&head->cdev, &head->cdev_device);del_gendisk (head->disk); } +} + +void nvme_mpath_remove_disk (struct nvme_ns_head *head) +{ +if (!head->disk) +return ;blk_set_queue_dying (head->disk->queue);/* make sure all pending bios are cleaned up */ kblockd_schedule_work (&head->requeue_work);flush_work (&head->requeue_work);blk_cleanup_queue (head->disk->queue); -if (!test_bit (NVME_NSHEAD_DISK_LIVE , &head->flags)) { +if (!test_and_clear_bit (NVME_NSHEAD_DISK_LIVE , &head->flags)) {/* * if device_add_disk wasn't called, prevent * disk release to put a bogus reference on the
drivers/nvme/host/nvme.h +2 -9
@@ -716,14 +716,7 @@ void nvme_mpath_uninit(struct nvme_ctrl *ctrl);void nvme_mpath_stop (struct nvme_ctrl *ctrl);bool nvme_mpath_clear_current_path (struct nvme_ns *ns);void nvme_mpath_clear_ctrl_paths (struct nvme_ctrl *ctrl); - -static inline void nvme_mpath_check_last_path (struct nvme_ns *ns) -{ -struct nvme_ns_head *head = ns->head; - -if (head->disk &&list_empty (&head->list)) -kblockd_schedule_work (&head->requeue_work); -} +void nvme_mpath_check_last_path (struct nvme_ns_head *head);static inline void nvme_trace_bio_complete (struct request *req) {
@@ -772,7 +765,7 @@ static inline bool nvme_mpath_clear_current_path(struct nvme_ns *ns)static inline void nvme_mpath_clear_ctrl_paths (struct nvme_ctrl *ctrl) { } -static inline void nvme_mpath_check_last_path (struct nvme_ns *ns) +static inline void nvme_mpath_check_last_path (struct nvme_ns_head *head) { }static inline void nvme_trace_bio_complete (struct request *req)
Signature · 7 lines
2.29.2 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Quoted 27 lines · Hannes Reinecke
When the last path to a
ns_headdrops the current code
removes thens_headfrom the subsystem list, but will only delete the disk itself if the last reference to thens_headdrops. This is causing an refcounting imbalance eg when applications have a reference to the disk, as then they'll never get notified that the disk is in fact dead.
This patch moves the call 'del_gendisk' intonvme_mpath_check_last_path(), ensuring that the disk can be properly removed and applications get the appropriate notifications.Changes to v7:
- Move thelist_del()call outside ofnvme_mpath_check_last_path()Changes to v6:
- Move thelist_del()intonvme_mpath_check_last_path()
- Drop the tests forGENHD_FL_UP
Changes to v5:
- Synchronize betweennvme_init_ns_head()andnvme_mpath_check_last_path()
- Check for removed gendisk innvme_ns_head_submit_bio()Changes to v4:
- Calldel_gendisk()innvme_mpath_check_last_path()to avoid deadlock Changes to v3:
- Simplifyif()clause to detect duplicate namespaces
Changes to v2:
- Dropmemcpy()statement
Changes to v1:
- Always check NSIDs after reattach
Quoted 7 lines
Signed-off-by Hannes Reinecke <[email protected]>--- drivers/nvme/host/core.c | 14 +++++++++++--- drivers/nvme/host/multipath.c | 11 +++++++++-- drivers/nvme/host/nvme.h | 11 ++--------- 3 files changed, 22 insertions(+), 14 deletions(-)
Ping?
Any issues left to be resolved?
Cheers,
Hannes
Signature · 9 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), GF: Felix Imendörffer _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Quoted 9 lines · Hannes Reinecke
When the last path to a
ns_headdrops the current code
removes thens_headfrom the subsystem list, but will only delete the disk itself if the last reference to thens_headdrops. This is causing an refcounting imbalance eg when applications have a reference to the disk, as then they'll never get notified that the disk is in fact dead.
This patch moves the call 'del_gendisk' intonvme_mpath_check_last_path(), ensuring that the disk can be properly removed and applications get the appropriate notifications.
I think you may have tried every possible way to address the underlying issue. :)
This most recent one looks good to me, too.
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Christoph Hellwig
maintainerQuoted 8 lines
Changes to v7:
- Move thelist_del()call outside ofnvme_mpath_check_last_path()Changes to v6:
- Move thelist_del()intonvme_mpath_check_last_path()
- Drop the tests forGENHD_FL_UP
Changes to v5:
- Synchronize betweennvme_init_ns_head()andnvme_mpath_check_last_path()
- Check for removed gendisk innvme_ns_head_submit_bio()
Quoted 8 lines
Changes to v4:
- Calldel_gendisk()innvme_mpath_check_last_path()to avoid deadlock Changes to v3:
- Simplifyif()clause to detect duplicate namespaces Changes to v2:
- Dropmemcpy()statement
Changes to v1:
- Always check NSIDs after reattach
The changelog belongs under the ---.
The patch also does not actually apply due to changes in 5.14-rc, so please respin it.
drivers/nvme/host/core.c static void nvme_ns_remove(struct nvme_ns *ns) · line 3853
Quoted 10 lines
drivers/nvme/host/core.c +9
-1-nvme_mpath_check_last_path (ns); +/* Synchronize with nvme_init_ns_head() */ +mutex_lock (&ns->head->subsys->lock); +if (list_empty (&ns->head->list)) { +list_del_init (&ns->head->entry); + last_path = true; + } +mutex_unlock (&ns->head->subsys->lock); +if (last_path) +nvme_mpath_check_last_path (ns->head);
And while we're at it - nvme_mpath_check_last_path is a little misnamed now as we know this is the last path when we call it now. Maybe this function should inherit the nvme_mpath_remove_disk name and ther other half should become nvme_mpath_cleanup_disk?
drivers/nvme/host/multipath.c void nvme_mpath_add_disk(struct nvme_ns *ns, struct nvme_id_ns *id) · line 794
Quoted 11 lines
drivers/nvme/host/multipath.c +5
-1+void nvme_mpath_remove_disk (struct nvme_ns_head *head) +{ +if (!head->disk) +return ;blk_set_queue_dying (head->disk->queue);/* make sure all pending bios are cleaned up */ kblockd_schedule_work (&head->requeue_work);flush_work (&head->requeue_work);blk_cleanup_queue (head->disk->queue); -if (!test_bit (NVME_NSHEAD_DISK_LIVE , &head->flags)) { +if (!test_and_clear_bit (NVME_NSHEAD_DISK_LIVE , &head->flags)) {
This is where the conflict happens. But given that with the above changes we can't find the ns_head any more once nvme_ns_remove decided it actually is the last path I don't think we even need to clear NVME_NSHEAD_DISK_LIVE any more. This was only needed when we tried to reuse the ns_head.
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme