From: Steffen Maier <maier@linux.ibm.com>
To: "James E . J . Bottomley" <jejb@linux.ibm.com>,
"Martin K . Petersen" <martin.petersen@oracle.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Ming Lei <ming.lei@redhat.com>
Cc: linux-next@vger.kernel.org, linux-scsi@vger.kernel.org,
linux-block@vger.kernel.org, dm-devel@redhat.com,
linux-s390@vger.kernel.org, Benjamin Block <bblock@linux.ibm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Steffen Maier <maier@linux.ibm.com>,
Bart Van Assche <bvanassche@acm.org>,
Hannes Reinecke <hare@suse.com>, Jens Axboe <axboe@kernel.dk>,
"Ewan D . Milne" <emilne@redhat.com>,
Christoph Hellwig <hch@lst.de>, Mike Snitzer <snitzer@redhat.com>
Subject: [PATCH 2/2] scsi: core: fix dh and multipathing for SCSI hosts without request batching
Date: Wed, 7 Aug 2019 16:49:48 +0200 [thread overview]
Message-ID: <20190807144948.28265-3-maier@linux.ibm.com> (raw)
In-Reply-To: <20190807144948.28265-1-maier@linux.ibm.com>
This was missing from scsi_device_from_queue() due to the introduction
of another new scsi_mq_ops_no_commit of linux-next commit
8930a6c20791 ("scsi: core: add support for request batching")
from Martin's scsi/5.4/scsi-queue or James' scsi/misc.
Only devicehandler code seems to call scsi_device_from_queue():
*** drivers/scsi/scsi_dh.c:
scsi_dh_activate[255] sdev = scsi_device_from_queue(q);
scsi_dh_set_params[302] sdev = scsi_device_from_queue(q);
scsi_dh_attach[325] sdev = scsi_device_from_queue(q);
scsi_dh_attached_handler_name[363] sdev = scsi_device_from_queue(q);
Fixes multipath tools follow-on errors:
$ multipath -v6
...
libdevmapper: ioctl/libdm-iface.c(1887): device-mapper: reload ioctl on mpatha failed: No such device
...
mpatha: failed to load map, error 19
...
showing also as kernel messages:
device-mapper: table: 252:0: multipath: error attaching hardware handler
device-mapper: ioctl: error adding target to table
Signed-off-by: Steffen Maier <maier@linux.ibm.com>
Fixes: 8930a6c20791 ("scsi: core: add support for request batching")
Cc: Paolo Bonzini <pbonzini@redhat.com>
---
drivers/scsi/scsi_lib.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 90c257622bb0..73e7d29fbd66 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1922,7 +1922,8 @@ struct scsi_device *scsi_device_from_queue(struct request_queue *q)
{
struct scsi_device *sdev = NULL;
- if (q->mq_ops == &scsi_mq_ops)
+ if (q->mq_ops == &scsi_mq_ops_no_commit ||
+ q->mq_ops == &scsi_mq_ops)
sdev = q->queuedata;
if (!sdev || !get_device(&sdev->sdev_gendev))
sdev = NULL;
--
2.17.1
next prev parent reply other threads:[~2019-08-07 14:50 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-07 14:49 [PATCH 0/2] scsi: core: regression fixes for request batching Steffen Maier
2019-08-07 14:49 ` [PATCH 1/2] scsi: core: fix missing .cleanup_rq for SCSI hosts without " Steffen Maier
2019-08-07 23:32 ` Ming Lei
2019-08-08 2:18 ` Martin K. Petersen
2019-09-18 15:09 ` Steffen Maier
2019-09-18 15:22 ` Martin K. Petersen
2019-09-18 15:32 ` Mark Brown
2019-08-08 5:52 ` kbuild test robot
2019-08-09 1:56 ` kbuild test robot
2019-08-07 14:49 ` Steffen Maier [this message]
2019-08-08 6:02 ` [PATCH 2/2] scsi: core: fix dh and multipathing " kbuild test robot
2019-08-09 9:08 ` kbuild test robot
2019-08-07 16:17 ` [PATCH 0/2] scsi: core: regression fixes for " Paolo Bonzini
2019-08-07 17:08 ` Bart Van Assche
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190807144948.28265-3-maier@linux.ibm.com \
--to=maier@linux.ibm.com \
--cc=axboe@kernel.dk \
--cc=bblock@linux.ibm.com \
--cc=bvanassche@acm.org \
--cc=dm-devel@redhat.com \
--cc=emilne@redhat.com \
--cc=gor@linux.ibm.com \
--cc=hare@suse.com \
--cc=hch@lst.de \
--cc=heiko.carstens@de.ibm.com \
--cc=jejb@linux.ibm.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=ming.lei@redhat.com \
--cc=pbonzini@redhat.com \
--cc=snitzer@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).