drbd: always use_bmbv, ignore setting
Now that the peer may handle multi-bio EEs, we can ignore the peer's limit, and concentrate on the limits of the local IO stack. This is safe accross drbd protocol versions, as our queue_max_sectors() will be adjusted accordingly. Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
parent
bb3d000cb9
commit
a1c88d0d7a
|
@ -704,9 +704,6 @@ void drbd_setup_queue_param(struct drbd_conf *mdev, unsigned int max_seg_s) __mu
|
||||||
struct request_queue * const b = mdev->ldev->backing_bdev->bd_disk->queue;
|
struct request_queue * const b = mdev->ldev->backing_bdev->bd_disk->queue;
|
||||||
int max_segments = mdev->ldev->dc.max_bio_bvecs;
|
int max_segments = mdev->ldev->dc.max_bio_bvecs;
|
||||||
|
|
||||||
if (b->merge_bvec_fn && !mdev->ldev->dc.use_bmbv)
|
|
||||||
max_seg_s = PAGE_SIZE;
|
|
||||||
|
|
||||||
max_seg_s = min(queue_max_sectors(b) * queue_logical_block_size(b), max_seg_s);
|
max_seg_s = min(queue_max_sectors(b) * queue_logical_block_size(b), max_seg_s);
|
||||||
|
|
||||||
blk_queue_max_hw_sectors(q, max_seg_s >> 9);
|
blk_queue_max_hw_sectors(q, max_seg_s >> 9);
|
||||||
|
|
|
@ -3011,7 +3011,11 @@ static int receive_sizes(struct drbd_conf *mdev, struct p_header *h)
|
||||||
ldsc = 1;
|
ldsc = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
max_seg_s = be32_to_cpu(p->max_segment_size);
|
if (mdev->agreed_pro_version < 94)
|
||||||
|
max_seg_s = be32_to_cpu(p->max_segment_size);
|
||||||
|
else /* drbd 8.3.8 onwards */
|
||||||
|
max_seg_s = DRBD_MAX_SEGMENT_SIZE;
|
||||||
|
|
||||||
if (max_seg_s != queue_max_segment_size(mdev->rq_queue))
|
if (max_seg_s != queue_max_segment_size(mdev->rq_queue))
|
||||||
drbd_setup_queue_param(mdev, max_seg_s);
|
drbd_setup_queue_param(mdev, max_seg_s);
|
||||||
|
|
||||||
|
|
|
@ -1110,7 +1110,7 @@ int drbd_merge_bvec(struct request_queue *q, struct bvec_merge_data *bvm, struct
|
||||||
} else if (limit && get_ldev(mdev)) {
|
} else if (limit && get_ldev(mdev)) {
|
||||||
struct request_queue * const b =
|
struct request_queue * const b =
|
||||||
mdev->ldev->backing_bdev->bd_disk->queue;
|
mdev->ldev->backing_bdev->bd_disk->queue;
|
||||||
if (b->merge_bvec_fn && mdev->ldev->dc.use_bmbv) {
|
if (b->merge_bvec_fn) {
|
||||||
backing_limit = b->merge_bvec_fn(b, bvm, bvec);
|
backing_limit = b->merge_bvec_fn(b, bvm, bvec);
|
||||||
limit = min(limit, backing_limit);
|
limit = min(limit, backing_limit);
|
||||||
}
|
}
|
||||||
|
|
Reference in New Issue