aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlya Dryomov <idryomov@redhat.com>2014-10-10 10:36:07 -0400
committerSage Weil <sage@redhat.com>2014-10-14 15:57:05 -0400
commit792c3a914910bd34302c5345578f85cfcb5e2c01 (patch)
tree468b46ac85092eb3b0e728c7614a753855b68722
parentf9865f06f7f18c6661c88d0511f05c48612319cc (diff)
rbd: rbd workqueues need a resque worker
Need to use WQ_MEM_RECLAIM for our workqueues to prevent I/O lockups under memory pressure - we sit on the memory reclaim path. Cc: stable@vger.kernel.org # 3.17, needs backporting for 3.16 Signed-off-by: Ilya Dryomov <idryomov@redhat.com> Tested-by: Micha Krause <micha@krausam.de> Reviewed-by: Sage Weil <sage@redhat.com>
-rw-r--r--drivers/block/rbd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 7712ae65753c..0a54c588e433 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -5242,7 +5242,8 @@ static int rbd_dev_device_setup(struct rbd_device *rbd_dev)
5242 set_capacity(rbd_dev->disk, rbd_dev->mapping.size / SECTOR_SIZE); 5242 set_capacity(rbd_dev->disk, rbd_dev->mapping.size / SECTOR_SIZE);
5243 set_disk_ro(rbd_dev->disk, rbd_dev->mapping.read_only); 5243 set_disk_ro(rbd_dev->disk, rbd_dev->mapping.read_only);
5244 5244
5245 rbd_dev->rq_wq = alloc_workqueue("%s", 0, 0, rbd_dev->disk->disk_name); 5245 rbd_dev->rq_wq = alloc_workqueue("%s", WQ_MEM_RECLAIM, 0,
5246 rbd_dev->disk->disk_name);
5246 if (!rbd_dev->rq_wq) { 5247 if (!rbd_dev->rq_wq) {
5247 ret = -ENOMEM; 5248 ret = -ENOMEM;
5248 goto err_out_mapping; 5249 goto err_out_mapping;