| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Thu, 18 Nov 2021 20:48:12 +0800
From: menglong8.dong@...il.com
To: kuba@...nel.org, rostedt@...dmis.org
Cc: davem@...emloft.net, mingo@...hat.com, yoshfuji@...ux-ipv6.org,
dsahern@...nel.org, imagedong@...cent.com, ycheng@...gle.com,
kuniyu@...zon.co.jp, linux-kernel@...r.kernel.org,
netdev@...r.kernel.org
Subject: [PATCH v2 net-next 2/2] net: snmp: add snmp tracepoint support for udp
From: Menglong Dong <imagedong@...cent.com>
Add snmp tracepoint support for udp.
Signed-off-by: Menglong Dong <imagedong@...cent.com>
---
include/net/udp.h | 25 +++++++++++++++++++------
net/ipv4/udp.c | 28 +++++++++++++++++-----------
2 files changed, 36 insertions(+), 17 deletions(-)
diff --git a/include/net/udp.h b/include/net/udp.h
index f1c2a88c9005..6cf11e0d75b0 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -28,6 +28,7 @@
#include <linux/seq_file.h>
#include <linux/poll.h>
#include <linux/indirect_call_wrapper.h>
+#include <trace/events/snmp.h>
/**
* struct udp_skb_cb - UDP(-Lite) private variables
@@ -384,12 +385,24 @@ static inline int copy_linear_skb(struct sk_buff *skb, int len, int off,
/*
* SNMP statistics for UDP and UDP-Lite
*/
-#define UDP_INC_STATS(net, field, is_udplite) do { \
- if (is_udplite) SNMP_INC_STATS((net)->mib.udplite_statistics, field); \
- else SNMP_INC_STATS((net)->mib.udp_statistics, field); } while(0)
-#define __UDP_INC_STATS(net, field, is_udplite) do { \
- if (is_udplite) __SNMP_INC_STATS((net)->mib.udplite_statistics, field); \
- else __SNMP_INC_STATS((net)->mib.udp_statistics, field); } while(0)
+#define UDP_INC_STATS(net, field, is_udplite) do { \
+ if (is_udplite) { \
+ SNMP_INC_STATS((net)->mib.udplite_statistics, field); \
+ trace_snmp(skb, TRACE_MIB_UDPLITE, field, 1); \
+ } else { \
+ SNMP_INC_STATS((net)->mib.udp_statistics, field); \
+ trace_snmp(skb, TRACE_MIB_UDP, field, 1); \
+ } \
+} while (0)
+#define __UDP_INC_STATS(net, skb, field, is_udplite) do { \
+ if (is_udplite) { \
+ __SNMP_INC_STATS((net)->mib.udplite_statistics, field); \
+ trace_snmp(skb, TRACE_MIB_UDPLITE, field, 1); \
+ } else { \
+ __SNMP_INC_STATS((net)->mib.udp_statistics, field); \
+ trace_snmp(skb, TRACE_MIB_UDP, field, 1); \
+ } \
+} while (0)
#define __UDP6_INC_STATS(net, field, is_udplite) do { \
if (is_udplite) __SNMP_INC_STATS((net)->mib.udplite_stats_in6, field);\
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 7101e6d892d6..66ae9eea65c7 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1648,9 +1648,11 @@ static struct sk_buff *__first_packet_length(struct sock *sk,
while ((skb = skb_peek(rcvq)) != NULL) {
if (udp_lib_checksum_complete(skb)) {
- __UDP_INC_STATS(sock_net(sk), UDP_MIB_CSUMERRORS,
+ __UDP_INC_STATS(sock_net(sk), skb,
+ UDP_MIB_CSUMERRORS,
IS_UDPLITE(sk));
- __UDP_INC_STATS(sock_net(sk), UDP_MIB_INERRORS,
+ __UDP_INC_STATS(sock_net(sk), skb,
+ UDP_MIB_INERRORS,
IS_UDPLITE(sk));
atomic_inc(&sk->sk_drops);
__skb_unlink(skb, rcvq);
@@ -2143,7 +2145,7 @@ static int udp_queue_rcv_one_skb(struct sock *sk, struct sk_buff *skb)
ret = encap_rcv(sk, skb);
if (ret <= 0) {
- __UDP_INC_STATS(sock_net(sk),
+ __UDP_INC_STATS(sock_net(sk), skb,
UDP_MIB_INDATAGRAMS,
is_udplite);
return -ret;
@@ -2201,9 +2203,10 @@ static int udp_queue_rcv_one_skb(struct sock *sk, struct sk_buff *skb)
return __udp_queue_rcv_skb(sk, skb);
csum_error:
- __UDP_INC_STATS(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
+ __UDP_INC_STATS(sock_net(sk), skb, UDP_MIB_CSUMERRORS,
+ is_udplite);
drop:
- __UDP_INC_STATS(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
+ __UDP_INC_STATS(sock_net(sk), skb, UDP_MIB_INERRORS, is_udplite);
atomic_inc(&sk->sk_drops);
kfree_skb(skb);
return -1;
@@ -2290,9 +2293,9 @@ static int __udp4_lib_mcast_deliver(struct net *net, struct sk_buff *skb,
if (unlikely(!nskb)) {
atomic_inc(&sk->sk_drops);
- __UDP_INC_STATS(net, UDP_MIB_RCVBUFERRORS,
+ __UDP_INC_STATS(net, skb, UDP_MIB_RCVBUFERRORS,
IS_UDPLITE(sk));
- __UDP_INC_STATS(net, UDP_MIB_INERRORS,
+ __UDP_INC_STATS(net, skb, UDP_MIB_INERRORS,
IS_UDPLITE(sk));
continue;
}
@@ -2311,7 +2314,7 @@ static int __udp4_lib_mcast_deliver(struct net *net, struct sk_buff *skb,
consume_skb(skb);
} else {
kfree_skb(skb);
- __UDP_INC_STATS(net, UDP_MIB_IGNOREDMULTI,
+ __UDP_INC_STATS(net, skb, UDP_MIB_IGNOREDMULTI,
proto == IPPROTO_UDPLITE);
}
return 0;
@@ -2454,7 +2457,8 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
if (udp_lib_checksum_complete(skb))
goto csum_error;
- __UDP_INC_STATS(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
+ __UDP_INC_STATS(net, skb, UDP_MIB_NOPORTS,
+ proto == IPPROTO_UDPLITE);
icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
/*
@@ -2481,9 +2485,11 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
proto == IPPROTO_UDPLITE ? "Lite" : "",
&saddr, ntohs(uh->source), &daddr, ntohs(uh->dest),
ulen);
- __UDP_INC_STATS(net, UDP_MIB_CSUMERRORS, proto == IPPROTO_UDPLITE);
+ __UDP_INC_STATS(net, skb, UDP_MIB_CSUMERRORS,
+ proto == IPPROTO_UDPLITE);
drop:
- __UDP_INC_STATS(net, UDP_MIB_INERRORS, proto == IPPROTO_UDPLITE);
+ __UDP_INC_STATS(net, skb, UDP_MIB_INERRORS,
+ proto == IPPROTO_UDPLITE);
kfree_skb(skb);
return 0;
}
--
2.27.0
Powered by blists - more mailing lists