Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36715cf4 authored by James Smart's avatar James Smart Committed by Jens Axboe
Browse files

nvme_fc: replace ioabort msleep loop with completion 

Per the recommendation by Sagi on:
http://lists.infradead.org/pipermail/linux-nvme/2017-April/009261.html



Wait for io aborts to complete wait converted from msleep look to
using a struct completion.

Signed-off-by: default avatarJames Smart <james.smart@broadcom.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent b4dfd6ee

drivers/nvme/host/fc.c

+6 −7
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ struct nvme_fc_ctrl { 
	struct kref		ref;

	u32			flags;

	u32			iocnt;

	wait_queue_head_t	ioabort_wait;



	struct nvme_fc_fcp_op	aen_ops[NVME_FC_NR_AEN_COMMANDS];
@@ -1239,8 +1240,10 @@ __nvme_fc_fcpop_chk_teardowns(struct nvme_fc_ctrl *ctrl, 


	spin_lock_irqsave(&ctrl->lock, flags);

	if (unlikely(op->flags & FCOP_FLAGS_TERMIO)) {

		if (ctrl->flags & FCCTRL_TERMIO)

			ctrl->iocnt--;

		if (ctrl->flags & FCCTRL_TERMIO) {

			if (!--ctrl->iocnt)

				wake_up(&ctrl->ioabort_wait);

		}

	}

	if (op->flags & FCOP_FLAGS_RELEASED)

		complete_rq = true;
@@ -2476,11 +2479,7 @@ nvme_fc_delete_association(struct nvme_fc_ctrl *ctrl) 


	/* wait for all io that had to be aborted */

	spin_lock_irqsave(&ctrl->lock, flags);

	while (ctrl->iocnt) {

		spin_unlock_irqrestore(&ctrl->lock, flags);

		msleep(1000);

		spin_lock_irqsave(&ctrl->lock, flags);

	}

	wait_event_lock_irq(ctrl->ioabort_wait, ctrl->iocnt == 0, ctrl->lock);

	ctrl->flags &= ~FCCTRL_TERMIO;

	spin_unlock_irqrestore(&ctrl->lock, flags);