From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by sourceware.org (Postfix) with ESMTPS id CF4713858D1E for ; Tue, 25 Apr 2023 07:08:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CF4713858D1E Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=huawei.com Received: from dggpeml500001.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Q5Cg85QtczpTMt for ; Tue, 25 Apr 2023 15:04:52 +0800 (CST) Received: from huawei.com (10.175.101.6) by dggpeml500001.china.huawei.com (7.185.36.227) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Tue, 25 Apr 2023 15:08:44 +0800 From: langfei To: CC: , , Subject: [PATCH] fix network tcp test Date: Tue, 25 Apr 2023 15:08:04 +0800 Message-ID: <20230425070804.6579-1-langfei@huawei.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpeml500001.china.huawei.com (7.185.36.227) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_STATUS,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Signed-off-by: langfei --- tapset/linux/ipmib.stp | 6 ++++-- tapset/linux/linuxmib.stp | 2 +- testsuite/systemtap.examples/network/tcp_trace.stp | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tapset/linux/ipmib.stp b/tapset/linux/ipmib.stp index 6f51dfd52..23349ac91 100644 --- a/tapset/linux/ipmib.stp +++ b/tapset/linux/ipmib.stp @@ -271,7 +271,8 @@ probe ipmib.InAddrErrors=kernel.function("ip_route_input_noref").return!, * IPSTATS_MIB_INUNKNOWNPROTOS) */ /* icmp_send() is called by ip_local_deliver_finish() */ -probe ipmib.InUnknownProtos=kernel.function("icmp_send") +probe ipmib.InUnknownProtos=kernel.function("icmp_send"), + kernel.function("__icmp_send") { skb = $skb_in; op = 1; @@ -360,7 +361,8 @@ probe ipmib.OutRequests=kernel.function("ip_output"), * counted in the global @ReasmTimeout (equivalent to SNMP's MIB * IPSTATS_MIB_REASMTIMEOUT) */ -probe ipmib.ReasmTimeout=kernel.function("icmp_send") +probe ipmib.ReasmTimeout=kernel.function("icmp_send"), + kernel.function("__icmp_send") { skb = $skb_in; op = 0; diff --git a/tapset/linux/linuxmib.stp b/tapset/linux/linuxmib.stp index 63ec2481b..7662f0b2d 100644 --- a/tapset/linux/linuxmib.stp +++ b/tapset/linux/linuxmib.stp @@ -30,7 +30,7 @@ probe linuxmib.DelayedACKs = _linuxmib.DelayedACKs.* {} probe _linuxmib.DelayedACKs.A = kernel.function("tcp_send_ack") { - sk=$sk + sk=@choose_defined($sk,pointer_arg(1)) if ( !indelack_timer[sk] ) next op=1 key = linuxmib_filter_key(sk,op); diff --git a/testsuite/systemtap.examples/network/tcp_trace.stp b/testsuite/systemtap.examples/network/tcp_trace.stp index 65a32f2e6..98c77c050 100755 --- a/testsuite/systemtap.examples/network/tcp_trace.stp +++ b/testsuite/systemtap.examples/network/tcp_trace.stp @@ -192,7 +192,7 @@ probe kernel.{function("tcp_rcv_established"), } } -probe kernel.function("tcp_transmit_skb") +probe kernel.function("__tcp_transmit_skb") { sk = $sk key = filter_key(sk) -- 2.33.0