Skip to content

Commit f2537be

Browse files
igawkeithbusch
authored andcommitted
nvmet-fc: avoid scheduling association deletion twice
When forcefully shutting down a port via the configfs interface, nvmet_port_subsys_drop_link() first calls nvmet_port_del_ctrls() and then nvmet_disable_port(). Both functions will eventually schedule all remaining associations for deletion. The current implementation checks whether an association is about to be removed, but only after the work item has already been scheduled. As a result, it is possible for the first scheduled work item to free all resources, and then for the same work item to be scheduled again for deletion. Because the association list is an RCU list, it is not possible to take a lock and remove the list entry directly, so it cannot be looked up again. Instead, a flag (terminating) must be used to determine whether the association is already in the process of being deleted. Reported-by: Shinichiro Kawasaki <shinichiro.kawasaki@wdc.com> Closes: https://lore.kernel.org/all/rsdinhafrtlguauhesmrrzkybpnvwantwmyfq2ih5aregghax5@mhr7v3eryci3/ Reviewed-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Daniel Wagner <wagi@kernel.org> Signed-off-by: Keith Busch <kbusch@kernel.org>
1 parent db5a540 commit f2537be

1 file changed

Lines changed: 9 additions & 7 deletions

File tree

  • drivers/nvme/target

drivers/nvme/target/fc.c

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,6 +1075,14 @@ nvmet_fc_delete_assoc_work(struct work_struct *work)
10751075
static void
10761076
nvmet_fc_schedule_delete_assoc(struct nvmet_fc_tgt_assoc *assoc)
10771077
{
1078+
int terminating;
1079+
1080+
terminating = atomic_xchg(&assoc->terminating, 1);
1081+
1082+
/* if already terminating, do nothing */
1083+
if (terminating)
1084+
return;
1085+
10781086
nvmet_fc_tgtport_get(assoc->tgtport);
10791087
if (!queue_work(nvmet_wq, &assoc->del_work))
10801088
nvmet_fc_tgtport_put(assoc->tgtport);
@@ -1202,13 +1210,7 @@ nvmet_fc_delete_target_assoc(struct nvmet_fc_tgt_assoc *assoc)
12021210
{
12031211
struct nvmet_fc_tgtport *tgtport = assoc->tgtport;
12041212
unsigned long flags;
1205-
int i, terminating;
1206-
1207-
terminating = atomic_xchg(&assoc->terminating, 1);
1208-
1209-
/* if already terminating, do nothing */
1210-
if (terminating)
1211-
return;
1213+
int i;
12121214

12131215
spin_lock_irqsave(&tgtport->lock, flags);
12141216
list_del_rcu(&assoc->a_list);

0 commit comments

Comments
 (0)