From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <yaowenbin1@huawei.com>
Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188])
 by sourceware.org (Postfix) with ESMTPS id 97745385841D
 for <systemtap@sourceware.org>; Thu, 28 Jul 2022 09:13:55 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 97745385841D
Received: from dggpeml500026.china.huawei.com (unknown [172.30.72.55])
 by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4LtlJ55np1zlVxF
 for <systemtap@sourceware.org>; Thu, 28 Jul 2022 17:11:17 +0800 (CST)
Received: from dggpeml500002.china.huawei.com (7.185.36.158) by
 dggpeml500026.china.huawei.com (7.185.36.106) with Microsoft SMTP Server
 (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id
 15.1.2375.24; Thu, 28 Jul 2022 17:13:52 +0800
Received: from [10.174.179.208] (10.174.179.208) by
 dggpeml500002.china.huawei.com (7.185.36.158) with Microsoft SMTP Server
 (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id
 15.1.2375.24; Thu, 28 Jul 2022 17:13:51 +0800
Message-ID: <b539fc10-11a3-fbb8-ab0d-31591a8fd86e@huawei.com>
Date: Thu, 28 Jul 2022 17:13:51 +0800
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.4.1
To: <systemtap@sourceware.org>
CC: "hewenliang (C)" <hewenliang4@huawei.com>, <linfeilong@huawei.com>
From: yaowenbin <yaowenbin1@huawei.com>
Subject: fix network tcp test
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
X-Originating-IP: [10.174.179.208]
X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To
 dggpeml500002.china.huawei.com (7.185.36.158)
X-CFilter-Loop: Reflected
X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, KAM_DMARC_STATUS,
 SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
 server2.sourceware.org
X-BeenThere: systemtap@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Systemtap mailing list <systemtap.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/systemtap>,
 <mailto:systemtap-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/systemtap/>
List-Help: <mailto:systemtap-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/systemtap>,
 <mailto:systemtap-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Jul 2022 09:13:56 -0000

--- a/tapset/linux/ipmib.stp
+++ b/tapset/linux/ipmib.stp
@@ -271,7 +271,7 @@
  * 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")
 {
 	skb = $skb_in;
 	op = 1;
@@ -360,7 +360,7 @@
  * 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")
 {
 	skb = $skb_in;
 	op = 0;
--- a/tapset/linux/linuxmib.stp
+++ b/tapset/linux/linuxmib.stp
@@ -30,7 +30,7 @@

 probe _linuxmib.DelayedACKs.A = kernel.function("tcp_send_ack")
 {
-	sk=$sk
+	sk=pointer_arg(1)
 	if ( !indelack_timer[sk] ) next
 	op=1
 	key = linuxmib_filter_key(sk,op);
--- a/testsuite/systemtap.examples/network/tcp_trace.stp
+++ b/testsuite/systemtap.examples/network/tcp_trace.stp
@@ -192,7 +192,7 @@
 	}
 }

-probe kernel.function("tcp_transmit_skb")
+probe kernel.function("__tcp_transmit_skb")
 {
 	sk = $sk
 	key = filter_key(sk)