mirror of
https://github.com/torvalds/linux.git
synced 2026-11-20 13:03:48 +00:00
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull vhost fix from Michael Tsirkin: "Fix vhost ring completion batch wrap" * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: vhost: split out-of-order used ring batches at every wrap
This commit is contained in:
@@ -3152,18 +3152,21 @@ static int vhost_add_used_n_ooo(struct vhost_virtqueue *vq,
|
||||
struct vring_used_elem *heads,
|
||||
unsigned count)
|
||||
{
|
||||
int start, n, r;
|
||||
unsigned int n;
|
||||
int r;
|
||||
|
||||
start = vq->last_used_idx & (vq->num - 1);
|
||||
n = vq->num - start;
|
||||
if (n < count) {
|
||||
do {
|
||||
unsigned int start = vq->last_used_idx & (vq->num - 1);
|
||||
|
||||
n = min(vq->num - start, count);
|
||||
r = __vhost_add_used_n(vq, heads, n);
|
||||
if (r < 0)
|
||||
return r;
|
||||
heads += n;
|
||||
count -= n;
|
||||
}
|
||||
return __vhost_add_used_n(vq, heads, count);
|
||||
} while (count);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vhost_add_used_n_in_order(struct vhost_virtqueue *vq,
|
||||
|
||||
Reference in New Issue
Block a user