]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
dm: fix ioctl retry termination with signal
authorJunichi Nomura <j-nomura@ce.jp.nec.com>
Tue, 17 Nov 2015 09:39:26 +0000 (09:39 +0000)
committerMike Snitzer <snitzer@redhat.com>
Tue, 17 Nov 2015 19:04:32 +0000 (14:04 -0500)
commit5bbbfdf685657771fda05b926b28ca0f79163a28
tree5266917a2b2c0bacc0931139ef1db6dc81311ad9
parent172c238612ebf81cabccc86b788c9209af591f61
dm: fix ioctl retry termination with signal

dm-mpath retries ioctl, when no path is readily available and the device
is configured to queue I/O in such a case. If you want to stop the retry
before multipathd decides to turn off queueing mode, you could send
signal for the process to exit from the loop.

However the check of fatal signal has not carried along when commit
6c182cd88d17 ("dm mpath: fix ioctl deadlock when no paths") moved the
loop from dm-mpath to dm core. As a result, we can't terminate such
a process in the retry loop.

Easy reproducer of the situation is:

  # dmsetup create mp --table '0 1024 multipath 0 0 0 0'
  # dmsetup message mp 0 'queue_if_no_path'
  # sg_inq /dev/mapper/mp

then you should be able to terminate sg_inq by pressing Ctrl+C.

Fixes: 6c182cd88d17 ("dm mpath: fix ioctl deadlock when no paths")
Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Cc: stable@vger.kernel.org
drivers/md/dm-mpath.c
drivers/md/dm.c