File _service:tar_scm:huawei-fix-network-tcp-test-er... of Package systemtap

File _service:tar_scm:huawei-fix-network-tcp-test-error.patch of Package systemtap (Revision 41c97eb2f688d3a0b6a1c49024250c4f)

Currently displaying revision 41c97eb2f688d3a0b6a1c49024250c4f , Show latest

From 5d0424e51857d5f706e78d6d962f380fa70f49f0 Mon Sep 17 00:00:00 2001
From: langfei <langfei@huawei.com>
Date: Wed, 5 Jul 2023 10:27:11 +0800
Subject: [PATCH] fix network tcp test error

Signed-off-by: langfei <langfei@huawei.com>
---
 tapset/linux/ipmib.stp                             | 4 ++--
 tapset/linux/linuxmib.stp                          | 2 +-
 testsuite/systemtap.examples/network/tcp_trace.stp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tapset/linux/ipmib.stp b/tapset/linux/ipmib.stp
index 6f51dfd..603c5d4 100644
--- a/tapset/linux/ipmib.stp
+++ b/tapset/linux/ipmib.stp
@@ -271,7 +271,7 @@ 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")
 {
 	skb = $skb_in;
 	op = 1;
@@ -360,7 +360,7 @@ 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")
 {
 	skb = $skb_in;
 	op = 0;
diff --git a/tapset/linux/linuxmib.stp b/tapset/linux/linuxmib.stp
index 63ec248..cb92875 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=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 65a32f2..98c77c0 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