nvmet-fc: take ref count on tgtport before delete assoc
[ Upstream commit fe506a74589326183297d5abdda02d0c76ae5a8b ] We have to ensure that the tgtport is not going away before be have remove all the associations. Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Daniel Wagner <dwagner@suse.de> Signed-off-by: Keith Busch <kbusch@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
9e6987f893
commit
f9eef0e495
|
@ -1092,13 +1092,28 @@ nvmet_fc_alloc_hostport(struct nvmet_fc_tgtport *tgtport, void *hosthandle)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
nvmet_fc_delete_assoc(struct work_struct *work)
|
nvmet_fc_delete_assoc(struct nvmet_fc_tgt_assoc *assoc)
|
||||||
|
{
|
||||||
|
nvmet_fc_delete_target_assoc(assoc);
|
||||||
|
nvmet_fc_tgt_a_put(assoc);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
nvmet_fc_delete_assoc_work(struct work_struct *work)
|
||||||
{
|
{
|
||||||
struct nvmet_fc_tgt_assoc *assoc =
|
struct nvmet_fc_tgt_assoc *assoc =
|
||||||
container_of(work, struct nvmet_fc_tgt_assoc, del_work);
|
container_of(work, struct nvmet_fc_tgt_assoc, del_work);
|
||||||
|
struct nvmet_fc_tgtport *tgtport = assoc->tgtport;
|
||||||
|
|
||||||
nvmet_fc_delete_target_assoc(assoc);
|
nvmet_fc_delete_assoc(assoc);
|
||||||
nvmet_fc_tgt_a_put(assoc);
|
nvmet_fc_tgtport_put(tgtport);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
nvmet_fc_schedule_delete_assoc(struct nvmet_fc_tgt_assoc *assoc)
|
||||||
|
{
|
||||||
|
nvmet_fc_tgtport_get(assoc->tgtport);
|
||||||
|
queue_work(nvmet_wq, &assoc->del_work);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct nvmet_fc_tgt_assoc *
|
static struct nvmet_fc_tgt_assoc *
|
||||||
|
@ -1132,7 +1147,7 @@ nvmet_fc_alloc_target_assoc(struct nvmet_fc_tgtport *tgtport, void *hosthandle)
|
||||||
assoc->a_id = idx;
|
assoc->a_id = idx;
|
||||||
INIT_LIST_HEAD(&assoc->a_list);
|
INIT_LIST_HEAD(&assoc->a_list);
|
||||||
kref_init(&assoc->ref);
|
kref_init(&assoc->ref);
|
||||||
INIT_WORK(&assoc->del_work, nvmet_fc_delete_assoc);
|
INIT_WORK(&assoc->del_work, nvmet_fc_delete_assoc_work);
|
||||||
atomic_set(&assoc->terminating, 0);
|
atomic_set(&assoc->terminating, 0);
|
||||||
|
|
||||||
while (needrandom) {
|
while (needrandom) {
|
||||||
|
@ -1491,7 +1506,7 @@ __nvmet_fc_free_assocs(struct nvmet_fc_tgtport *tgtport)
|
||||||
list_for_each_entry_rcu(assoc, &tgtport->assoc_list, a_list) {
|
list_for_each_entry_rcu(assoc, &tgtport->assoc_list, a_list) {
|
||||||
if (!nvmet_fc_tgt_a_get(assoc))
|
if (!nvmet_fc_tgt_a_get(assoc))
|
||||||
continue;
|
continue;
|
||||||
queue_work(nvmet_wq, &assoc->del_work);
|
nvmet_fc_schedule_delete_assoc(assoc);
|
||||||
nvmet_fc_tgt_a_put(assoc);
|
nvmet_fc_tgt_a_put(assoc);
|
||||||
}
|
}
|
||||||
rcu_read_unlock();
|
rcu_read_unlock();
|
||||||
|
@ -1545,7 +1560,7 @@ nvmet_fc_invalidate_host(struct nvmet_fc_target_port *target_port,
|
||||||
continue;
|
continue;
|
||||||
assoc->hostport->invalid = 1;
|
assoc->hostport->invalid = 1;
|
||||||
noassoc = false;
|
noassoc = false;
|
||||||
queue_work(nvmet_wq, &assoc->del_work);
|
nvmet_fc_schedule_delete_assoc(assoc);
|
||||||
nvmet_fc_tgt_a_put(assoc);
|
nvmet_fc_tgt_a_put(assoc);
|
||||||
}
|
}
|
||||||
spin_unlock_irqrestore(&tgtport->lock, flags);
|
spin_unlock_irqrestore(&tgtport->lock, flags);
|
||||||
|
@ -1590,7 +1605,7 @@ nvmet_fc_delete_ctrl(struct nvmet_ctrl *ctrl)
|
||||||
nvmet_fc_tgtport_put(tgtport);
|
nvmet_fc_tgtport_put(tgtport);
|
||||||
|
|
||||||
if (found_ctrl) {
|
if (found_ctrl) {
|
||||||
queue_work(nvmet_wq, &assoc->del_work);
|
nvmet_fc_schedule_delete_assoc(assoc);
|
||||||
nvmet_fc_tgt_a_put(assoc);
|
nvmet_fc_tgt_a_put(assoc);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -1897,7 +1912,7 @@ nvmet_fc_ls_disconnect(struct nvmet_fc_tgtport *tgtport,
|
||||||
nvmet_fc_xmt_ls_rsp(tgtport, oldls);
|
nvmet_fc_xmt_ls_rsp(tgtport, oldls);
|
||||||
}
|
}
|
||||||
|
|
||||||
queue_work(nvmet_wq, &assoc->del_work);
|
nvmet_fc_schedule_delete_assoc(assoc);
|
||||||
nvmet_fc_tgt_a_put(assoc);
|
nvmet_fc_tgt_a_put(assoc);
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Reference in New Issue