From: menglong8.dong@gmail.com
To: kuba@kernel.org, rostedt@goodmis.org
Cc: davem@davemloft.net, mingo@redhat.com, yoshfuji@linux-ipv6.org,
dsahern@kernel.org, imagedong@tencent.com, ycheng@google.com,
kuniyu@amazon.co.jp, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org
Subject: [PATCH v2 net-next 2/2] net: snmp: add snmp tracepoint support for udp
Date: Thu, 18 Nov 2021 20:48:12 +0800 [thread overview]
Message-ID: <20211118124812.106538-3-imagedong@tencent.com> (raw)
In-Reply-To: <20211118124812.106538-1-imagedong@tencent.com>
From: Menglong Dong <imagedong@tencent.com>
Add snmp tracepoint support for udp.
Signed-off-by: Menglong Dong <imagedong@tencent.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
next prev parent reply other threads:[~2021-11-18 12:50 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-18 12:48 [PATCH v2 net-next 0/2] net: snmp: tracepoint support for snmp menglong8.dong
2021-11-18 12:48 ` [PATCH v2 net-next 1/2] net: snmp: add " menglong8.dong
2021-11-18 15:57 ` Steven Rostedt
2021-11-18 12:48 ` menglong8.dong [this message]
2021-11-18 14:46 ` [PATCH v2 net-next 0/2] net: snmp: " Steven Rostedt
2021-11-18 15:36 ` David Ahern
2021-11-19 3:45 ` Menglong Dong
2021-11-19 3:54 ` David Ahern
2021-11-21 10:47 ` Menglong Dong
2021-11-21 14:02 ` Steven Rostedt
2021-11-22 16:42 ` David Ahern
2021-11-24 2:56 ` Menglong Dong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211118124812.106538-3-imagedong@tencent.com \
--to=menglong8.dong@gmail.com \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=imagedong@tencent.com \
--cc=kuba@kernel.org \
--cc=kuniyu@amazon.co.jp \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=ycheng@google.com \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox