lkml.org 
[lkml]   [2013]   [Sep]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 23/46] packet: restore packet statistics tp_packets to include drops
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

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

    From: Willem de Bruijn <willemb@google.com>

    [ Upstream commit 8bcdeaff5ed544704a9a691d4aef0adb3f9c5b8f ]

    getsockopt PACKET_STATISTICS returns tp_packets + tp_drops. Commit
    ee80fbf301 ("packet: account statistics only in tpacket_stats_u")
    cleaned up the getsockopt PACKET_STATISTICS code.
    This also changed semantics. Historically, tp_packets included
    tp_drops on return. The commit removed the line that adds tp_drops
    into tp_packets.

    This patch reinstates the old semantics.

    Signed-off-by: Willem de Bruijn <willemb@google.com>
    Acked-by: Daniel Borkmann <dborkman@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/packet/af_packet.c | 2 ++
    1 file changed, 2 insertions(+)

    --- a/net/packet/af_packet.c
    +++ b/net/packet/af_packet.c
    @@ -3259,9 +3259,11 @@ static int packet_getsockopt(struct sock

    if (po->tp_version == TPACKET_V3) {
    lv = sizeof(struct tpacket_stats_v3);
    + st.stats3.tp_packets += st.stats3.tp_drops;
    data = &st.stats3;
    } else {
    lv = sizeof(struct tpacket_stats);
    + st.stats1.tp_packets += st.stats1.tp_drops;
    data = &st.stats1;
    }




    \
     
     \ /
      Last update: 2013-09-12 20:41    [W:8.641 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site