Commit 479a322f authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Christoph Hellwig
Browse files

nvme-mpath: fix last path removal during traffic 



In case our last path is removed during traffic, we can end up requeueing
the bio(s) but never schedule the actual requeue work as upper layers
still have open handles on the mpath device node.

Fix this by scheduling requeue work if the namespace being removed is
the last path in the ns_head path list.

Fixes: 32acab31 ("nvme: implement multipath access to nvme subsystems")
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent d5bf4b7f

drivers/nvme/host/core.c

+1 −0
Original line number Diff line number Diff line
@@ -2991,6 +2991,7 @@ static void nvme_ns_remove(struct nvme_ns *ns) 
	mutex_unlock(&ns->ctrl->namespaces_mutex);



	synchronize_srcu(&ns->head->srcu);

	nvme_mpath_check_last_path(ns);

	nvme_put_ns(ns);

}

drivers/nvme/host/nvme.h

+12 −0
Original line number Diff line number Diff line
@@ -417,6 +417,15 @@ static inline void nvme_mpath_clear_current_path(struct nvme_ns *ns) 
		rcu_assign_pointer(head->current_path, NULL);

}

struct nvme_ns *nvme_find_path(struct nvme_ns_head *head);



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);

}



#else

static inline void nvme_failover_req(struct request *req)

{
@@ -448,6 +457,9 @@ static inline void nvme_mpath_remove_disk_links(struct nvme_ns *ns) 
static inline void nvme_mpath_clear_current_path(struct nvme_ns *ns)

{

}

static inline void nvme_mpath_check_last_path(struct nvme_ns *ns)

{

}

#endif /* CONFIG_NVME_MULTIPATH */



#ifdef CONFIG_NVM

CRA Git | Maintained and supported by SUSTech CRA and CCSE