Commit 35f47ef1 authored Oct 23, 2013 by Lars Ellenberg Committed by Jens Axboe Nov 08, 2013

drbd: avoid to shrink max_bio_size due to peer re-configuration



For a long time, the receiving side has spread "too large" incoming
requests over multiple bios.  No need to shrink our max_bio_size
(max_hw_sectors) if the peer is reconfigured to use a different storage.

The problem manifests itself if we are not the top of the device stack
(DRBD is used a LVM PV).

A hardware reconfiguration on the peer may cause the supported
max_bio_size to shrink, and the connection handshake would now
unnecessarily shrink the max_bio_size on the active node.

There is no way to notify upper layers that they have to "re-stack"
their limits. So they won't notice at all, and may keep submitting bios
that are suddenly considered "too large for device".

We already check for compatibility and ignore changes on the peer,
the code only was masked out unless we have a fully established connection.
We just need to allow it a bit earlier during the handshake.

Also consider max_hw_sectors in our merge bvec function, just in case.

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>

parent d2da5b0c

drivers/block/drbd/drbd_nl.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1132,7 +1132,7 @@ void drbd_reconsider_max_bio_size(struct drbd_conf *mdev)
		/* We may ignore peer limits if the peer is modern enough.
		Because new from 8.3.8 onwards the peer can use multiple
		BIOs for a single peer_request */
		if (mdev->state.conn >= C_CONNECTED) {
		if (mdev->state.conn >= C_WF_REPORT_PARAMS) {
		if (mdev->tconn->agreed_pro_version < 94)
		peer = min(mdev->peer_max_bio_size, DRBD_MAX_SIZE_H80_PACKET);
		/* Correct old drbd (up to 8.3.7) if it believes it can do more than 32KiB */

drivers/block/drbd/drbd_req.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1306,6 +1306,7 @@ int drbd_merge_bvec(struct request_queue q, struct bvec_merge_data bvm, struct
		int backing_limit;

		if (bio_size && get_ldev(mdev)) {
		unsigned int max_hw_sectors = queue_max_hw_sectors(q);
		struct request_queue * const b =
		mdev->ldev->backing_bdev->bd_disk->queue;
		if (b->merge_bvec_fn) {
		@@ -1313,6 +1314,8 @@ int drbd_merge_bvec(struct request_queue q, struct bvec_merge_data bvm, struct
		limit = min(limit, backing_limit);
		}
		put_ldev(mdev);
		if ((limit >> 9) > max_hw_sectors)
		limit = max_hw_sectors << 9;
		}
		return limit;
		}