Received: by 2002:ab2:1149:0:b0:1f3:1f8c:d0c6 with SMTP id z9csp1403354lqz; Mon, 1 Apr 2024 05:34:45 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVqd7CfH5aP2QJ6DZmdYWWe8h98UUrc/d+ccX2Fa2drmuCf57jGecaTlOTKO2NuSXvXTO9M9BKQJNFtLSlHs5/GgFXwQZHnFrxHaxOcRw== X-Google-Smtp-Source: AGHT+IGCSAI0v3A6OGhwtdGACv1WFJJ8U91/IRdh57JyKZcOc0nIVSEkALfT5IHKiyQZSPMmW99W X-Received: by 2002:a05:6a20:439f:b0:1a5:72dc:2fe0 with SMTP id i31-20020a056a20439f00b001a572dc2fe0mr9789099pzl.14.1711974884803; Mon, 01 Apr 2024 05:34:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711974884; cv=pass; d=google.com; s=arc-20160816; b=FhNX4Z6euInUIqITRCBQSV63Yo0XtLzzB1iBBa4ORdZ4AGJQM0fiIdMdb5J/uYhdtQ XW8MRwUBoa5Lzn2fCCAXeIK/L94TE+OzmwUeP4/k/jIiEcB0iLLLr4EC0ucLkDi+aFqt S+7Xo7FcuUhsaefLbjSFupIK166oqFvL2g3/NjiUPjvaX9GGzInUdwx7GXEi67tLkKm2 G4Lve98Tm1YFLQtT344kO3fSQMd0aUH8tFAq6AziCwJsnI+6rAB24V847YlynJETSnnl eb8mUOGHyTgF4fqMZX9WFICzgBhm55obPKAuQsei0vWwFrh8gMzvuU4upQ3tLvmDlx3l 1MYw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=subject:cc:to:from:mime-version:list-unsubscribe:list-subscribe :list-id:precedence:message-id:date; bh=dKHznlq3WV+W0wuOHSPUiZIf3G1HNBU6I9naazNh0cM=; fh=7JRfT26zSdY3WGR7xf5TYGXCUNZJSJQ0zSLqXcfRsdY=; b=F8D/bK5WpbouDmj8DMpodsgUe5ucIVFIPk5MKiFAQCOYshOpIqMcbvAJ911OwDpz7R W5CCdRPUMOBzpk00FKRCMvqsAZr0uOJBZMwfwib0Ai5IjYJqo8itokR68Iav+MH/ktuL 07rEHa65eqgu+EnXhPCwCSRsEFQY4xkShKi/xysv/kxN/snKGtMHAH46vEOTojpneeh5 oKB2daDMk1UUk76SOB4ruqoXhv5Jesxwddir//y7p50gEawOwR6jFVpVXUG4nmeUpOaK NDtzkqwaCwuluhki6qSjE0qazXBwJU90aRSwh+u5vkD/3jbcAFUPsWTeyZ7wKUuubova luMg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=zte.com.cn dmarc=pass fromdomain=zte.com.cn); spf=pass (google.com: domain of linux-kernel+bounces-126655-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-126655-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id e3-20020a170902ef4300b001db45912e79si9422074plx.594.2024.04.01.05.34.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Apr 2024 05:34:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-126655-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=zte.com.cn dmarc=pass fromdomain=zte.com.cn); spf=pass (google.com: domain of linux-kernel+bounces-126655-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-126655-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 7704A281AE7 for ; Mon, 1 Apr 2024 12:34:44 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A890B3E48C; Mon, 1 Apr 2024 12:34:35 +0000 (UTC) Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0AA121DFFC; Mon, 1 Apr 2024 12:34:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=63.216.63.35 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711974875; cv=none; b=qK2l41/7A4dmytbSV/TcRRQgFu9pe+rs+2QIcyH42x/ueBt9gkQ+gMZS/6lAuOebgFRGlhpW/FaBb2U/Vj6yBMAlEpT8SeANmewxuRgywjOxk3VtO3JeBNbHHcaUr929dTeEGrBXPTNJ05rxKFl0kfxoc0VZoqHsbySNW/IGoaQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711974875; c=relaxed/simple; bh=tVr7HFU8ZBGCJL9YQj39ZNOH+XOHedyDTzWk90IfveU=; h=Date:Message-ID:Mime-Version:From:To:Cc:Subject:Content-Type; b=Bh7ThJnR003C1lF+RBbBj6wLyxmhduqQQLsRci6cTURbZ5LyptoIFt+tyMi1MItcWA4XE9oI2NJb54DrYACPUABgru665aK2NCEQTTxjOfMZUeB7xtNziOHVL32yctcahpTPc9+1EyHyYR/ZIXsnXL7BSMKm0I280wPWjwzvaw8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=zte.com.cn; spf=pass smtp.mailfrom=zte.com.cn; arc=none smtp.client-ip=63.216.63.35 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=zte.com.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=zte.com.cn Received: from mxct.zte.com.cn (unknown [192.168.251.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxhk.zte.com.cn (FangMail) with ESMTPS id 4V7VnW75Nwz4xPFs; Mon, 1 Apr 2024 20:34:23 +0800 (CST) Received: from mse-fl1.zte.com.cn (unknown [10.5.228.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxct.zte.com.cn (FangMail) with ESMTPS id 4V7VnH59zyz4x6D6; Mon, 1 Apr 2024 20:34:11 +0800 (CST) Received: from xaxapp02.zte.com.cn ([10.88.97.241]) by mse-fl1.zte.com.cn with SMTP id 431CYAKh012758; Mon, 1 Apr 2024 20:34:10 +0800 (+08) (envelope-from xu.xin16@zte.com.cn) Received: from mapi (xaxapp01[null]) by mapi (Zmail) with MAPI id mid32; Mon, 1 Apr 2024 20:34:14 +0800 (CST) Date: Mon, 1 Apr 2024 20:34:14 +0800 (CST) X-Zmail-TransId: 2af9660aa9c6ffffffff98c-62966 X-Mailer: Zmail v1.0 Message-ID: <20240401203414179VCKI9yTVfrOp_Yjpupf90@zte.com.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 From: To: , , Cc: , , , , , , , , , , , , , , Subject: =?UTF-8?B?U3ViamVjdDogW1BBVENIIG5ldC1uZXh0IHY0XSBuZXQvaXB2NDogYWRkIHRyYWNlcG9pbnQgZm9yIGljbXBfc2VuZA==?= Content-Type: text/plain; charset="UTF-8" X-MAIL:mse-fl1.zte.com.cn 431CYAKh012758 X-Fangmail-Gw-Spam-Type: 0 X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 660AA9CF.001/4V7VnW75Nwz4xPFs From: hepeilin 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 v3->v4: Some fixes according to https://lore.kernel.org/all/CANn89i+EFEr7VHXNdOi59Ba_R1nFKSBJzBzkJFVgCTdXBx=YBg@mail.gmail.com/ 1.Add legality check for UDP header in SKB. 2.Target this patch for net-next. 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 Reviewed-by: xu xin Reviewed-by: Yunkai Zhang Cc: Yang Yang Cc: Liu Chun Cc: Xuexin Jiang --- include/trace/events/icmp.h | 65 +++++++++++++++++++++++++++++++++++++ net/ipv4/icmp.c | 4 +++ 2 files changed, 69 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..7d5190f48a28 --- /dev/null +++ b/include/trace/events/icmp.h @@ -0,0 +1,65 @@ +/* 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 +#include + +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; + + struct udphdr *uh = udp_hdr(skb); + if (proto_4 != IPPROTO_UDP || (u8 *)uh < skb->head || + (u8 *)uh + sizeof(struct udphdr) > skb_tail_pointer(skb)) { + __entry->sport = 0; + __entry->dport = 0; + __entry->ulen = 0; + } else { + __entry->sport = ntohs(uh->source); + __entry->dport = ntohs(uh->dest); + __entry->ulen = ntohs(uh->len); + } + + 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 \ No newline at end of file diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index 8cebb476b3ab..224551d75c02 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c @@ -92,6 +92,8 @@ #include #include #include +#define CREATE_TRACE_POINTS +#include /* * 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.25.1