net: sk_drops consolidation part 2

- skb_kill_datagram() can increment sk->sk_drops itself, not callers.

- UDP on IPV4 & IPV6 dropped frames (because of bad checksum or policy checks) increment sk_drops

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/datagram.c b/net/core/datagram.c
index 1c6cf3a1a4f6abc3c605e492c4381d40103d3094..4d57f5e12b05cdce9630fd5cfc451ba98cba63d0 100644 (file)
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -262,6 +262,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
        }
 
        kfree_skb(skb);
+       atomic_inc(&sk->sk_drops);
        sk_mem_reclaim_partial(sk);
 
        return err;

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index ec5c7a720c0c4347f099926dc780c7f76d95edb8..4274c1cc78fdbeffc6325c5a1f2a9505f95fa163 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -867,6 +867,7 @@ static unsigned int first_packet_length(struct sock *sk)
                udp_lib_checksum_complete(skb)) {
                UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
                                 IS_UDPLITE(sk));
+               atomic_inc(&sk->sk_drops);
                __skb_unlink(skb, rcvq);
                __skb_queue_tail(&list_kill, skb);
        }
@@ -1186,6 +1187,7 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
 
 drop:
        UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
+       atomic_inc(&sk->sk_drops);
        kfree_skb(skb);
        return -1;
 }

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 52ed7d7f9dab63f6c874698e4f9136200c99d919..cb834ab7f071053ff27be8e2b2738b1ae0f520d7 100644 (file)
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -517,7 +517,6 @@ csum_copy_err:
           as some normal condition.
         */
        err = (flags&MSG_DONTWAIT) ? -EAGAIN : -EHOSTUNREACH;
-       atomic_inc(&sk->sk_drops);
        goto out;
 }
 

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 829d300a6f35b08e9fd1c10df4e718eff3500c00..d3b59d73f507869f569c4fdfd201875a06ccf2a1 100644 (file)
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -390,11 +390,13 @@ int udpv6_queue_rcv_skb(struct sock * sk, struct sk_buff *skb)
                if (rc == -ENOMEM)
                        UDP6_INC_STATS_BH(sock_net(sk),
                                        UDP_MIB_RCVBUFERRORS, is_udplite);
-               goto drop;
+               goto drop_no_sk_drops_inc;
        }
 
        return 0;
 drop:
+       atomic_inc(&sk->sk_drops);
+drop_no_sk_drops_inc:
        UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
        kfree_skb(skb);
        return -1;