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

Commit 293441e4 authored by Mike Snitzer's avatar Mike Snitzer Committed by Greg Kroah-Hartman
Browse files

dm mpath: check if path's request_queue is dying in activate_path() 



commit f10e06b744074824fb8ec7066bc03ecc90918f5b upstream.

If pg_init_retries is set and a request is queued against a multipath
device with all underlying block device request_queues in the "dying"
state then an infinite loop is triggered because activate_path() never
succeeds and hence never calls pg_init_done().

This change avoids that device removal triggers an infinite loop by
failing the activate_path() which causes the "dying" path to be failed.

Reported-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bf74a108

drivers/md/dm-mpath.c

+3 −3
Original line number Diff line number Diff line
@@ -1220,10 +1220,10 @@ static void activate_path(struct work_struct *work) 
{

	struct pgpath *pgpath =

		container_of(work, struct pgpath, activate_path.work);

	struct request_queue *q = bdev_get_queue(pgpath->path.dev->bdev);



	if (pgpath->is_active)

		scsi_dh_activate(bdev_get_queue(pgpath->path.dev->bdev),

				 pg_init_done, pgpath);

	if (pgpath->is_active && !blk_queue_dying(q))

		scsi_dh_activate(q, pg_init_done, pgpath);

	else

		pg_init_done(pgpath, SCSI_DH_DEV_OFFLINED);

}