| Message ID | 33d7df119ccbedc9b54fbe4b674076b4f7ba3499.1305846412.git.mst@redhat.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On Fri, 20 May 2011 02:12:19 +0300, "Michael S. Tsirkin" <mst@redhat.com> wrote: > Update avail index immediately instead of upon kick: > for virtio-net RX this helps parallelism with the host. > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > --- > drivers/virtio/virtio_ring.c | 28 +++++++++++++++++++--------- > 1 files changed, 19 insertions(+), 9 deletions(-) > > diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c > index eed5f29..8218fe6 100644 > --- a/drivers/virtio/virtio_ring.c > +++ b/drivers/virtio/virtio_ring.c > @@ -89,7 +89,7 @@ struct vring_virtqueue > unsigned int num_free; > /* Head of free buffer list. */ > unsigned int free_head; > - /* Number we've added since last sync. */ > + /* Number we've added since last kick. */ > unsigned int num_added; I always like to see obsolescent nomenclature cleaned up like this. Thanks. > /* Last used index we've seen. */ > @@ -174,6 +174,13 @@ int virtqueue_add_buf_gfp(struct virtqueue *_vq, > > BUG_ON(data == NULL); > > + /* Prevent drivers from adding more than num bufs without a kick. */ > + if (vq->num_added == vq->vring.num) { > + printk(KERN_ERR "gaaa!!!\n"); > + END_USE(vq); > + return -ENOSPC; > + } > + I like "gaaa!" but it won't tell us which driver. How about the more conventional: if (WARN_ON(vq->num_added >= vq->vring.num)) { END_USE(vq); return -ENOSPC; } I'd really like to see the results of this patch. It's useless for outgoing net traffic (we deal with one packet at a time) but perhaps a flood of incoming packets would show something. Thanks, Rusty. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index eed5f29..8218fe6 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -89,7 +89,7 @@ struct vring_virtqueue unsigned int num_free; /* Head of free buffer list. */ unsigned int free_head; - /* Number we've added since last sync. */ + /* Number we've added since last kick. */ unsigned int num_added; /* Last used index we've seen. */ @@ -174,6 +174,13 @@ int virtqueue_add_buf_gfp(struct virtqueue *_vq, BUG_ON(data == NULL); + /* Prevent drivers from adding more than num bufs without a kick. */ + if (vq->num_added == vq->vring.num) { + printk(KERN_ERR "gaaa!!!\n"); + END_USE(vq); + return -ENOSPC; + } + /* If the host supports indirect descriptor tables, and we have multiple * buffers, then go indirect. FIXME: tune this threshold */ if (vq->indirect && (out + in) > 1 && vq->num_free) { @@ -227,8 +234,14 @@ add_head: /* Put entry in available array (but don't update avail->idx until they * do sync). FIXME: avoid modulus here? */ - avail = (vq->vring.avail->idx + vq->num_added++) % vq->vring.num; + avail = vq->vring.avail->idx % vq->vring.num; vq->vring.avail->ring[avail] = head; + vq->num_added++; + + /* Descriptors and available array need to be set before we expose the + * new available array entries. */ + virtio_wmb(); + vq->vring.avail->idx++; pr_debug("Added buffer head %i to %p\n", head, vq); END_USE(vq); @@ -242,17 +255,14 @@ void virtqueue_kick(struct virtqueue *_vq) struct vring_virtqueue *vq = to_vvq(_vq); u16 new, old; START_USE(vq); - /* Descriptors and available array need to be set before we expose the - * new available array entries. */ - virtio_wmb(); - - old = vq->vring.avail->idx; - new = vq->vring.avail->idx = old + vq->num_added; - vq->num_added = 0; /* Need to update avail index before checking if we should notify */ virtio_mb(); + new = vq->vring.avail->idx; + old = new - vq->num_added; + vq->num_added = 0; + if (vq->event ? vring_need_event(vring_avail_event(&vq->vring), new, old) : !(vq->vring.used->flags & VRING_USED_F_NO_NOTIFY))
Update avail index immediately instead of upon kick: for virtio-net RX this helps parallelism with the host. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- drivers/virtio/virtio_ring.c | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-)