diff options
| author | Lars Ellenberg <lars.ellenberg@linbit.com> | 2012-09-20 14:24:20 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-10-30 08:39:18 +0100 |
| commit | 8b45a5c8a190d0ea0077928fd8e95c0752e40e41 (patch) | |
| tree | 181d93830f9bc482496548584b7b5137a04b3119 | |
| parent | 0b143d4382b62db6738196caaefa793e5c0f6690 (diff) | |
| download | linux-stable-8b45a5c8a190d0ea0077928fd8e95c0752e40e41.tar.gz linux-stable-8b45a5c8a190d0ea0077928fd8e95c0752e40e41.tar.bz2 linux-stable-8b45a5c8a190d0ea0077928fd8e95c0752e40e41.zip | |
drbd: a few more GFP_KERNEL -> GFP_NOIO
This has not yet been observed, but conceivably, when using GFP_KERNEL
allocations from drbd_md_sync(), drbd_flush_after_epoch() or
receive_SyncParam(), we could trigger additional IO to our own device,
or an other device in a criss-cross setup, and end up in a local
deadlock, or potentially a distributed deadlock in a criss-cross setup
involving the peer blocked in a similar way waiting for us to make
progress.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | drivers/block/drbd/drbd_int.h | 2 | ||||
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index 3b378124bac8..557dd5a2c0cc 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -2497,7 +2497,7 @@ static inline void drbd_md_flush(struct drbd_conf *mdev) if (test_bit(MD_NO_FUA, &mdev->flags)) return; - r = blkdev_issue_flush(mdev->ldev->md_bdev, GFP_KERNEL, NULL); + r = blkdev_issue_flush(mdev->ldev->md_bdev, GFP_NOIO, NULL); if (r) { set_bit(MD_NO_FUA, &mdev->flags); dev_err(DEV, "meta data flush failed with status %d, disabling md-flushes\n", r); diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 264ea25a9b06..c44eaa0ee0a9 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -957,7 +957,7 @@ static void drbd_flush(struct drbd_conf *mdev) int rv; if (mdev->write_ordering >= WO_bdev_flush && get_ldev(mdev)) { - rv = blkdev_issue_flush(mdev->ldev->backing_bdev, GFP_KERNEL, + rv = blkdev_issue_flush(mdev->ldev->backing_bdev, GFP_NOIO, NULL); if (rv) { dev_info(DEV, "local disk flush failed with status %d\n", rv); @@ -2907,7 +2907,7 @@ static int receive_SyncParam(struct drbd_conf *mdev, enum drbd_packets cmd, unsi fifo_size = (mdev->sync_conf.c_plan_ahead * 10 * SLEEP_TIME) / HZ; if (fifo_size != mdev->rs_plan_s.size && fifo_size > 0) { - rs_plan_s = kzalloc(sizeof(int) * fifo_size, GFP_KERNEL); + rs_plan_s = kzalloc(sizeof(int) * fifo_size, GFP_NOIO); if (!rs_plan_s) { dev_err(DEV, "kmalloc of fifo_buffer failed"); goto disconnect; |