lkml.org 
[lkml]   [2018]   [Apr]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.16 53/81] virtio-net: add missing virtqueue kick when flushing packets
    Date
    4.16-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Jason Wang <jasowang@redhat.com>


    [ Upstream commit 9267c430c6b6f4c0120e3c6bb847313d633f02a6 ]

    We tends to batch submitting packets during XDP_TX. This requires to
    kick virtqueue after a batch, we tried to do it through
    xdp_do_flush_map() which only makes sense for devmap not XDP_TX. So
    explicitly kick the virtqueue in this case.

    Reported-by: Kimitoshi Takahashi <ktaka@nii.ac.jp>
    Tested-by: Kimitoshi Takahashi <ktaka@nii.ac.jp>
    Cc: Daniel Borkmann <daniel@iogearbox.net>
    Fixes: 186b3c998c50 ("virtio-net: support XDP_REDIRECT")
    Signed-off-by: Jason Wang <jasowang@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/virtio_net.c | 11 +++++++++--
    1 file changed, 9 insertions(+), 2 deletions(-)

    --- a/drivers/net/virtio_net.c
    +++ b/drivers/net/virtio_net.c
    @@ -1269,7 +1269,9 @@ static int virtnet_poll(struct napi_stru
    {
    struct receive_queue *rq =
    container_of(napi, struct receive_queue, napi);
    - unsigned int received;
    + struct virtnet_info *vi = rq->vq->vdev->priv;
    + struct send_queue *sq;
    + unsigned int received, qp;
    bool xdp_xmit = false;

    virtnet_poll_cleantx(rq);
    @@ -1280,8 +1282,13 @@ static int virtnet_poll(struct napi_stru
    if (received < budget)
    virtqueue_napi_complete(napi, rq->vq, received);

    - if (xdp_xmit)
    + if (xdp_xmit) {
    + qp = vi->curr_queue_pairs - vi->xdp_queue_pairs +
    + smp_processor_id();
    + sq = &vi->sq[qp];
    + virtqueue_kick(sq->vq);
    xdp_do_flush_map();
    + }

    return received;
    }

    \
     
     \ /
      Last update: 2018-04-27 16:25    [W:2.657 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site