lkml.org 
[lkml]   [2019]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.20 307/352] virtio_net: Account for tx bytes and packets on sending xdp_frames
    Date
    4.20-stable review patch.  If anyone has any objections, please let me know.

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

    From: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>

    [ Upstream commit 546f28974d771b124fb0bf7b551b343888cf0419 ]

    Previously virtnet_xdp_xmit() did not account for device tx counters,
    which caused confusions.
    To be consistent with SKBs, account them on freeing xdp_frames.

    Reported-by: David Ahern <dsahern@gmail.com>
    Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
    Acked-by: Michael S. Tsirkin <mst@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 | 20 ++++++++++++++++----
    1 file changed, 16 insertions(+), 4 deletions(-)

    --- a/drivers/net/virtio_net.c
    +++ b/drivers/net/virtio_net.c
    @@ -502,6 +502,8 @@ static int virtnet_xdp_xmit(struct net_d
    struct bpf_prog *xdp_prog;
    struct send_queue *sq;
    unsigned int len;
    + int packets = 0;
    + int bytes = 0;
    int drops = 0;
    int kicks = 0;
    int ret, err;
    @@ -525,10 +527,18 @@ static int virtnet_xdp_xmit(struct net_d

    /* Free up any pending old buffers before queueing new ones. */
    while ((ptr = virtqueue_get_buf(sq->vq, &len)) != NULL) {
    - if (likely(is_xdp_frame(ptr)))
    - xdp_return_frame(ptr_to_xdp(ptr));
    - else
    - napi_consume_skb(ptr, false);
    + if (likely(is_xdp_frame(ptr))) {
    + struct xdp_frame *frame = ptr_to_xdp(ptr);
    +
    + bytes += frame->len;
    + xdp_return_frame(frame);
    + } else {
    + struct sk_buff *skb = ptr;
    +
    + bytes += skb->len;
    + napi_consume_skb(skb, false);
    + }
    + packets++;
    }

    for (i = 0; i < n; i++) {
    @@ -548,6 +558,8 @@ static int virtnet_xdp_xmit(struct net_d
    }
    out:
    u64_stats_update_begin(&sq->stats.syncp);
    + sq->stats.bytes += bytes;
    + sq->stats.packets += packets;
    sq->stats.xdp_tx += n;
    sq->stats.xdp_tx_drops += drops;
    sq->stats.kicks += kicks;

    \
     
     \ /
      Last update: 2019-02-11 16:54    [W:3.709 / U:0.436 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site