| 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
| ||
|
Message-ID: <202403211010443485000@zte.com.cn>
Date: Thu, 21 Mar 2024 10:10:44 +0800 (CST)
From: <xu.xin16@....com.cn>
To: <edumazet@...gle.com>, <davem@...emloft.net>
Cc: <rostedt@...dmis.org>, <mhiramat@...nel.org>, <dsahern@...nel.org>,
<kuba@...nel.org>, <linux-kernel@...r.kernel.org>,
<linux-trace-kernel@...r.kernel.org>, <netdev@...r.kernel.org>,
<yang.yang29@....com.cn>, <xu.xin16@....com.cn>,
<he.peilin@....com.cn>, <liu.chun2@....com.cn>,
<jiang.xuexin@....com.cn>, <zhang.yunkai@....com.cn>
Subject: [PATCH v3] net/ipv4: add tracepoint for icmp_send
From: he peilin <he.peilin@....com.cn>
Introduce a tracepoint for icmp_send, which can help users to get more
detail information conveniently when icmp abnormal events happen.
1. Giving an usecase example:
=============================
When an application experiences packet loss due to an unreachable UDP
destination port, the kernel will send an exception message through the
icmp_send function. By adding a trace point for icmp_send, developers or
system administrators can obtain detailed information about the UDP
packet loss, including the type, code, source address, destination address,
source port, and destination port. This facilitates the trouble-shooting
of UDP packet loss issues especially for those network-service
applications.
2. Operation Instructions:
==========================
Switch to the tracing directory.
cd /sys/kernel/tracing
Filter for destination port unreachable.
echo "type==3 && code==3" > events/icmp/icmp_send/filter
Enable trace event.
echo 1 > events/icmp/icmp_send/enable
3. Result View:
================
udp_client_erro-11370 [002] ...s.12 124.728002:
icmp_send: icmp_send: type=3, code=3.
From 127.0.0.1:41895 to 127.0.0.1:6666 ulen=23
skbaddr=00000000589b167a
Changelog
---------
v2->v3:
Some fixes according to
https://lore.kernel.org/all/20240319102549.7f7f6f53@gandalf.local.home/
1. Change the tracking directory to/sys/kernel/tracking.
2. Adjust the layout of the TP-STRUCT_entry parameter structure.
v1->v2:
Some fixes according to
https://lore.kernel.org/all/CANn89iL-y9e_VFpdw=sZtRnKRu_tnUwqHuFQTJvJsv-nz1xPDw@mail.gmail.com/
1. adjust the trace_icmp_send() to more protocols than UDP.
2. move the calling of trace_icmp_send after sanity checks
in __icmp_send().
Signed-off-by: Peilin He<he.peilin@....com.cn>
Reviewed-by: xu xin <xu.xin16@....com.cn>
Reviewed-by: Yunkai Zhang <zhang.yunkai@....com.cn>
Cc: Yang Yang <yang.yang29@....com.cn>
Cc: Liu Chun <liu.chun2@....com.cn>
Cc: Xuexin Jiang <jiang.xuexin@....com.cn>
---
include/trace/events/icmp.h | 64 +++++++++++++++++++++++++++++++++++++
net/ipv4/icmp.c | 4 +++
2 files changed, 68 insertions(+)
create mode 100644 include/trace/events/icmp.h
diff --git a/include/trace/events/icmp.h b/include/trace/events/icmp.h
new file mode 100644
index 000000000000..2098d4b1b12e
--- /dev/null
+++ b/include/trace/events/icmp.h
@@ -0,0 +1,64 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM icmp
+
+#if !defined(_TRACE_ICMP_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_ICMP_H
+
+#include <linux/icmp.h>
+#include <linux/tracepoint.h>
+
+TRACE_EVENT(icmp_send,
+
+ TP_PROTO(const struct sk_buff *skb, int type, int code),
+
+ TP_ARGS(skb, type, code),
+
+ TP_STRUCT__entry(
+ __field(const void *, skbaddr)
+ __field(int, type)
+ __field(int, code)
+ __array(__u8, saddr, 4)
+ __array(__u8, daddr, 4)
+ __field(__u16, sport)
+ __field(__u16, dport)
+ __field(unsigned short, ulen)
+ ),
+
+ TP_fast_assign(
+ struct iphdr *iph = ip_hdr(skb);
+ int proto_4 = iph->protocol;
+ __be32 *p32;
+
+ __entry->skbaddr = skb;
+ __entry->type = type;
+ __entry->code = code;
+
+ if (proto_4 == IPPROTO_UDP) {
+ struct udphdr *uh = udp_hdr(skb);
+ __entry->sport = ntohs(uh->source);
+ __entry->dport = ntohs(uh->dest);
+ __entry->ulen = ntohs(uh->len);
+ } else {
+ __entry->sport = 0;
+ __entry->dport = 0;
+ __entry->ulen = 0;
+ }
+
+ p32 = (__be32 *) __entry->saddr;
+ *p32 = iph->saddr;
+
+ p32 = (__be32 *) __entry->daddr;
+ *p32 = iph->daddr;
+ ),
+
+ TP_printk("icmp_send: type=%d, code=%d. From %pI4:%u to %pI4:%u ulen=%d skbaddr=%p",
+ __entry->type, __entry->code,
+ __entry->saddr, __entry->sport, __entry->daddr,
+ __entry->dport, __entry->ulen, __entry->skbaddr)
+);
+
+#endif /* _TRACE_ICMP_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
\ No newline at end of file
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index e63a3bf99617..21fb41257fe9 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -92,6 +92,8 @@
#include <net/inet_common.h>
#include <net/ip_fib.h>
#include <net/l3mdev.h>
+#define CREATE_TRACE_POINTS
+#include <trace/events/icmp.h>
/*
* Build xmit assembly blocks
@@ -672,6 +674,8 @@ void __icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info,
}
}
+ trace_icmp_send(skb_in, type, code);
+
/* Needed by both icmp_global_allow and icmp_xmit_lock */
local_bh_disable();
--
2.44.0
<div class="zcontentRow"><p>From: he peilin <he.peilin@....com.cn></p><p><br></p><p>Introduce a tracepoint for icmp_send, which can help users to get more</p><p>detail information conveniently when icmp abnormal events happen.</p><p><br></p><p>1. Giving an usecase example:</p><p>=============================</p><p>When an application experiences packet loss due to an unreachable UDP</p><p>destination port, the kernel will send an exception message through the</p><p>icmp_send function. By adding a trace point for icmp_send, developers or</p><p>system administrators can obtain detailed information about the UDP</p><p>packet loss, including the type, code, source address, destination address,</p><p>source port, and destination port. This facilitates the trouble-shooting</p><p>of UDP packet loss issues especially for those network-service</p><p>applications.</p><p><br></p><p>2. Operation Instructions:</p><p>==========================</p><p>Switch to the tracing directory.</p><p> cd /sys/kernel/tracing</p><p>Filter for destination port unreachable.</p><p> echo "type==3 && code==3" > events/icmp/icmp_send/filter</p><p>Enable trace event.</p><p> echo 1 > events/icmp/icmp_send/enable</p><p><br></p><p>3. Result View:</p><p>================</p><p> udp_client_erro-11370 [002] ...s.12 124.728002:</p><p> icmp_send: icmp_send: type=3, code=3.</p><p> From 127.0.0.1:41895 to 127.0.0.1:6666 ulen=23</p><p> skbaddr=00000000589b167a</p><p><br></p><p>Changelog</p><p>---------</p><p>v2->v3:</p><p>Some fixes according to</p><p>https://lore.kernel.org/all/20240319102549.7f7f6f53@gandalf.local.home/</p><p>1. Change the tracking directory to/sys/kernel/tracking.</p><p>2. Adjust the layout of the TP-STRUCT_entry parameter structure.</p><p><br></p><p>v1->v2:</p><p>Some fixes according to</p><p>https://lore.kernel.org/all/CANn89iL-y9e_VFpdw=sZtRnKRu_tnUwqHuFQTJvJsv-nz1xPDw@mail.gmail.com/</p><p>1. adjust the trace_icmp_send() to more protocols than UDP.</p><p>2. move the calling of trace_icmp_send after sanity checks</p><p>in __icmp_send().</p><p><br></p><p>Signed-off-by: Peilin He<he.peilin@....com.cn></p><p>Reviewed-by: xu xin <xu.xin16@....com.cn></p><p>Reviewed-by: Yunkai Zhang <zhang.yunkai@....com.cn></p><p>Cc: Yang Yang <yang.yang29@....com.cn></p><p>Cc: Liu Chun <liu.chun2@....com.cn></p><p>Cc: Xuexin Jiang <jiang.xuexin@....com.cn></p><p>---</p><p> include/trace/events/icmp.h | 64 +++++++++++++++++++++++++++++++++++++</p><p> net/ipv4/icmp.c | 4 +++</p><p> 2 files changed, 68 insertions(+)</p><p> create mode 100644 include/trace/events/icmp.h</p><p><br></p><p>diff --git a/include/trace/events/icmp.h b/include/trace/events/icmp.h</p><p>new file mode 100644</p><p>index 000000000000..2098d4b1b12e</p><p>--- /dev/null</p><p>+++ b/include/trace/events/icmp.h</p><p>@@ -0,0 +1,64 @@</p><p>+/* SPDX-License-Identifier: GPL-2.0 */</p><p>+#undef TRACE_SYSTEM</p><p>+#define TRACE_SYSTEM icmp</p><p>+</p><p>+#if !defined(_TRACE_ICMP_H) || defined(TRACE_HEADER_MULTI_READ)</p><p>+#define _TRACE_ICMP_H</p><p>+</p><p>+#include <linux/icmp.h></p><p>+#include <linux/tracepoint.h></p><p>+</p><p>+TRACE_EVENT(icmp_send,</p><p>+</p><p>+<span style="white-space:pre"> </span>TP_PROTO(const struct sk_buff *skb, int type, int code),</p><p>+</p><p>+<span style="white-space:pre"> </span>TP_ARGS(skb, type, code),</p><p>+</p><p>+<span style="white-space:pre"> </span>TP_STRUCT__entry(</p><p>+<span style="white-space:pre"> </span>__field(const void *, skbaddr)</p><p>+<span style="white-space:pre"> </span>__field(int, type)</p><p>+<span style="white-space:pre"> </span>__field(int, code)</p><p>+<span style="white-space:pre"> </span>__array(__u8, saddr, 4)</p><p>+<span style="white-space:pre"> </span>__array(__u8, daddr, 4)</p><p>+<span style="white-space:pre"> </span>__field(__u16, sport)</p><p>+<span style="white-space:pre"> </span>__field(__u16, dport)</p><p>+<span style="white-space:pre"> </span>__field(unsigned short, ulen)</p><p>+<span style="white-space:pre"> </span>),</p><p>+</p><p>+<span style="white-space:pre"> </span>TP_fast_assign(</p><p>+<span style="white-space:pre"> </span>struct iphdr *iph = ip_hdr(skb);</p><p>+<span style="white-space:pre"> </span>int proto_4 = iph->protocol;</p><p>+<span style="white-space:pre"> </span>__be32 *p32;</p><p>+</p><p>+<span style="white-space:pre"> </span>__entry->skbaddr = skb;</p><p>+<span style="white-space:pre"> </span>__entry->type = type;</p><p>+<span style="white-space:pre"> </span>__entry->code = code;</p><p>+</p><p>+<span style="white-space:pre"> </span>if (proto_4 == IPPROTO_UDP) {</p><p>+<span style="white-space:pre"> </span>struct udphdr *uh = udp_hdr(skb);</p><p>+<span style="white-space:pre"> </span>__entry->sport = ntohs(uh->source);</p><p>+<span style="white-space:pre"> </span>__entry->dport = ntohs(uh->dest);</p><p>+<span style="white-space:pre"> </span>__entry->ulen = ntohs(uh->len);</p><p>+<span style="white-space:pre"> </span>} else {</p><p>+<span style="white-space:pre"> </span>__entry->sport = 0;</p><p>+<span style="white-space:pre"> </span>__entry->dport = 0;</p><p>+<span style="white-space:pre"> </span>__entry->ulen = 0;</p><p>+<span style="white-space:pre"> </span>}</p><p>+</p><p>+<span style="white-space:pre"> </span>p32 = (__be32 *) __entry->saddr;</p><p>+<span style="white-space:pre"> </span>*p32 = iph->saddr;</p><p>+</p><p>+<span style="white-space:pre"> </span>p32 = (__be32 *) __entry->daddr;</p><p>+<span style="white-space:pre"> </span>*p32 = iph->daddr;</p><p>+<span style="white-space:pre"> </span>),</p><p>+</p><p>+<span style="white-space:pre"> </span>TP_printk("icmp_send: type=%d, code=%d. From %pI4:%u to %pI4:%u ulen=%d skbaddr=%p",</p><p>+<span style="white-space:pre"> </span>__entry->type, __entry->code,</p><p>+<span style="white-space:pre"> </span>__entry->saddr, __entry->sport, __entry->daddr,</p><p>+<span style="white-space:pre"> </span>__entry->dport, __entry->ulen, __entry->skbaddr)</p><p>+);</p><p>+</p><p>+#endif /* _TRACE_ICMP_H */</p><p>+</p><p>+/* This part must be outside protection */</p><p>+#include <trace/define_trace.h></p><p>\ No newline at end of file</p><p>diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c</p><p>index e63a3bf99617..21fb41257fe9 100644</p><p>--- a/net/ipv4/icmp.c</p><p>+++ b/net/ipv4/icmp.c</p><p>@@ -92,6 +92,8 @@</p><p> #include <net/inet_common.h></p><p> #include <net/ip_fib.h></p><p> #include <net/l3mdev.h></p><p>+#define CREATE_TRACE_POINTS</p><p>+#include <trace/events/icmp.h></p><p> </p><p> /*</p><p> *<span style="white-space:pre"> </span>Build xmit assembly blocks</p><p>@@ -672,6 +674,8 @@ void __icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info,</p><p> <span style="white-space:pre"> </span>}</p><p> <span style="white-space:pre"> </span>}</p><p> </p><p>+<span style="white-space:pre"> </span>trace_icmp_send(skb_in, type, code);</p><p>+</p><p> <span style="white-space:pre"> </span>/* Needed by both icmp_global_allow and icmp_xmit_lock */</p><p> <span style="white-space:pre"> </span>local_bh_disable();</p><p> </p><p>-- </p><p>2.44.0</p><p style="font-size:14px;font-family:微软雅黑,Microsoft YaHei;"><br></p><p style="font-size:14px;font-family:微软雅黑,Microsoft YaHei;"><br></p><p style="font-size:14px;font-family:微软雅黑,Microsoft YaHei;"><br></p><p style="font-size:14px;font-family:微软雅黑,Microsoft YaHei;"><br></p></div>
Powered by blists - more mailing lists