lkml.org 
[lkml]   [2014]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next V2 2/3] virtio-net: introduce virtnet_receive()
    Date
    Move common receive logic to a new helper virtnet_receive(). It will
    also be used by rx busy polling method.

    Cc: Rusty Russell <rusty@rustcorp.com.au>
    Cc: Michael S. Tsirkin <mst@redhat.com>
    Cc: Vlad Yasevich <vyasevic@redhat.com>
    Cc: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: Jason Wang <jasowang@redhat.com>
    ---
    drivers/net/virtio_net.c | 20 +++++++++++++++-----
    1 file changed, 15 insertions(+), 5 deletions(-)

    diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
    index e1e1691..e417d93 100644
    --- a/drivers/net/virtio_net.c
    +++ b/drivers/net/virtio_net.c
    @@ -725,15 +725,12 @@ static void refill_work(struct work_struct *work)
    }
    }

    -static int virtnet_poll(struct napi_struct *napi, int budget)
    +static int virtnet_receive(struct receive_queue *rq, int budget)
    {
    - struct receive_queue *rq =
    - container_of(napi, struct receive_queue, napi);
    struct virtnet_info *vi = rq->vq->vdev->priv;
    + unsigned int len, received = 0;
    void *buf;
    - unsigned int r, len, received = 0;

    -again:
    while (received < budget &&
    (buf = virtqueue_get_buf(rq->vq, &len)) != NULL) {
    receive_buf(rq, buf, len);
    @@ -745,6 +742,18 @@ again:
    schedule_delayed_work(&vi->refill, 0);
    }

    + return received;
    +}
    +
    +static int virtnet_poll(struct napi_struct *napi, int budget)
    +{
    + struct receive_queue *rq =
    + container_of(napi, struct receive_queue, napi);
    + unsigned int r, received = 0;
    +
    +again:
    + received += virtnet_receive(rq, budget);
    +
    /* Out of packets? */
    if (received < budget) {
    r = virtqueue_enable_cb_prepare(rq->vq);
    @@ -753,6 +762,7 @@ again:
    napi_schedule_prep(napi)) {
    virtqueue_disable_cb(rq->vq);
    __napi_schedule(napi);
    + budget -= received;
    goto again;
    }
    }
    --
    1.8.3.1


    \
     
     \ /
      Last update: 2014-07-16 09:01    [W:3.162 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site