Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp206331lqp; Wed, 20 Mar 2024 20:09:51 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCU/FYVNeYWXcBj2i1hPpxrVQGfFM9L65bga4HssG6HevsOneS6IzGNbTYKUT9U5X/UjLA5XRI1BTOCgUSAPLPHLBa9v8t6VJU+ICKKhvw== X-Google-Smtp-Source: AGHT+IE5HUKbtvu4nZLZT1wIP5f8/N4jmv1FJDp0C9S1+JE8KBrCwMowHG2b4oZZTot0q+B5EocS X-Received: by 2002:a17:902:e806:b0:1dc:a605:5435 with SMTP id u6-20020a170902e80600b001dca6055435mr1297866plg.31.1710990591366; Wed, 20 Mar 2024 20:09:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1710990591; cv=pass; d=google.com; s=arc-20160816; b=iOqyyAVyEr7KOElst7PboPXuRJDdsgHB0G199nx0mLRG1jQKfZ489skFZ3Gqz6aRFL iHqY1rbcoFJUTe8shYwH8hLWePgZa4T2UjklXXmTYxafPr/09puqgr9xPisDR2GiY3AP hn+KFwZZd8i5j+uSiFofGyzGXZWbG+CtMkifa9BirMsHfTKrU3n3PoK9fHk05Lnn7Lul M/oiuN40gs/3Xmb5IOkChAnneBFPrdtFQh+SCiXoFPi55I597BrGPZ+qbDu2tZWQuLNc c7M+iU6z0cru9/44cZOsfe+mEsNR3cU63A4jqIKl720Ma6Si8VMunSUW3XTtWivtYxkl 0lZA== 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=F1yI63oT7u5B5hDhAAUaRQlittB/t8LrOz0p/1vTQok=; fh=+bAjQPpA8r3NolLo25SCUgwxNCtdCesasj8DreNHFhg=; b=QqAqWgxrJwsOte0B5njdEouBWp+RwnhpmlWyTwussrzGQLJ2Mnjaag6R/6dxc94OSm 0EwwLiU8trAq8lzKcqrpj62k4uqc3DLl36xitAobhLXDH5BPi0o3/7omPIc3NZ9krPNG ommYvobdRSwdVML01OaV9jZM7+bujK+5wNtiO9EVQKsLB2fk8NtzZVctwYlsNZKBrFpK X1UbvZMYIsLOHVXpie37bvHfxlgUl98vHEuvPqvG1R7u9Eg09JUKoFrdxDlUgCpc80Gu NJMtYmtdedQUX/d6auuRnHDL26OmXRJpkezu0KT3lqj6UeYoh125yw5gwvw0CVextFUi oOqQ==; 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-109613-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-109613-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 sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id m1-20020a170902f64100b001df846506f5si10897502plg.584.2024.03.20.20.09.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Mar 2024 20:09:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-109613-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::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-109613-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-109613-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id AB19AB2204C for ; Thu, 21 Mar 2024 03:09:44 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 87CB6B641; Thu, 21 Mar 2024 03:09:28 +0000 (UTC) Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.40]) (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 060A9946C; Thu, 21 Mar 2024 03:09:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=63.216.63.40 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710990567; cv=none; b=G/rOwbCZJdXU+wFYR32J26qpTLoUJN0Lh8BKMcBr7FHzKw1f59SBO760VubFT07lA7HkAczm3zdhLzmHXECyKhHpSngCs3p8jrEYdNkuRkudugxnUpRLQ6jWeF8ekpacGwBIk65YzTv2gKplsO4Ruqd/sS1VWWQ/nv41a+S1RFM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710990567; c=relaxed/simple; bh=O37AkEh3VEhX6lELbcsvVrZW33kunT6ttBnG8jK11l4=; h=Date:Message-ID:Mime-Version:From:To:Cc:Subject:Content-Type; b=mtap1TSiP19/DHL3/C8lhY7257W9kOeAiQkxPROZb1ENiehNYzpX5woPlFxyJGBPgIt7iSsSkYzyvhQknBWC90ic9ocztptq2hYcyJsVP0XRqJQxQa5nId/uE7m7hzxBZRj3/j53vd88ySST6ISjhXhss2ngzOIaE8joZnODzy4= 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.40 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 mse-fl2.zte.com.cn (unknown [10.5.228.133]) (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 4V0Vmd1CGZz8XrRJ; Thu, 21 Mar 2024 11:09:21 +0800 (CST) Received: from xaxapp01.zte.com.cn ([10.88.99.176]) by mse-fl2.zte.com.cn with SMTP id 42L39H6U072154; Thu, 21 Mar 2024 11:09:17 +0800 (+08) (envelope-from xu.xin16@zte.com.cn) Received: from mapi (xaxapp02[null]) by mapi (Zmail) with MAPI id mid32; Thu, 21 Mar 2024 11:09:18 +0800 (CST) Date: Thu, 21 Mar 2024 11:09:18 +0800 (CST) X-Zmail-TransId: 2afa65fba4de4d4-798fc X-Mailer: Zmail v1.0 Message-ID: <202403211109183894466@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?W1BBVENIIHYzIHJlc2VuZF0gbmV0L2lwdjQ6IGFkZCB0cmFjZXBvaW50IGZvciBpY21wX3NlbmQ=?= Content-Type: text/plain; charset="UTF-8" X-MAIL:mse-fl2.zte.com.cn 42L39H6U072154 X-Fangmail-Gw-Spam-Type: 0 X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 65FBA4E1.000/4V0Vmd1CGZz8XrRJ From: he peilin 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 Reviewed-by: xu xin Reviewed-by: Yunkai Zhang Cc: Yang Yang Cc: Liu Chun Cc: Xuexin Jiang --- 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 +#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; + + 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 \ 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 #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.44.0