lkml.org 
[lkml]   [2014]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.8 141/166] macvtap: Do not double-count received packets
    Date
    3.8.13.16 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Vlad Yasevich <vyasevic@redhat.com>

    [ Upstream commit 006da7b07bc4d3a7ffabad17cf639eec6849c9dc ]

    Currently macvlan will count received packets after calling each
    vlans receive handler. Macvtap attempts to count the packet
    yet again when the user reads the packet from the tap socket.
    This code doesn't do this consistently either. Remove the
    counting from macvtap and let only macvlan count received
    packets.

    Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
    Acked-by: Michael S. Tsirkin <mst@redhat.com>
    Acked-by: Jason Wang <jasowang@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/net/macvtap.c | 7 -------
    1 file changed, 7 deletions(-)

    diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
    index 15820ab..a4df37f 100644
    --- a/drivers/net/macvtap.c
    +++ b/drivers/net/macvtap.c
    @@ -805,7 +805,6 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q,
    const struct sk_buff *skb,
    const struct iovec *iv, int len)
    {
    - struct macvlan_dev *vlan;
    int ret;
    int vnet_hdr_len = 0;
    int vlan_offset = 0;
    @@ -859,12 +858,6 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q,
    copied += len;

    done:
    - rcu_read_lock_bh();
    - vlan = rcu_dereference_bh(q->vlan);
    - if (vlan)
    - macvlan_count_rx(vlan, copied - vnet_hdr_len, ret == 0, 0);
    - rcu_read_unlock_bh();
    -
    return ret ? ret : copied;
    }

    --
    1.8.3.2


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