Skip to content

virtio-blk: clamp max_segments when indirect descriptors are disabled #1140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
blktests-ci wants to merge 1 commit into
base: linus-master_base
Choose a base branch
from
Open

virtio-blk: clamp max_segments when indirect descriptors are disabled #1140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions drivers/block/virtio_blk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1267,6 +1267,13 @@ static int virtblk_read_limits(struct virtio_blk *vblk,
/* Prevent integer overflows and honor max vq size */
sg_elems = min_t(u32, sg_elems, VIRTIO_BLK_MAX_SG_ELEMS - 2);

if (!virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC)) {
u32 ring_size = virtqueue_get_vring_size(vblk->vqs[0].vq);

if (ring_size > 2)
sg_elems = min(sg_elems, ring_size - 2);
}

/* We can handle whatever the host told us to handle. */
lim->max_segments = sg_elems;

Expand Down