dm mpath: switch paths in dm_blk_ioctl() code path
authorMartin Wilck <mwilck@suse.com>
Mon, 20 Apr 2020 20:29:09 +0000 (22:29 +0200)
committerMike Snitzer <snitzer@redhat.com>
Fri, 15 May 2020 14:29:35 +0000 (10:29 -0400)
SCSI LUN passthrough code such as qemu's "scsi-block" device model
pass every IO to the host via SG_IO ioctls. Currently, dm-multipath
calls choose_pgpath() only in the block IO code path, not in the ioctl
code path (unless current_pgpath is NULL). This has the effect that no
path switching and thus no load balancing is done for SCSI-passthrough
IO, unless the active path fails.

Fix this by using the same logic in multipath_prepare_ioctl() as in
multipath_clone_and_map().

Note: The allegedly best path selection algorithm, service-time,
still wouldn't work perfectly, because the io size of the current
request is always set to 0. Changing that for the IO passthrough
case would require the ioctl cmd and arg to be passed to dm's
prepare_ioctl() method.

Signed-off-by: Martin Wilck <mwilck@suse.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
drivers/md/dm-mpath.c

index 3e500098132f1307ae82259a2aba1ec324496bf7..e0c800cf87a9bb69f9671d27494094fc8ddf2f99 100644 (file)
@@ -1918,7 +1918,7 @@ static int multipath_prepare_ioctl(struct dm_target *ti,
        int r;
 
        current_pgpath = READ_ONCE(m->current_pgpath);
-       if (!current_pgpath)
+       if (!current_pgpath || !test_bit(MPATHF_QUEUE_IO, &m->flags))
                current_pgpath = choose_pgpath(m, 0);
 
        if (current_pgpath) {