diff options
author | Christoph Hellwig <hch@lst.de> | 2014-01-17 06:06:53 -0500 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2014-07-25 17:16:28 -0400 |
commit | d285203cf647d7c97db3a1c33794315c9008593f (patch) | |
tree | a28a0a902cf3f467e326a02f5632b917b75c56a3 /drivers/scsi/hosts.c | |
parent | c53c6d6a68b13b1dff2892551b56cfdc07887d9e (diff) |
scsi: add support for a blk-mq based I/O path.
This patch adds support for an alternate I/O path in the scsi midlayer
which uses the blk-mq infrastructure instead of the legacy request code.
Use of blk-mq is fully transparent to drivers, although for now a host
template field is provided to opt out of blk-mq usage in case any unforseen
incompatibilities arise.
In general replacing the legacy request code with blk-mq is a simple and
mostly mechanical transformation. The biggest exception is the new code
that deals with the fact the I/O submissions in blk-mq must happen from
process context, which slightly complicates the I/O completion handler.
The second biggest differences is that blk-mq is build around the concept
of preallocated requests that also include driver specific data, which
in SCSI context means the scsi_cmnd structure. This completely avoids
dynamic memory allocations for the fast path through I/O submission.
Due the preallocated requests the MQ code path exclusively uses the
host-wide shared tag allocator instead of a per-LUN one. This only
affects drivers actually using the block layer provided tag allocator
instead of their own. Unlike the old path blk-mq always provides a tag,
although drivers don't have to use it.
For now the blk-mq path is disable by defauly and must be enabled using
the "use_blk_mq" module parameter. Once the remaining work in the block
layer to make blk-mq more suitable for slow devices is complete I hope
to make it the default and eventually even remove the old code path.
Based on the earlier scsi-mq prototype by Nicholas Bellinger.
Thanks to Bart Van Assche and Robert Elliot for testing, benchmarking and
various sugestions and code contributions.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Webb Scales <webbnh@hp.com>
Acked-by: Jens Axboe <axboe@kernel.dk>
Tested-by: Bart Van Assche <bvanassche@acm.org>
Tested-by: Robert Elliott <elliott@hp.com>
Diffstat (limited to 'drivers/scsi/hosts.c')
-rw-r--r-- | drivers/scsi/hosts.c | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index 0632eee82620..6de80e352871 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c | |||
@@ -213,9 +213,24 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev, | |||
213 | goto fail; | 213 | goto fail; |
214 | } | 214 | } |
215 | 215 | ||
216 | if (shost_use_blk_mq(shost)) { | ||
217 | error = scsi_mq_setup_tags(shost); | ||
218 | if (error) | ||
219 | goto fail; | ||
220 | } | ||
221 | |||
222 | /* | ||
223 | * Note that we allocate the freelist even for the MQ case for now, | ||
224 | * as we need a command set aside for scsi_reset_provider. Having | ||
225 | * the full host freelist and one command available for that is a | ||
226 | * little heavy-handed, but avoids introducing a special allocator | ||
227 | * just for this. Eventually the structure of scsi_reset_provider | ||
228 | * will need a major overhaul. | ||
229 | */ | ||
216 | error = scsi_setup_command_freelist(shost); | 230 | error = scsi_setup_command_freelist(shost); |
217 | if (error) | 231 | if (error) |
218 | goto fail; | 232 | goto out_destroy_tags; |
233 | |||
219 | 234 | ||
220 | if (!shost->shost_gendev.parent) | 235 | if (!shost->shost_gendev.parent) |
221 | shost->shost_gendev.parent = dev ? dev : &platform_bus; | 236 | shost->shost_gendev.parent = dev ? dev : &platform_bus; |
@@ -226,7 +241,7 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev, | |||
226 | 241 | ||
227 | error = device_add(&shost->shost_gendev); | 242 | error = device_add(&shost->shost_gendev); |
228 | if (error) | 243 | if (error) |
229 | goto out; | 244 | goto out_destroy_freelist; |
230 | 245 | ||
231 | pm_runtime_set_active(&shost->shost_gendev); | 246 | pm_runtime_set_active(&shost->shost_gendev); |
232 | pm_runtime_enable(&shost->shost_gendev); | 247 | pm_runtime_enable(&shost->shost_gendev); |
@@ -279,8 +294,11 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev, | |||
279 | device_del(&shost->shost_dev); | 294 | device_del(&shost->shost_dev); |
280 | out_del_gendev: | 295 | out_del_gendev: |
281 | device_del(&shost->shost_gendev); | 296 | device_del(&shost->shost_gendev); |
282 | out: | 297 | out_destroy_freelist: |
283 | scsi_destroy_command_freelist(shost); | 298 | scsi_destroy_command_freelist(shost); |
299 | out_destroy_tags: | ||
300 | if (shost_use_blk_mq(shost)) | ||
301 | scsi_mq_destroy_tags(shost); | ||
284 | fail: | 302 | fail: |
285 | return error; | 303 | return error; |
286 | } | 304 | } |
@@ -309,8 +327,13 @@ static void scsi_host_dev_release(struct device *dev) | |||
309 | } | 327 | } |
310 | 328 | ||
311 | scsi_destroy_command_freelist(shost); | 329 | scsi_destroy_command_freelist(shost); |
312 | if (shost->bqt) | 330 | if (shost_use_blk_mq(shost)) { |
313 | blk_free_tags(shost->bqt); | 331 | if (shost->tag_set.tags) |
332 | scsi_mq_destroy_tags(shost); | ||
333 | } else { | ||
334 | if (shost->bqt) | ||
335 | blk_free_tags(shost->bqt); | ||
336 | } | ||
314 | 337 | ||
315 | kfree(shost->shost_data); | 338 | kfree(shost->shost_data); |
316 | 339 | ||
@@ -436,6 +459,8 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize) | |||
436 | else | 459 | else |
437 | shost->dma_boundary = 0xffffffff; | 460 | shost->dma_boundary = 0xffffffff; |
438 | 461 | ||
462 | shost->use_blk_mq = scsi_use_blk_mq && !shost->hostt->disable_blk_mq; | ||
463 | |||
439 | device_initialize(&shost->shost_gendev); | 464 | device_initialize(&shost->shost_gendev); |
440 | dev_set_name(&shost->shost_gendev, "host%d", shost->host_no); | 465 | dev_set_name(&shost->shost_gendev, "host%d", shost->host_no); |
441 | shost->shost_gendev.bus = &scsi_bus_type; | 466 | shost->shost_gendev.bus = &scsi_bus_type; |