diff options
| author |   Jens Axboe <axboe@fb.com> | 2015-06-27 11:47:07 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-06-27 11:47:07 -0600 |
| commit | 6443af9855dad721375349af036449becc62b632 (patch) | |
| tree | 89457541627f3dd98524c4d40c23d22c4654ba36 /drivers/block/xen-blkback/blkback.c | |
| parent | bdi: Remove "inline" keyword from exported I_BDEV() implementation (diff) | |
| parent | drivers: xen-blkfront: only talk_to_blkback() when in XenbusStateInitialising (diff) | |
| download | linux-dev-6443af9855dad721375349af036449becc62b632.tar.xz linux-dev-6443af9855dad721375349af036449becc62b632.zip | |
Merge branch 'stable/for-jens-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus
Diffstat (limited to 'drivers/block/xen-blkback/blkback.c')
| -rw-r--r-- | drivers/block/xen-blkback/blkback.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c index 713fc9ff1149..2126842fb6e8 100644 --- a/drivers/block/xen-blkback/blkback.c +++ b/drivers/block/xen-blkback/blkback.c @@ -84,6 +84,13 @@ MODULE_PARM_DESC(max_persistent_grants, "Maximum number of grants to map persistently"); /* + * Maximum order of pages to be used for the shared ring between front and + * backend, 4KB page granularity is used. + */ +unsigned int xen_blkif_max_ring_order = XENBUS_MAX_RING_PAGE_ORDER; +module_param_named(max_ring_page_order, xen_blkif_max_ring_order, int, S_IRUGO); +MODULE_PARM_DESC(max_ring_page_order, "Maximum order of pages to be used for the shared ring"); +/* * The LRU mechanism to clean the lists of persistent grants needs to * be executed periodically. The time interval between consecutive executions * of the purge mechanism is set in ms. @@ -1438,6 +1445,12 @@ static int __init xen_blkif_init(void) if (!xen_domain()) return -ENODEV; + if (xen_blkif_max_ring_order > XENBUS_MAX_RING_PAGE_ORDER) { + pr_info("Invalid max_ring_order (%d), will use default max: %d.\n", + xen_blkif_max_ring_order, XENBUS_MAX_RING_PAGE_ORDER); + xen_blkif_max_ring_order = XENBUS_MAX_RING_PAGE_ORDER; + } + rc = xen_blkif_interface_init(); if (rc) goto failed_init; |